diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-10-19 19:21:35 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-10-19 19:21:35 (GMT) |
| commit | 59bb81e4db2bda0d63e2fb7f895792dba6c20073 (patch) | |
| tree | 09ed11c77b968807e8c88755fb82236a0d1b7447 /abs/core-testing | |
| parent | 0d75027f7b76a40a8393ea12c9349051d82863d1 (diff) | |
| parent | 3b0242f860b4efa19fd91a6bd1e3127fd4b8aa9f (diff) | |
| download | linhes_pkgbuild-59bb81e4db2bda0d63e2fb7f895792dba6c20073.zip linhes_pkgbuild-59bb81e4db2bda0d63e2fb7f895792dba6c20073.tar.gz linhes_pkgbuild-59bb81e4db2bda0d63e2fb7f895792dba6c20073.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing')
32 files changed, 324 insertions, 144 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 1e61fdf..a336bfd 100644 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.1 -pkgrel=1 +pkgrel=6 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted @@ -33,6 +33,7 @@ source=(mv_install.py README mv_advanced.py mv_common.py + mv_ddns.py mv_ir.py mv_misc.py mv_network.py @@ -76,6 +77,7 @@ build() { install -m 0755 mv_install.py $MVDIR/bin/mv_install.py install -m 0755 mv_advanced.py $MVDIR/bin/ install -m 0755 mv_common.py $MVDIR/bin/ + install -m 0755 mv_ddns.py $MVDIR/bin/ install -m 0755 mv_ir.py $MVDIR/bin/ install -m 0755 mv_misc.py $MVDIR/bin/ install -m 0755 mv_network.py $MVDIR/bin/ diff --git a/abs/core-testing/LinHES-config/mv_ddns.py b/abs/core-testing/LinHES-config/mv_ddns.py new file mode 100755 index 0000000..e43a7ce --- /dev/null +++ b/abs/core-testing/LinHES-config/mv_ddns.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +import logging, mv_common +import os, re + +config_file = "mv_config" + +def setup_ddns(systemconfig): + logging.info("____Start of setup_ddns____") + + if systemconfig["DDnsEnable"] == "1": + logging.debug(" Enabling DDNS") + cmd = ''' pacman --noconfirm -Sf ddclient ''' + mv_common.runcmd(cmd) + mv_common.cp_and_log("/etc/ddclient/ddclient.conf.dynamic.dyndns.sample", + "/etc/ddclient/ddclient.conf") + cmd = ''' sed -i -e "s/your-dynamic-dyndns-login/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnslogin"]) + mv_common.runcmd(cmd) + cmd = ''' sed -i -e "s/your-dynamic-dyndns-password/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnspassword"]) + mv_common.runcmd(cmd) + cmd = ''' sed -i -e "s/your-dynamic-dyndns-host/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnshostname"]) + mv_common.runcmd(cmd) + mv_common.add_service("ddclient") + else: + logging.debug(" Disabling DDNS") + mv_common.remove_service("ddclient") + + logging.info("__End of ddns\n") diff --git a/abs/core-testing/LinHES-config/systemconfig.py b/abs/core-testing/LinHES-config/systemconfig.py index c559e09..28e2e7a 100755 --- a/abs/core-testing/LinHES-config/systemconfig.py +++ b/abs/core-testing/LinHES-config/systemconfig.py @@ -147,7 +147,8 @@ def main(argv): mv_webuser.setup_web_auth(systemconfig["UseMythWEB_auth"]) if cmdmodule["ddns"]: - print " LOOK FOR DDNS" + import mv_ddns + mv_ddns.setup_ddns(systemconfig) if cmdmodule["screensaver"]: import mv_screensaver diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD index 4b3244f..086e08a 100644 --- a/abs/core-testing/linhes-scripts/PKGBUILD +++ b/abs/core-testing/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=1 -pkgrel=35 +pkgrel=38 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -32,12 +32,13 @@ run-limit-mythcommflag linhes_update.sh linhes_update2.sh linhes_update3.sh +install_hulu.sh ) build() { cd $startdir/src mkdir -p $startdir/pkg/usr/LH/bin - install -D -m755 myt* 770* idle.sh imp* shoo* *commflag*sh mplayer* vdpau* screen* linhes_* $startdir/pkg/usr/LH/bin + install -D -m755 myt* 770* idle.sh imp* shoo* *commflag*sh mplayer* vdpau* screen* linhes_* install_hulu.sh $startdir/pkg/usr/LH/bin mkdir -p $startdir/pkg/etc/sv/pause-mythcommflag/supervise cp run-pause-mythcommflag $startdir/pkg/etc/sv/pause-mythcommflag/run mkdir -p $startdir/pkg/etc/sv/limit-mythcommflag/supervise diff --git a/abs/core-testing/linhes-scripts/install_hulu.sh b/abs/core-testing/linhes-scripts/install_hulu.sh new file mode 100644 index 0000000..28e855c --- /dev/null +++ b/abs/core-testing/linhes-scripts/install_hulu.sh @@ -0,0 +1,70 @@ +#!/bin/bash +#install_hulu.sh +if [ -e /tmp/huludesktop_i386.deb ] +then +cd /tmp +deb2targz huludesktop_i386.deb +tar -xzvf huludesktop_i386.tar.gz -C / +else +echo "Cannot find huludesktop_i386.deb." +echo "Please download it from http://www.hulu.com/labs/hulu-desktop-linux" +echo "Then copy (or move) it to /tmp" +exit +fi +if grep -q Hulu /usr/share/mythtv/is.xml +then +echo "Hulu Desktop exist in Online Streams!" +else + mv /usr/share/mythtv/is.xml /tmp + grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp + echo "<!--#Hulu-->" >> /tmp/is.xml.tmp + echo " <button>" >> /tmp/is.xml.tmp + echo " <type>STREAM</type>" >> /tmp/is.xml.tmp + echo " <text>Hulu Desktop</text>" >> /tmp/is.xml.tmp + echo " <action>EXEC huludesktop</action>" >> /tmp/is.xml.tmp + echo " </button>" >> /tmp/is.xml.tmp + echo "<!--#Hulu-->" >> /tmp/is.xml.tmp + echo "" >> /tmp/is.xml.tmp + echo "</mythmenu>" >> /tmp/is.xml.tmp + mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml +echo "Hulu Desktop has been added to Online Streams!" +fi +if [ -e /home/mythtv/.huludesktop ] +then +echo "Found existing Hulu configuration file." +else +cat >> /home/mythtv/.huludesktop << EOF +[display] +fullscreen = TRUE +width = 1024 +height = 576 +pos_x = 201 +pos_y = 179 + +[remote] +lirc_device = /dev/lircd +lirc_remote_identifier = mceusb +lirc_release_suffix = _UP +lirc_repeat_threshold = 10 +button_name_up = Up +button_name_down = Down +button_name_left = Left +button_name_right = Right +button_name_select = OK +button_name_menu = Home + +[flash] +flash_location = /usr/lib/mozilla/plugins/libflashplayer.so + +[screensaver] +suspend_script = /usr/bin/xscreensaver-command -deactivate +resume_script = /usr/bin/xscreensaver-command -activate + +[version] +latest = (null) +eula_version = 0 +EOF +chown mythtv.mythtv /home/mythtv/.huludesktop +fi +echo "Integration of Hulu Desktop is now complete!" +echo "Thanks for using LinHES!" diff --git a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD index d3aad58..16f50ec 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Additional themes for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/themes +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/themes +#_svntrunk=http://cvs.mythtv.org/svn/trunk/themes _svnmod=themes diff --git a/abs/core-testing/mythtv/trunk/mp_all.sh b/abs/core-testing/mythtv/trunk/mp_all.sh index f9593ff..c778047 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 -pkgver=21495 +pkgver=22494 pkgrel=1 # NOTE: Make sure to build and install mythtv first BEFORE building anything else diff --git a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD index 75779a1..9efb01f 100644 --- a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mytharchive-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows." url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD index 7495407..31872d3 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Mini web browser for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD index e4ffbbf..9ebc985 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Netflix access plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD index 7480178..c00fd81 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Image gallery plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD index 8f2e582..be1226b 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Emulation plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD index aca7c73..a794e3d 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Displays information about movies playing in the area." url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD index df6d23d..4c0b5b7 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Music playing plugin for MythTV" url="http://www.mythtv.org" @@ -14,7 +14,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD index b411e08..19f9430 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="News checking plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD index 5d300e5..2dacdb2 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Themes for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/myththemes +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/myththemes +#_svntrunk=http://cvs.mythtv.org/svn/trunk/myththemes _svnmod=myththemes diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD index db119bd..d984ae4 100755 --- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythtv-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="A personal video recorder for Linux" url="http://www.mythtv.org" @@ -22,7 +22,8 @@ source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfron arch=('i686' 'x86_64') #md5sums=() -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythtv +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythtv +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythtv _svnmod=mythtv build() { 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..ac52497 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 @@ -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-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch index 14cb5f9..81ea604 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,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-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml index 8bc929f..ebc848b 100644 --- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml +++ b/abs/core-testing/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-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch index 0ec8143..ed5dc72 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,14 +1,12 @@ ---- 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 2009-10-16 12:45:44.000000000 +0000 ++++ mainmenu.xml 2009-10-16 14:30:57.000000000 +0000 +@@ -157,33 +157,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> @@ -20,18 +18,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-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml index 656860d..5914b33 100644 --- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml +++ b/abs/core-testing/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-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml index 05cb0a7..8f5c285 100644 --- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml +++ b/abs/core-testing/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-testing/mythtv/trunk/mythtv/menu-xml/update.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/update.xml new file mode 100644 index 0000000..5b28833 --- /dev/null +++ b/abs/core-testing/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-testing/mythtv/trunk/mythtv/menu-xml/update2.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/update2.xml new file mode 100644 index 0000000..2ab82ea --- /dev/null +++ b/abs/core-testing/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-testing/mythtv/trunk/mythvideo/PKGBUILD b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD index 797b641..9581d9a 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Video playback and browsing plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD index 0655236..4340ee7 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Weather checking plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD index 8f472b7..94662e2 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Web interface for MythTV's backend" url="http://www.mythtv.org" @@ -13,7 +13,8 @@ install=mythweb.install patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins DOCROOT=/data/srv/httpd/htdocs/mythweb diff --git a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD index 7ace30f..decdad3 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=21495 +pkgver=22494 pkgrel=1 pkgdesc="Integrates ZoneMinder into MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD index 1615994..3407502 100755 --- a/abs/core-testing/runit-scripts/PKGBUILD +++ b/abs/core-testing/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=1.8.0 -pkgrel=95 +pkgrel=97 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core-testing/runit-scripts/runitscripts/services/ddclient/run b/abs/core-testing/runit-scripts/runitscripts/services/ddclient/run new file mode 100755 index 0000000..c5488f6 --- /dev/null +++ b/abs/core-testing/runit-scripts/runitscripts/services/ddclient/run @@ -0,0 +1,8 @@ +#!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting ddclient" + + +exec /usr/sbin/ddclient -foreground &> /var/log/ddclient.log diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run index 0a398ac..9498f02 100755 --- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run +++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run @@ -82,14 +82,14 @@ else if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] then - CMD="/usr/sbin/lircd -n --driver=commandir" + CMD="/usr/sbin/lircd -r -n --driver=commandir" printhl " Using commandir" $CMD >>$LOG 2>>$LOG #echo $CMD elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ] then sv start igdaemon - CMD="/usr/sbin/lircd -n --driver=iguanaIR" + CMD="/usr/sbin/lircd -r -n --driver=iguanaIR" printhl " Using iguanaIR usb" #echo $CMD $CMD >>$LOG 2>>$LOG @@ -98,7 +98,7 @@ else for i in `seq 1 $num_lirc` do - CMD="/usr/sbin/lircd -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" + CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" printhl " Device $i" #echo $CMD $CMD >>$LOG 2>>$LOG @@ -109,9 +109,9 @@ else then if [ x$Remotetype = "xdvico" ] then - LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico --output /dev/lircd" + LCMD="/usr/sbin/lircd -r -n -d /dev/usb/dvicoIR --driver=dvico --output /dev/lircd" else - LCMD="/usr/sbin/lircd -n -d /dev/input/irremote --driver=devinput --output /dev/lircd" + LCMD="/usr/sbin/lircd -r -n -d /dev/input/irremote --driver=devinput --output /dev/lircd" fi if [ $num_lirc -lt 0 ] @@ -127,10 +127,10 @@ else $CMD >> $LOG LASTCMD="--connect=localhost:876$i $LASTCMD " printhl " Device Dvico" - /usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd $LASTCMD >>$LOG 2>>$LOG + /usr/sbin/lircd -r -n -d /dev/lirc0 --output /dev/lircd $LASTCMD >>$LOG 2>>$LOG fi else - LCMD="/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd $LASTCMD" + LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /dev/lircd $LASTCMD" #echo $LCMD exec $LCMD >>$LOG 2>>$LOG fi |