summaryrefslogtreecommitdiffstats
path: root/abs/core/mythtv/trunk
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/mythtv/trunk')
-rwxr-xr-xabs/core/mythtv/trunk/clean_all.sh2
-rw-r--r--abs/core/mythtv/trunk/morethemes/PKGBUILD15
-rwxr-xr-xabs/core/mythtv/trunk/mp_all.sh6
-rw-r--r--abs/core/mythtv/trunk/mytharchive/PKGBUILD3
-rw-r--r--abs/core/mythtv/trunk/mythbrowser/PKGBUILD3
-rw-r--r--abs/core/mythtv/trunk/mythgallery/PKGBUILD3
-rw-r--r--abs/core/mythtv/trunk/mythgame/PKGBUILD3
-rw-r--r--abs/core/mythtv/trunk/mythmovies/PKGBUILD3
-rw-r--r--abs/core/mythtv/trunk/mythmusic/PKGBUILD3
-rw-r--r--abs/core/mythtv/trunk/mythnetvision/PKGBUILD51
-rw-r--r--abs/core/mythtv/trunk/mythnews/PKGBUILD3
-rwxr-xr-xabs/core/mythtv/trunk/myththemes/PKGBUILD3
-rwxr-xr-xabs/core/mythtv/trunk/mythtv/PKGBUILD18
-rw-r--r--abs/core/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml115
-rw-r--r--abs/core/mythtv/trunk/mythtv/menu-xml/library.xml.patch10
-rw-r--r--abs/core/mythtv/trunk/mythtv/menu-xml/linhes.xml71
-rw-r--r--abs/core/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch13
-rw-r--r--abs/core/mythtv/trunk/mythtv/menu-xml/mythbackup.xml2
-rw-r--r--abs/core/mythtv/trunk/mythtv/menu-xml/mythrestore.xml2
-rw-r--r--abs/core/mythtv/trunk/mythtv/menu-xml/update.xml20
-rw-r--r--abs/core/mythtv/trunk/mythtv/menu-xml/update2.xml26
-rwxr-xr-xabs/core/mythtv/trunk/mythtv/pretty9
-rw-r--r--abs/core/mythtv/trunk/mythvideo/PKGBUILD3
-rw-r--r--abs/core/mythtv/trunk/mythweather/PKGBUILD3
-rw-r--r--abs/core/mythtv/trunk/mythweb/PKGBUILD8
-rw-r--r--abs/core/mythtv/trunk/mythzoneminder/PKGBUILD3
26 files changed, 269 insertions, 132 deletions
diff --git a/abs/core/mythtv/trunk/clean_all.sh b/abs/core/mythtv/trunk/clean_all.sh
index 1ebdc43..b56450e 100755
--- a/abs/core/mythtv/trunk/clean_all.sh
+++ b/abs/core/mythtv/trunk/clean_all.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-buildlist=('mythtv' 'mytharchive' 'mythbrowser' 'mythflix' 'mythgallery' 'mythgame' 'mythmovies' 'mythmusic' 'mythnews' 'mythvideo' 'mythweather' 'mythzoneminder' 'mythweb' 'myththemes' 'morethemes')
+buildlist=('mythtv' 'mytharchive' 'mythbrowser' 'mythgallery' 'mythgame' 'mythmovies' 'mythmusic' 'mythnetvision' 'mythnews' 'mythvideo' 'mythweather' 'mythzoneminder' 'mythweb' 'myththemes' 'morethemes')
# clean up current directory
rm -f *~
diff --git a/abs/core/mythtv/trunk/morethemes/PKGBUILD b/abs/core/mythtv/trunk/morethemes/PKGBUILD
index d3aad58..c8f892e 100644
--- a/abs/core/mythtv/trunk/morethemes/PKGBUILD
+++ b/abs/core/mythtv/trunk/morethemes/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=morethemes-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Additional themes for MythTV"
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/themes
_svnmod=themes
@@ -39,11 +40,15 @@ build() {
make distclean
# configure
- ./configure --prefix=/usr || return 1
+# ./configure --prefix=/usr || return 1
+ ./configure --prefix=/usr
# build and install
. /etc/profile
- make || return 1
- make INSTALL_ROOT=$startdir/pkg install || return 1
-
+# make || return 1
+# make INSTALL_ROOT=$startdir/pkg install || return 1
+ make
+ make INSTALL_ROOT=$startdir/pkg install
+ return 0
+#### THIS PKGBUILD IS HACKED TO BUILD WITH ZERO CONTENT RIGHT NOW ####
}
diff --git a/abs/core/mythtv/trunk/mp_all.sh b/abs/core/mythtv/trunk/mp_all.sh
index f9593ff..4aefd89 100755
--- a/abs/core/mythtv/trunk/mp_all.sh
+++ b/abs/core/mythtv/trunk/mp_all.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-pkgver=21495
+pkgver=23790
pkgrel=1
# 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')
+buildlist=('mythtv' 'mytharchive' 'mythbrowser' 'mythgallery' 'mythgame' 'mythmovies' 'mythmusic' 'mythnetvision' 'mythnews' 'mythvideo' 'mythweather' 'mythzoneminder' 'mythweb' 'myththemes' 'morethemes')
# build and install
for i in `echo ${buildlist[@]:0}`
@@ -16,7 +16,7 @@ do
sed -i s/^pkgrel=.*/pkgrel=$pkgrel/ PKGBUILD
# make the package
- mp -f -i --holdver || exit 1
+ mp -f -i --holdver --skipinteg || exit 1
# clean up afterwards
rm -rf pkg
diff --git a/abs/core/mythtv/trunk/mytharchive/PKGBUILD b/abs/core/mythtv/trunk/mytharchive/PKGBUILD
index 75779a1..20e9904 100644
--- a/abs/core/mythtv/trunk/mytharchive/PKGBUILD
+++ b/abs/core/mythtv/trunk/mytharchive/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mytharchive-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins
diff --git a/abs/core/mythtv/trunk/mythbrowser/PKGBUILD b/abs/core/mythtv/trunk/mythbrowser/PKGBUILD
index 7495407..fdcefe0 100644
--- a/abs/core/mythtv/trunk/mythbrowser/PKGBUILD
+++ b/abs/core/mythtv/trunk/mythbrowser/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythbrowser-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Mini web browser for MythTV"
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins
diff --git a/abs/core/mythtv/trunk/mythgallery/PKGBUILD b/abs/core/mythtv/trunk/mythgallery/PKGBUILD
index 7480178..6415b96 100644
--- a/abs/core/mythtv/trunk/mythgallery/PKGBUILD
+++ b/abs/core/mythtv/trunk/mythgallery/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythgallery-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Image gallery plugin for MythTV"
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins
diff --git a/abs/core/mythtv/trunk/mythgame/PKGBUILD b/abs/core/mythtv/trunk/mythgame/PKGBUILD
index 8f2e582..e7d09ab 100644
--- a/abs/core/mythtv/trunk/mythgame/PKGBUILD
+++ b/abs/core/mythtv/trunk/mythgame/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythgame-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Emulation plugin for MythTV"
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins
diff --git a/abs/core/mythtv/trunk/mythmovies/PKGBUILD b/abs/core/mythtv/trunk/mythmovies/PKGBUILD
index aca7c73..f05180c 100644
--- a/abs/core/mythtv/trunk/mythmovies/PKGBUILD
+++ b/abs/core/mythtv/trunk/mythmovies/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythmovies-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Displays information about movies playing in the area."
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins
diff --git a/abs/core/mythtv/trunk/mythmusic/PKGBUILD b/abs/core/mythtv/trunk/mythmusic/PKGBUILD
index df6d23d..3d9f5ce 100644
--- a/abs/core/mythtv/trunk/mythmusic/PKGBUILD
+++ b/abs/core/mythtv/trunk/mythmusic/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythmusic-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Music playing plugin for MythTV"
url="http://www.mythtv.org"
@@ -14,6 +14,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins
diff --git a/abs/core/mythtv/trunk/mythnetvision/PKGBUILD b/abs/core/mythtv/trunk/mythnetvision/PKGBUILD
new file mode 100644
index 0000000..c820ac5
--- /dev/null
+++ b/abs/core/mythtv/trunk/mythnetvision/PKGBUILD
@@ -0,0 +1,51 @@
+pkgname=mythnetvision-svn
+pkgver=23790
+pkgrel=1
+pkgdesc="Internet video plugin for MythTV"
+url="http://www.mythtv.org"
+license="GPL"
+arch=('i686' 'x86_64')
+
+depends=('mythtv-svn' 'python-pycurl' 'flashplugin')
+conflicts=('mythnetvision')
+groups=('mythtv-extras-svn')
+
+patches=()
+source=(`echo ${patches[@]:0}`)
+
+_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
+_svnmod=mythplugins
+
+
+build() {
+
+ svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+ svn revert -R $_svnmod
+
+ cd $startdir/src/$_svnmod
+
+ echo "--------------------------applying patches----------------------------------------------------"
+ for i in `echo ${patches[@]:0} `
+ do
+ echo applying $i
+ echo "-----------------------------"
+ patch -Np0 -i ${startdir}/src/$i || return 1
+ done
+ echo "--------------------------done applying patches-----------------------------------------------"
+
+ [ "$CARCH" = "i686" ] && ARCH="i686"
+ [ "$CARCH" = "x86_64" ] && ARCH="x86-64"
+
+ # clean up
+ make distclean
+
+ # configure
+ ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \
+ --enable-mythnetvision || return 1
+
+ # build and install
+ . /etc/profile
+ make || return 1
+ make INSTALL_ROOT=$startdir/pkg install || return 1
+
+}
diff --git a/abs/core/mythtv/trunk/mythnews/PKGBUILD b/abs/core/mythtv/trunk/mythnews/PKGBUILD
index b411e08..630325c 100644
--- a/abs/core/mythtv/trunk/mythnews/PKGBUILD
+++ b/abs/core/mythtv/trunk/mythnews/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythnews-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="News checking plugin for MythTV"
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins
diff --git a/abs/core/mythtv/trunk/myththemes/PKGBUILD b/abs/core/mythtv/trunk/myththemes/PKGBUILD
index 5d300e5..9e10ba2 100755
--- a/abs/core/mythtv/trunk/myththemes/PKGBUILD
+++ b/abs/core/mythtv/trunk/myththemes/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=myththemes-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Themes for MythTV"
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/myththemes
_svnmod=myththemes
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
+
diff --git a/abs/core/mythtv/trunk/mythvideo/PKGBUILD b/abs/core/mythtv/trunk/mythvideo/PKGBUILD
index 797b641..951a427 100644
--- a/abs/core/mythtv/trunk/mythvideo/PKGBUILD
+++ b/abs/core/mythtv/trunk/mythvideo/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythvideo-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Video playback and browsing plugin for MythTV"
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins
diff --git a/abs/core/mythtv/trunk/mythweather/PKGBUILD b/abs/core/mythtv/trunk/mythweather/PKGBUILD
index 0655236..1bc8430 100644
--- a/abs/core/mythtv/trunk/mythweather/PKGBUILD
+++ b/abs/core/mythtv/trunk/mythweather/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythweather-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Weather checking plugin for MythTV"
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins
diff --git a/abs/core/mythtv/trunk/mythweb/PKGBUILD b/abs/core/mythtv/trunk/mythweb/PKGBUILD
index 8f472b7..dedfcf5 100644
--- a/abs/core/mythtv/trunk/mythweb/PKGBUILD
+++ b/abs/core/mythtv/trunk/mythweb/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythweb-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Web interface for MythTV's backend"
url="http://www.mythtv.org"
@@ -13,6 +13,7 @@ install=mythweb.install
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins
@@ -39,9 +40,10 @@ build() {
mkdir -p $startdir/pkg/$DOCROOT/{image_cache,php_sessions}
- cp -r $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT
+# cp -r $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT
# cp $startdir/src/mythplugins-$pkgver/mythweb/data/.htaccess $startdir/pkg/$DOCROOT
- rm $startdir/pkg/srv/$DOCROOT/README
+ rsync -arp --exclude .svn --delete-excluded $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT
+ rm $startdir/pkg/$DOCROOT/README
chown -R http:users $startdir/pkg/$DOCROOT
chmod g+rw $startdir/pkg/$DOCROOT/{image_cache,php_sessions,data}
diff --git a/abs/core/mythtv/trunk/mythzoneminder/PKGBUILD b/abs/core/mythtv/trunk/mythzoneminder/PKGBUILD
index 7ace30f..038007b 100644
--- a/abs/core/mythtv/trunk/mythzoneminder/PKGBUILD
+++ b/abs/core/mythtv/trunk/mythzoneminder/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythzoneminder-svn
-pkgver=21495
+pkgver=23790
pkgrel=1
pkgdesc="Integrates ZoneMinder into MythTV"
url="http://www.mythtv.org"
@@ -12,6 +12,7 @@ groups=('mythtv-extras-svn')
patches=()
source=(`echo ${patches[@]:0}`)
+
_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
_svnmod=mythplugins