summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/mythtv
diff options
context:
space:
mode:
authorNathan Harris <nharris@eoimaging.com>2009-03-23 20:49:10 (GMT)
committerNathan Harris <nharris@eoimaging.com>2009-03-23 20:49:10 (GMT)
commit861026de0146bbefe9b3329ca5c75973dfc9bec2 (patch)
tree80fd6cdb9491b0f56841ba12212cfc4d1ba18dfb /abs/core-testing/mythtv
parent7f9313d1860b96caf5b0c70e88d153d2c4515e0a (diff)
downloadlinhes_pkgbuild-861026de0146bbefe9b3329ca5c75973dfc9bec2.zip
linhes_pkgbuild-861026de0146bbefe9b3329ca5c75973dfc9bec2.tar.gz
linhes_pkgbuild-861026de0146bbefe9b3329ca5c75973dfc9bec2.tar.bz2
bumped to 20249 and added main menu popup
Diffstat (limited to 'abs/core-testing/mythtv')
-rw-r--r--abs/core-testing/mythtv/trunk/morethemes/PKGBUILD2
-rwxr-xr-xabs/core-testing/mythtv/trunk/mp_all.sh2
-rw-r--r--abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD4
-rw-r--r--abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/trunk/mythflix/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/trunk/mythgame/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/trunk/mythnews/PKGBUILD2
-rwxr-xr-xabs/core-testing/mythtv/trunk/myththemes/PKGBUILD2
-rwxr-xr-xabs/core-testing/mythtv/trunk/mythtv/PKGBUILD14
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml0
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/is.xml0
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch23
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml0
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch76
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml0
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml0
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/optical_menu.xml.patch27
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/setup.xml0
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/siriusmenu.xml0
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch27
-rw-r--r--[-rwxr-xr-x]abs/core-testing/mythtv/trunk/mythtv/menu-xml/xmmenu.xml0
-rw-r--r--abs/core-testing/mythtv/trunk/mythtv/myththemedmenu.cpp.patch (renamed from abs/core-testing/mythtv/trunk/mythtv/svn_main_menu_popup.patch)98
-rw-r--r--abs/core-testing/mythtv/trunk/mythtv/myththemedmenu.h.patch24
-rw-r--r--abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/trunk/mythweather/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/trunk/mythweb/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD2
30 files changed, 160 insertions, 161 deletions
diff --git a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
index a59a6f6..9d9c81d 100644
--- a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=morethemes-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Additional themes for MythTV"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mp_all.sh b/abs/core-testing/mythtv/trunk/mp_all.sh
index 894caea..b3ddeee 100755
--- a/abs/core-testing/mythtv/trunk/mp_all.sh
+++ b/abs/core-testing/mythtv/trunk/mp_all.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-_svnver=20087
+_svnver=20249
# NOTE: Make sure to build and install mythtv first BEFORE building anything else
buildlist=('mythtv' 'mytharchive' 'mythbrowser' 'mythflix' 'mythgallery' 'mythgame' 'mythmovies' 'mythmusic' 'mythnews' 'mythvideo' 'mythweather' 'mythzoneminder' 'mythweb' 'myththemes' 'morethemes')
diff --git a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
index 8d8cb9d..2944950 100644
--- a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mytharchive-svn
-pkgver=20087
-pkgrel=2
+pkgver=20249
+pkgrel=1
pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
url="http://www.mythtv.org"
license="GPL"
diff --git a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
index 5ce1a1c..3622018 100644
--- a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythbrowser-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Mini web browser for MythTV"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
index 450055b..1462826 100644
--- a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythflix-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Netflix access plugin for MythTV"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
index 71a1331..d188542 100644
--- a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythgallery-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Image gallery plugin for MythTV"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
index b7f6d09..3f9e37c 100644
--- a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythgame-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Emulation plugin for MythTV"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
index 850e5c4..905acc3 100644
--- a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythmovies-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Displays information about movies playing in the area."
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
index 65c48ef..dd102e2 100644
--- a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythmusic-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Music playing plugin for MythTV"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
index 1d8007b..50c4cb1 100644
--- a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythnews-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="News checking plugin for MythTV"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
index 942f367..678dd74 100755
--- a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=myththemes-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Themes for MythTV"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
index 0f2fd2c..6be84c2 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv-svn
-pkgver=20087
-pkgrel=2
+pkgver=20249
+pkgrel=1
pkgdesc="A personal video recorder for Linux"
url="http://www.mythtv.org"
license="GPL"
@@ -15,7 +15,7 @@ groups=('pvr')
#MAKEFLAGS="-j6"
install='mythtv.install'
-patchs=('smolt_jump.patch' 'DeviceReadBuffer-polltimeout.2.patch')
+patchs=('smolt_jump.patch' 'myththemedmenu.h.patch' 'myththemedmenu.cpp.patch' 'DeviceReadBuffer-polltimeout.2.patch')
#patchs=('svn_main_menu_popup.patch' 'smolt_jump.patch' 'DeviceReadBuffer-polltimeout.2.patch')
source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` )
arch=('i686' 'x86_64')
@@ -69,10 +69,10 @@ build() {
# patch the xml LinHES style
cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv/themes/defaultmenu/
cd $startdir/pkg/usr/share/mythtv/themes/defaultmenu
- patch -p0 < $startdir/menu-xml/mainmenu.xml.patch
- patch -p0 < $startdir/menu-xml/optical_menu.xml.patch
- patch -p0 < $startdir/menu-xml/library.xml.patch
- patch -p0 < $startdir/menu-xml/util_menu.xml.patch
+ patch -p0 < $startdir/menu-xml/mainmenu.xml.patch || return 1
+ patch -p0 < $startdir/menu-xml/optical_menu.xml.patch || return 1
+ patch -p0 < $startdir/menu-xml/library.xml.patch || return 1
+ patch -p0 < $startdir/menu-xml/util_menu.xml.patch || return 1
# make log dir
mkdir -p $startdir/pkg/var/log/mythtv
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml
index f257920..f257920 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/is.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/is.xml
index 88b7e6b..88b7e6b 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/is.xml
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/is.xml
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch
index 02df082..14cb5f9 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch
@@ -1,13 +1,12 @@
---- library.xml.orig 2008-08-31 03:27:59.000000000 +0000
-+++ library.xml 2009-01-26 15:04:16.000000000 +0000
-@@ -121,8 +121,8 @@
- <type>STREAM</type>
- <text>Play online streams</text>
- <text lang="HE">נגן מדיה מכוונת</text>
-- <action>PLUGIN mythstream</action>
-- <depends>mythstream</depends>
-+ <text>Online Streams</text>
-+ <action>MENU is.xml</action>
- </button>
+--- library.xml.orig 2009-03-23 18:43:18.000000000 +0000
++++ library.xml 2009-03-23 19:52:30.000000000 +0000
+@@ -126,8 +126,7 @@
+ <text>Play Online Streams</text>
+ <text lang="HE">נגן מדיה מכוונת</text>
+ <description></description>
+- <action>PLUGIN mythstream</action>
+- <depends>mythstream</depends>
++ <action>MENU is.xml</action>
+ </button>
- <button>
+ <button>
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml
index 8bc929f..8bc929f 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch
index 2b69210..0ec8143 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch
@@ -1,39 +1,41 @@
---- mainmenu.xml.orig 2009-02-11 20:23:31.000000000 +0000
-+++ mainmenu.xml 2009-02-11 20:27:09.000000000 +0000
-@@ -158,34 +158,8 @@
+--- mainmenu.xml.orig 2009-03-23 18:43:18.000000000 +0000
++++ mainmenu.xml 2009-03-23 19:47:20.000000000 +0000
+@@ -163,35 +163,9 @@
- <button>
- <type>MENU_UTILITIES_SETUP</type>
-- <text>Utilities / Setup</text>
-- <text lang="IT">Impostazioni</text>
-- <text lang="ES">Configuración</text>
-- <text lang="CS">Configurar</text>
-- <text lang="FR">paramètres</text>
-- <text lang="DE">Zubehör / Konfiguration</text>
-- <text lang="DA">Tilbehør/Indstillinger</text>
-- <text lang="IS">Uppsetning</text>
-- <text lang="NL">Configuratie</text>
-- <text lang="PT">Utensílios</text>
-- <text lang="SV">Verktyg / Inställningar</text>
-- <text lang="JA">設定</text>
-- <text lang="FI">Oheis/Asetukset</text>
-- <text lang="ZH_TW">工具/設定</text>
-- <text lang="SL">Nastavitve</text>
-- <text lang="ET">Utiliidid / sätted</text>
-- <text lang="NB">Verktøy/Oppsett</text>
-- <text lang="CS">Pomůcky</text>
-- <text lang="RU">Утилиты / Настройки</text>
-- <text lang="AR">تضبيطات</text>
-- <text lang="PL">Narzędzia / ustawienia</text>
-- <text lang="HE">עזרים / הגדרות</text>
-- <alttext lang="DE">Verschiedenes</alttext>
-- <alttext lang="SV">Inställningar</alttext>
-- <alttext lang="ET">Sätted</alttext>
-- <alttext lang="RU">Настройки</alttext>
-- <alttext lang="AR">تضبيطات</alttext>
-- <action>MENU util_menu.xml</action>
-+ <text>Service Menu</text>
-+ <action>MENU linhes.xml</action>
- </button>
+ <button>
+ <type>MENU_UTILITIES_SETUP</type>
+- <text>Utilities / Setup</text>
+- <text lang="IT">Impostazioni</text>
+- <text lang="ES">Configuración</text>
+- <text lang="CS">Configurar</text>
+- <text lang="FR">paramètres</text>
+- <text lang="DE">Zubehör / Konfiguration</text>
+- <text lang="DA">Tilbehør/Indstillinger</text>
+- <text lang="IS">Uppsetning</text>
+- <text lang="NL">Configuratie</text>
+- <text lang="PT">Utensílios</text>
+- <text lang="SV">Verktyg / Inställningar</text>
+- <text lang="JA">設定</text>
+- <text lang="FI">Oheis/Asetukset</text>
+- <text lang="ZH_TW">工具/設定</text>
+- <text lang="SL">Nastavitve</text>
+- <text lang="ET">Utiliidid / sätted</text>
+- <text lang="NB">Verktøy/Oppsett</text>
+- <text lang="CS">Pomůcky</text>
+- <text lang="RU">Утилиты / Настройки</text>
+- <text lang="AR">تضبيطات</text>
+- <text lang="PL">Narzędzia / ustawienia</text>
+- <text lang="HE">עזרים / הגדרות</text>
+- <alttext lang="DE">Verschiedenes</alttext>
+- <alttext lang="SV">Inställningar</alttext>
+- <alttext lang="ET">Sätted</alttext>
+- <alttext lang="RU">Настройки</alttext>
+- <alttext lang="AR">تضبيطات</alttext>
+- <description>Configure MythTV and plugins</description>
+- <action>MENU util_menu.xml</action>
++ <text>Service Menu</text>
++ <description>LinHES Service Menu</description>
++ <action>MENU linhes.xml</action>
+ </button>
- <!-- <button>
+ <!-- <button>
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml
index 656860d..656860d 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml
index 05cb0a7..05cb0a7 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/optical_menu.xml.patch b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/optical_menu.xml.patch
index d1cb70c..b4b1411 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/optical_menu.xml.patch
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/optical_menu.xml.patch
@@ -1,15 +1,16 @@
---- optical_menu.xml.orig 2008-10-02 22:46:30.000000000 +0000
-+++ optical_menu.xml 2008-07-02 04:05:15.000000000 +0000
-@@ -129,6 +129,12 @@
- </button>
+--- optical_menu.xml.orig 2009-03-23 20:05:43.000000000 +0000
++++ optical_menu.xml 2009-03-23 20:10:02.000000000 +0000
+@@ -134,6 +134,13 @@
+ </button>
- <button>
-+ <type>DVD_RIP</type>
-+ <text>Import video files from DVD</text>
-+ <action>EXEC /usr/LH/bin/importfiles.sh</action>
-+ </button>
+ <button>
++ <type>DVD_RIP</type>
++ <text>Import video files from DVD</text>
++ <description>Import video files from a data DVD</description>
++ <action>EXEC /usr/LH/bin/importfiles.sh</action>
++ </button>
+
-+ <button>
- <type>EJECT</type>
- <text>Eject media</text>
- <text lang="IT">Espelli Media</text>
++ <button>
+ <type>EJECT</type>
+ <text>Eject media</text>
+ <text lang="IT">Espelli Media</text>
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/setup.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/setup.xml
index f56bb6f..f56bb6f 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/setup.xml
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/setup.xml
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/siriusmenu.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/siriusmenu.xml
index e317b36..e317b36 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/siriusmenu.xml
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/siriusmenu.xml
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch
index 6d3325f..3a1072a 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch
@@ -1,15 +1,16 @@
---- util_menu.xml.orig 2009-02-11 19:45:51.000000000 +0000
-+++ util_menu.xml 2009-02-11 20:45:12.000000000 +0000
-@@ -54,6 +54,12 @@
- </button>
+--- util_menu.xml.orig 2009-03-23 18:43:18.000000000 +0000
++++ util_menu.xml 2009-03-23 20:16:56.000000000 +0000
+@@ -56,6 +56,13 @@
+ </button>
- <button>
-+ <type>VIDEO_SCREENSHOOTER</type>
-+ <text>Thumbnail Generator</text>
-+ <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action>
-+ </button>
+ <button>
++ <type>VIDEO_SCREENSHOOTER</type>
++ <text>Thumbnail Generator</text>
++ <description>Generate thumbnail images for videos</description>
++ <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action>
++ </button>
+
-+ <button>
- <type>SETUP_KEYS</type>
- <text>Edit Keys</text>
- <text lang="IT">Modifica Tasti</text>
++ <button>
+ <type>SETUP_KEYS</type>
+ <text>Edit Keys</text>
+ <text lang="IT">Modifica Tasti</text>
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/xmmenu.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/xmmenu.xml
index 6b26d11..6b26d11 100755..100644
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/xmmenu.xml
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/xmmenu.xml
diff --git a/abs/core-testing/mythtv/trunk/mythtv/svn_main_menu_popup.patch b/abs/core-testing/mythtv/trunk/mythtv/myththemedmenu.cpp.patch
index 5556683..fbb85c3 100644
--- a/abs/core-testing/mythtv/trunk/mythtv/svn_main_menu_popup.patch
+++ b/abs/core-testing/mythtv/trunk/mythtv/myththemedmenu.cpp.patch
@@ -1,50 +1,18 @@
-Index: libs/libmythui/myththemedmenu.h
-===================================================================
---- libs/libmythui/myththemedmenu.h (revision 19291)
-+++ libs/libmythui/myththemedmenu.h (working copy)
-@@ -2,6 +2,7 @@
- #define MYTHTHEMEDMENU_H_
-
- #include "mythscreentype.h"
-+#include "mythdialogbox.h"
- #include "mythuistatetype.h"
- #include "mythuibuttonlist.h"
- #include "xmlparsebase.h"
-@@ -77,6 +78,11 @@
- void ReloadExitKey(void);
- virtual void aboutToShow(void);
-
-+ void doMenu();
-+ void aboutScreen();
-+ MythDialogBox *m_menuPopup;
-+ void customEvent(QEvent *event);
-+
- protected:
- virtual bool keyPressEvent(QKeyEvent *e);
-
Index: libs/libmythui/myththemedmenu.cpp
===================================================================
---- libs/libmythui/myththemedmenu.cpp (revision 19291)
+--- libs/libmythui/myththemedmenu.cpp (revision 20249)
+++ libs/libmythui/myththemedmenu.cpp (working copy)
-@@ -32,6 +32,7 @@
- m_callbackdata = NULL;
-
- m_killable = false;
-+
- }
-
- MythThemedMenuState::~MythThemedMenuState()
-@@ -95,7 +96,7 @@
- m_exitModifier = -1;
- m_menumode = "";
- m_buttonList = NULL;
--
+@@ -88,6 +88,8 @@
+ m_state(state), m_allocedstate(false), m_foundtheme(false),
+ m_exitModifier(-1), m_ignorekeys(false), m_wantpop(false)
+ {
+ m_menuPopup = NULL;
++
if (!m_state)
{
m_state = new MythThemedMenuState(parent, "themedmenustate");
-@@ -271,6 +272,10 @@
- m_wantpop = true;
+@@ -269,6 +271,10 @@
+ }
}
}
+ else if (action == "MENU")
@@ -54,25 +22,27 @@ Index: libs/libmythui/myththemedmenu.cpp
else
handled = false;
}
-@@ -292,6 +297,154 @@
+@@ -290,6 +296,158 @@
updateLCD();
}
+void MythThemedMenu::doMenu()
+{
-+
-+ if (m_menuPopup)
++ if( m_menuPopup != NULL )
+ return;
++
+ int allowsd = GetMythDB()->GetNumSetting("AllowQuitShutdown");
+ int override_menu = GetMythDB()->GetNumSetting("OverRideExitMenu");
+ QString label = "System Menu";
-+ MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
++ MythScreenStack* mainStack = GetMythMainWindow()->GetMainStack();
+ m_menuPopup = new MythDialogBox(label, mainStack, "menuPopup");
++
+ if (m_menuPopup->Create())
+ mainStack->AddScreen(m_menuPopup);
-+ if ( override_menu == 0 )
++
++ if (override_menu == 0)
+ {
-+ if ( allowsd != 0 && allowsd !=4 )
++ if ( (allowsd != 0) && (allowsd != 4) )
+ {
+ m_menuPopup->SetReturnEvent(this,"popmenu_exit");
+ m_menuPopup->AddButton("Shutdown");
@@ -83,17 +53,17 @@ Index: libs/libmythui/myththemedmenu.cpp
+ m_menuPopup->SetReturnEvent(this,"popmenu_noexit");
+ }
+ }
-+ if ( override_menu == 5 )
++ if (override_menu == 5)
+ { // reboot
+ m_menuPopup->SetReturnEvent(this,"popmenu_reboot");
+ m_menuPopup->AddButton("Reboot");
+ }
-+ else if ( override_menu == 2 || override_menu == 4 )
++ else if (override_menu == 2 || override_menu == 4)
+ { // shutdown
+ m_menuPopup->SetReturnEvent(this,"popmenu_shutdown");
+ m_menuPopup->AddButton("Shutdown");
+ }
-+ else if ( override_menu == 3 || override_menu == 6 )
++ else if (override_menu == 3 || override_menu == 6)
+ { // both
+ m_menuPopup->SetReturnEvent(this,"popmenu_exit");
+ m_menuPopup->AddButton("Shutdown");
@@ -108,16 +78,17 @@ Index: libs/libmythui/myththemedmenu.cpp
+ m_menuPopup->AddButton("Cancel");
+
+}
++
+void MythThemedMenu::aboutScreen()
+{
+
-+ extern const char *myth_source_version;
-+ extern const char *myth_source_path;
++ extern const char* myth_source_version;
++ extern const char* myth_source_path;
+ QString distro_line;
-+ distro_line="";
++ distro_line = "";
+
+ QFile file("/etc/os_myth_release");
-+ if ( file.open(QFile::ReadOnly))
++ if (file.open(QFile::ReadOnly))
+ {
+ QTextStream t( &file ); // use a text stream
+ distro_line = t.readLine();
@@ -127,12 +98,12 @@ Index: libs/libmythui/myththemedmenu.cpp
+ QString label = "";
+ label.append(QObject::tr("Revision: ") + myth_source_version + " \n Branch:" + myth_source_path + "\n" + distro_line );
+
-+ MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
++ MythScreenStack* mainStack = GetMythMainWindow()->GetMainStack();
+ m_menuPopup = new MythDialogBox(label, mainStack, "About");
+ if (m_menuPopup->Create())
+ mainStack->AddScreen(m_menuPopup);
+
-+ m_menuPopup->SetReturnEvent(this,"About");
++ m_menuPopup->SetReturnEvent(this, "About");
+ m_menuPopup->AddButton("OK!");
+
+}
@@ -143,22 +114,23 @@ Index: libs/libmythui/myththemedmenu.cpp
+ {
+ DialogCompletionEvent *dce =
+ dynamic_cast<DialogCompletionEvent*>(event);
-+ QString resultid= dce->GetId();
-+ int buttonnum = dce->GetResult();
-+ QString halt_cmd=GetMythDB()->GetSetting("HaltCommand");
-+ QString reboot_cmd=GetMythDB()->GetSetting("RebootCommand");
++
++ QString resultid = dce->GetId();
++ int buttonnum = dce->GetResult();
++ QString halt_cmd = GetMythDB()->GetSetting("HaltCommand");
++ QString reboot_cmd = GetMythDB()->GetSetting("RebootCommand");
+
+ if (resultid == "popmenu_exit")
+ {
+ if (buttonnum == 0)
+ {
-+ if (!halt_cmd.isEmpty() )
++ if (!halt_cmd.isEmpty())
+ system(halt_cmd.toAscii());
+ }
+
+ if (buttonnum == 1)
+ {
-+ if (!reboot_cmd.isEmpty() )
++ if (!reboot_cmd.isEmpty())
+ system(reboot_cmd.toAscii());
+ }
+
@@ -178,7 +150,7 @@ Index: libs/libmythui/myththemedmenu.cpp
+ {
+ if (buttonnum == 0)
+ {
-+ if (!reboot_cmd.isEmpty() )
++ if (!reboot_cmd.isEmpty())
+ system(reboot_cmd.toAscii());
+ }
+
@@ -192,7 +164,7 @@ Index: libs/libmythui/myththemedmenu.cpp
+ {
+ if (buttonnum == 0)
+ {
-+ if (!halt_cmd.isEmpty() )
++ if (!halt_cmd.isEmpty())
+ system(halt_cmd.toAscii());
+ }
+
diff --git a/abs/core-testing/mythtv/trunk/mythtv/myththemedmenu.h.patch b/abs/core-testing/mythtv/trunk/mythtv/myththemedmenu.h.patch
new file mode 100644
index 0000000..688e99c
--- /dev/null
+++ b/abs/core-testing/mythtv/trunk/mythtv/myththemedmenu.h.patch
@@ -0,0 +1,24 @@
+Index: libs/libmythui/myththemedmenu.h
+===================================================================
+--- libs/libmythui/myththemedmenu.h (revision 20249)
++++ libs/libmythui/myththemedmenu.h (working copy)
+@@ -2,6 +2,7 @@
+ #define MYTHTHEMEDMENU_H_
+
+ #include "mythscreentype.h"
++#include "mythdialogbox.h"
+ #include "mythuistatetype.h"
+ #include "mythuibuttonlist.h"
+ #include "xmlparsebase.h"
+@@ -79,6 +80,11 @@
+ void ReloadExitKey(void);
+ virtual void aboutToShow(void);
+
++ void doMenu();
++ void aboutScreen();
++ MythDialogBox* m_menuPopup;
++ void customEvent(QEvent *event);
++
+ protected:
+ virtual bool keyPressEvent(QKeyEvent *e);
+
diff --git a/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
index 367d043..5979bdd 100644
--- a/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythvideo-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Video playback and browsing plugin for MythTV"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
index a0b3e0c..ff364e6 100644
--- a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythweather-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Weather checking plugin for MythTV"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
index 6057fed..b477947 100644
--- a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythweb-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Web interface for MythTV's backend"
url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
index 45a1417..239dc74 100644
--- a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythzoneminder-svn
-pkgver=20087
+pkgver=20249
pkgrel=1
pkgdesc="Integrates ZoneMinder into MythTV"
url="http://www.mythtv.org"