diff options
Diffstat (limited to 'abs/core/mythtv/trunk/mythtv')
-rwxr-xr-x | abs/core/mythtv/trunk/mythtv/PKGBUILD | 18 | ||||
-rw-r--r-- | abs/core/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml | 115 | ||||
-rw-r--r-- | abs/core/mythtv/trunk/mythtv/menu-xml/library.xml.patch | 10 | ||||
-rw-r--r-- | abs/core/mythtv/trunk/mythtv/menu-xml/linhes.xml | 71 | ||||
-rw-r--r-- | abs/core/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch | 13 | ||||
-rw-r--r-- | abs/core/mythtv/trunk/mythtv/menu-xml/mythbackup.xml | 2 | ||||
-rw-r--r-- | abs/core/mythtv/trunk/mythtv/menu-xml/mythrestore.xml | 2 | ||||
-rw-r--r-- | abs/core/mythtv/trunk/mythtv/menu-xml/update.xml | 20 | ||||
-rw-r--r-- | abs/core/mythtv/trunk/mythtv/menu-xml/update2.xml | 26 | ||||
-rwxr-xr-x | abs/core/mythtv/trunk/mythtv/pretty | 9 |
10 files changed, 177 insertions, 109 deletions
diff --git a/abs/core/mythtv/trunk/mythtv/PKGBUILD b/abs/core/mythtv/trunk/mythtv/PKGBUILD index db119bd..65b12db 100755 --- a/abs/core/mythtv/trunk/mythtv/PKGBUILD +++ b/abs/core/mythtv/trunk/mythtv/PKGBUILD @@ -1,12 +1,12 @@ pkgname=mythtv-svn -pkgver=21495 +pkgver=23790 pkgrel=1 pkgdesc="A personal video recorder for Linux" url="http://www.mythtv.org" license="GPL" depends=('bash' 'mysql-clients>=5.0' 'qt' 'lame' 'lirc-utils' 'ffmpeg' \ 'faad2' 'libxv' 'libxvmc' 'libavc1394' 'libdc1394' 'libiec61883' \ - 'perl-net-upnp') + 'perl-net-upnp' 'libvdpau') makedepends=('libgl' 'subversion') conflicts=('mythtv') replaces=() @@ -56,7 +56,7 @@ build() { --enable-vdpau --enable-xvmc --enable-xvmc-pro \ --enable-opengl-vsync --enable-libfaad --enable-dvb --enable-firewire \ --compile-type=release --with-bindings=perl,python \ - --enable-audio-alsa --disable-audio-jack --disable-audio-arts || return 1 + --enable-audio-alsa --disable-audio-jack --disable-audio-pulseoutput || return 1 # build and install . /etc/profile @@ -66,11 +66,12 @@ build() { # install db schema, scripts and docs install -m0644 database/mc.sql $startdir/pkg/usr/share/mythtv/ || return 1 install -D -m0755 ../mythbackend $startdir/pkg/etc/rc.d/mythbackend || return 1 - cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1 - # cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ || return 1 +# cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1 + rsync -arp --exclude .svn --delete-excluded docs $startdir/pkg/usr/share/mythtv/ || return 1 # install contrib - cp -r contrib $startdir/pkg/usr/share/mythtv/ || return 1 + rsync -arp --exclude .svn --delete-excluded contrib $startdir/pkg/usr/share/mythtv/ || return 1 + #cp -r contrib $startdir/pkg/usr/share/mythtv/ || return 1 # patch the xml LinHES style cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv/themes/defaultmenu/ @@ -89,3 +90,8 @@ build() { install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/ } +md5sums=('7ef6de58240e7aad389a0b13d91b1cf6' + '2babd4b8e146a7538d18dcd55695b0be' + 'f735805a80b0d1180dee01f9df1b7004' + 'f407d6af23e74a49540755420f84fa58' + 'ca547c201e3dd4bf3882bebf7c648652') diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml index f257920..ac52497 100644 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml +++ b/abs/core/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml @@ -1,87 +1,94 @@ <mythmenu name="HOST_SETTINGS"> <button> - <type>MV_NETWORK_SETUP_MENU</type> + <type>MV_NETWORK_SETUP_MENU</type> <text>Network Settings</text> <action>EXEC mythinstall -s network </action> </button> <button> - <type>MV_SYSTEM_SETUP_MENU</type> - <text>System type</text> - <action>EXEC mythinstall -s hostype </action> + <type>MV_NETWORK_SETUP_MENU</type> + <text>DDNS Settings</text> + <action>EXEC mythinstall -s ddns </action> </button> - <button> - <type>MV_MISC_SETUP_MENU</type> - <text>Misc Settings</text> - <action>EXEC mythinstall -s misc </action> + <type>MV_SYSTEM_SETUP_MENU</type> + <text>System Type</text> + <action>EXEC mythinstall -s hostype </action> </button> <button> - <type>MV_SOFTWARE_MENU</type> - <text>Software</text> - <action>EXEC mythinstall -s plugins </action> + <type>MV_SCREENSAVER_SETUP_MENU</type> + <text>Screensaver Settings</text> + <action>EXEC mythinstall -s screensaver </action> </button> <button> - <type>MV_SHUTDOWN_SETUP_MENU</type> - <text>Shutdown settings</text> - <action>EXEC mythinstall -s sleep </action> + <type>MV_IR_SETUP_MENU</type> + <text>Remotes</text> + <action>EXEC mythinstall -s ir </action> </button> + <button> + <type>MV_MISC_SETUP_MENU</type> + <text>Miscellanous Settings</text> + <action>EXEC mythinstall -s misc </action> + </button> -<button> - <type>MV_ADVANCED_X_SETUP_MENU</type> - <text>Display</text> - <action>EXEC mythinstall -s advancedX</action> -</button> - -<button> - <type>MV_ADVANCED_SETUP_MENU</type> - <text>Advanced settings</text> - <action>EXEC mythinstall -s advanced</action> -</button> - - -<button> - <type>MV_AUDIO_SETUP_MENU</type> - <text>Audio settings</text> - <action>EXEC mythinstall -s sound </action> -</button> + <button> + <type>MV_SOFTWARE_MENU</type> + <text>Software</text> + <action>EXEC mythinstall -s plugins </action> + </button> + <button> + <type>MV_SHUTDOWN_SETUP_MENU</type> + <text>Shutdown Settings</text> + <action>EXEC mythinstall -s sleep </action> + </button> -<button> - <type>MV_ACCESS_SETUP_MENU</type> - <text>Access</text> - <action>EXEC mythinstall -s accesscontrol </action> -</button> + <button> + <type>MV_ADVANCED_X_SETUP_MENU</type> + <text>Display Settings</text> + <action>EXEC mythinstall -s advancedX</action> + </button> -<button> - <type>MV_USER_SETUP_MENU</type> - <text>Password </text> - <action>EXEC mythinstall -s user </action> -</button> + <button> + <type>MV_ADVANCED_SETUP_MENU</type> + <text>Advanced Settings</text> + <action>EXEC mythinstall -s advanced</action> + </button> -<button> - <type>MV_WEBACCESS_SETUP_MENU</type> - <text>Web security</text> - <action>EXEC mythinstall -s webuser </action> -</button> + <button> + <type>MV_AUDIO_SETUP_MENU</type> + <text>Audio Settings</text> + <action>EXEC mythinstall -s sound </action> + </button> + <button> + <type>MV_ACCESS_SETUP_MENU</type> + <text>Access Control</text> + <action>EXEC mythinstall -s accesscontrol </action> + </button> + <button> + <type>MV_USER_SETUP_MENU</type> + <text>User Accounts</text> + <action>EXEC mythinstall -s user </action> + </button> + <button> + <type>MV_WEBACCESS_SETUP_MENU</type> + <text>Web Security</text> + <action>EXEC mythinstall -s webuser </action> + </button> <!-- <button> - <type>SETUP_MENU</type> - <text>Settings profile manager</text> - <action>EXEC mythinstall -t </action> - + <type>SETUP_MENU</type> + <text>Settings Profile Manager</text> + <action>EXEC mythinstall -t </action> </button> --> - - - </mythmenu> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/trunk/mythtv/menu-xml/library.xml.patch index 14cb5f9..81ea604 100644 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/library.xml.patch +++ b/abs/core/mythtv/trunk/mythtv/menu-xml/library.xml.patch @@ -1,9 +1,9 @@ ---- 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> +--- library.xml.orig 2009-10-16 12:45:44.000000000 +0000 ++++ library.xml 2009-10-16 17:21:44.000000000 +0000 +@@ -123,8 +123,7 @@ + <text lang="HU">Online folyam lejátszása</text> <description></description> + <description lang="DE"></description> - <action>PLUGIN mythstream</action> - <depends>mythstream</depends> + <action>MENU is.xml</action> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/linhes.xml index 8bc929f..ebc848b 100644 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/linhes.xml +++ b/abs/core/mythtv/trunk/mythtv/menu-xml/linhes.xml @@ -1,36 +1,35 @@ <mythmenu name="LinHES"> - <button> - <type>SETUP_GENERAL</type> - <text>MythTV Configuration</text> - <text lang="IT">Impostazioni</text> - <text lang="ES">Configuración</text> - <text lang="CA">Configurar</text> - <text lang="FR">paramètres</text> - <text lang="DE">Zubehör / Konfiguration</text> - <text lang="DK">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="SI">Nastavitve</text> - <text lang="ET">Utiliidid / sätted</text> - <text lang="NB">Verktøy/Oppsett</text> - <text lang="CZ">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> - </button> + <button> + <type>SETUP_GENERAL</type> + <text>MythTV Configuration</text> + <text lang="IT">Impostazioni</text> + <text lang="ES">Configuración</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">設~Z</text> + <text lang="FI">Oheis/Asetukset</text> + <text lang="ZH_TW">工~E/設~Z</text> + <text lang="SL">Nastavitve</text> + <text lang="ET">Utiliidid / sätted</text> + <text lang="RU">У~Bили~B~K / ~]а~A~B~@ойки</text> + <text lang="AR">تضب~Jطات</text> + <text lang="PL">Narz~Ydzia / ustawienia</text> + <text lang="HE">ע~Vר~Y~] / ~T~R~Sר~Uת</text> + <text lang="HU">Eszközök / Beállítások</text> + <alttext lang="DE">Verschiedenes</alttext> + <alttext lang="SV">Inställningar</alttext> + <alttext lang="ET">Sätted</alttext> + <alttext lang="RU">~]а~A~B~@ойки</alttext> + <alttext lang="AR">تضب~Jطات</alttext> + <description>Configure MythTV and plugins</description> + <description lang="DE">MythTV und Plugins konfigurieren</description> + <action>MENU util_menu.xml</action> + </button> <button> <type>LINHES_SETUP</type> @@ -49,6 +48,12 @@ <text>Restore LinHES</text> <action>MENU mythrestore.xml</action> </button> - -</mythmenu> +<!--#Check for updates--> + <button> + <type>UPGRADE</type> + <text>Upgrade LinHES</text> + <action>MENU update.xml</action> + </button> +<!--#Check for updates--> +</mythmenu> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch index 0ec8143..74ace7b 100644 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch +++ b/abs/core/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch @@ -1,16 +1,13 @@ ---- 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 @@ +--- mainmenu.xml.orig 2010-03-24 13:11:27.223119163 -0400 ++++ mainmenu.xml 2010-03-24 14:18:33.922746799 -0400 +@@ -151,32 +151,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> @@ -20,18 +17,18 @@ - <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> +- <text lang="HU">Eszközök / Beállítások</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> +- <description lang="DE">MythTV und Plugins konfigurieren</description> - <action>MENU util_menu.xml</action> + <text>Service Menu</text> + <description>LinHES Service Menu</description> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/mythbackup.xml index 656860d..5914b33 100644 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/mythbackup.xml +++ b/abs/core/mythtv/trunk/mythtv/menu-xml/mythbackup.xml @@ -15,6 +15,6 @@ <button> <type>BACKUP</type> <text>No</text> - <action>MENU linhes.xml</action> + <action>UPMENU</action> </button> </mythmenu> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/mythrestore.xml index 05cb0a7..8f5c285 100644 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/mythrestore.xml +++ b/abs/core/mythtv/trunk/mythtv/menu-xml/mythrestore.xml @@ -15,6 +15,6 @@ <button> <type>BACKUP</type> <text>No</text> - <action>MENU linhes.xml</action> + <action>UPMENU</action> </button> </mythmenu> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/update.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/update.xml new file mode 100644 index 0000000..5b28833 --- /dev/null +++ b/abs/core/mythtv/trunk/mythtv/menu-xml/update.xml @@ -0,0 +1,20 @@ +<mythmenu name="LinHES"> + + <button> + <type>UPGRADE</type> + <text>Check for updates?</text> + <action>NONE</action> + </button> + + <button> + <type>UPGRADE</type> + <text>Yes</text> + <action>EXEC sudo /usr/LH/bin/linhes_update.sh</action> + </button> + + <button> + <type>UPGRADE</type> + <text>No</text> + <action>UPMENU</action> + </button> +</mythmenu> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/update2.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/update2.xml new file mode 100644 index 0000000..2ab82ea --- /dev/null +++ b/abs/core/mythtv/trunk/mythtv/menu-xml/update2.xml @@ -0,0 +1,26 @@ +<mythmenu name="LinHES"> + + <button> + <type>UPGRADE</type> + <text>Perform updates?</text> + <action>NONE</action> + </button> + + <button> + <type>UPGRADE</type> + <text>Yes</text> + <action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action> + </button> + + <button> + <type>UPGRADE</type> + <text>No</text> + <action>UPMENU</action> + </button> + + <button> + <type>UPGRADE</type> + <text>View files to be upgraded.</text> + <action>EXEC sudo /usr/LH/bin/linhes_update3.sh</action> + </button> +</mythmenu> diff --git a/abs/core/mythtv/trunk/mythtv/pretty b/abs/core/mythtv/trunk/mythtv/pretty index 1cfc57b..7e0ab21 100755 --- a/abs/core/mythtv/trunk/mythtv/pretty +++ b/abs/core/mythtv/trunk/mythtv/pretty @@ -1,2 +1,9 @@ #!/bin/bash -su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty" +if [ -f /usr/share/mythtv/contrib/user_jobs/mythlink.pl ] +then + su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --link /myth/pretty" +elif [ -f /usr/share/mythtv/contrib/user_jobs/mythrename.pl ] +then + su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty" +fi + |