diff options
Diffstat (limited to 'abs/core/mythtv/stable-0.25')
| -rw-r--r-- | abs/core/mythtv/stable-0.25/git_src/checkout_mythtv.sh | 22 | ||||
| -rw-r--r-- | abs/core/mythtv/stable-0.25/git_src/git_hash | 1 | ||||
| m--------- | abs/core/mythtv/stable-0.25/git_src/mythtv | 0 | ||||
| -rw-r--r-- | abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD | 14 | ||||
| -rw-r--r-- | abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 15 | ||||
| -rw-r--r-- | abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch | 22 |
6 files changed, 41 insertions, 33 deletions
diff --git a/abs/core/mythtv/stable-0.25/git_src/checkout_mythtv.sh b/abs/core/mythtv/stable-0.25/git_src/checkout_mythtv.sh index 7691a29..2a2df89 100644 --- a/abs/core/mythtv/stable-0.25/git_src/checkout_mythtv.sh +++ b/abs/core/mythtv/stable-0.25/git_src/checkout_mythtv.sh @@ -1,18 +1,36 @@ #!/bin/bash #Quick script used to checkout the MythTV source #This source should be used build all mythplugins & main program - +#76df8e6c8f7b84a157607d8c25fd19f39d8dc830 _gitroot="https://github.com/MythTV/mythtv.git" _gitname="mythtv" +startdir=`pwd` +#Set this to True, to update mythtv to the latest. +#If not true then it will use the hash stored in git_hash +_current="True" +_checkoutHASH=`cat git_hash` if [ -d $_gitname ] then - cd $_gitname && git pull + cd $_gitname + git checkout fixes/0.25 + git pull echo "The local files are updated." else git clone -b fixes/0.25 $_gitroot fi + +if [ -d $_gitname ] +then + cd $_gitname + if [ $_current == True ] + then + git rev-parse HEAD > $startdir/git_hash + else + git checkout $_checkoutHASH + fi +fi echo "GIT checkout done or server timeout" diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash new file mode 100644 index 0000000..67a8784 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash @@ -0,0 +1 @@ +1a671d0b252d2b33bd1e96258e65a15d52a5fc7d diff --git a/abs/core/mythtv/stable-0.25/git_src/mythtv b/abs/core/mythtv/stable-0.25/git_src/mythtv deleted file mode 160000 -Subproject 76df8e6c8f7b84a157607d8c25fd19f39d8dc83 diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD index 5a579b6..2c3db17 100644 --- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD @@ -13,6 +13,7 @@ pkgname=('mytharchive' 'mythzoneminder') pkgver=0.25 pkgrel=1 + arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') @@ -21,7 +22,8 @@ makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw2' 'dvdauthor' 'libexif' 'python-imaging' 'libcdaudio' 'taglib' 'perl-xml-simple' 'dcraw' 'libvisual' 'perl-xml-xpath' 'perl-image-size' 'perl-json' 'perl-class-inspector' 'perl-datetime-format-iso8601' - 'flac' 'libvorbis' 'python2' 'python-pycurl' 'python-oauth') + 'flac' 'libvorbis' 'python2' 'python-pycurl' 'python-oauth' + 'libcdio' 'fftw') source=(mythburn.py.patch) @@ -89,7 +91,7 @@ package_mythgame() { package_mythmusic() { pkgdesc="Music playing plugin for MythTV" - depends=("mythtv>=${pkgver}" 'flac' 'libvorbis' 'libcdaudio' 'cdparanoia' 'taglib' 'libvisual-plugins' 'projectm') + depends=("mythtv>=${pkgver}" 'flac' 'libvorbis' 'libcdaudio' 'cdparanoia' 'taglib' 'libvisual-plugins' 'libcdio' 'fftw' ) # replaces=('mythmusic') cd "${srcdir}/${_gitname}/${pkgbase}/mythmusic" make INSTALL_ROOT="${pkgdir}" install || return 1 @@ -113,14 +115,6 @@ package_mythnews() { make INSTALL_ROOT="${pkgdir}" install || return 1 } -package_mythvideo() { - pkgdesc="Video playback and browsing plugin for MythTV" - depends=("mythtv>=${pkgver}" 'mplayer' 'perl-xml-simple') -# replaces=('mythvideo') - cd "${srcdir}/${_gitname}/${pkgbase}/mythvideo" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} - package_mythweather() { pkgdesc="Weather checking plugin for MythTV" depends=("mythtv>=${pkgver}" 'perl-xml-xpath' 'perl-image-size' diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index d4e4751..dcecff0 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -7,7 +7,8 @@ pkgname=mythtv pkgver=0.25 pkgrel=1 -pkgdesc="A Homebrew PVR project" +commit_hash=`cat ../git_src/git_hash` +pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') url="http://www.mythtv.org/" license=('GPL') @@ -25,15 +26,12 @@ groups=('pvr') #options=(!strip) #MAKEFLAGS="-j6" install='mythtv.install' -patchs=('myth_settings.patch' 'git_version.patch') +patchs=('myth_settings.patch') optdepends=('xmltv: to download tv listings') -#replaces=('mythtv-contrib') conflicts=('mythvideo') source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty' ) -#_gitroot="https://github.com/MythTV/mythtv.git" -#_gitname="${pkgname}" build() { if [ -e ${srcdir}/mythtv ] @@ -90,9 +88,9 @@ package() { cp -r ${startdir}/menu-xml/*.xml ${pkgdir}/usr/share/mythtv/themes/defaultmenu/ mv ${pkgdir}/usr/share/mythtv/themes/defaultmenu/is.xml ${pkgdir}/usr/share/mythtv/ cd ${pkgdir}/usr/share/mythtv -# 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/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 @@ -107,7 +105,6 @@ package() { md5sums=('7ef6de58240e7aad389a0b13d91b1cf6' '2babd4b8e146a7538d18dcd55695b0be' '58ab374d2c51b577359ae77385ab3edf' - '03850677ea69ad83ccb92b4c0819224b' 'f735805a80b0d1180dee01f9df1b7004' 'f407d6af23e74a49540755420f84fa58' '5469d9921b726db750b991c87d226158') diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch index 0491803..9b083ac 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch @@ -1,20 +1,18 @@ ---- themes/defaultmenu/mainmenu.xml.orig 2010-11-08 22:30:08.000000000 +0000 -+++ themes/defaultmenu/mainmenu.xml 2010-11-08 22:35:51.000000000 +0000 -@@ -2,6 +2,13 @@ +--- themes/defaultmenu/mainmenu.xml.orig 2012-04-21 17:33:52.176349680 +0000 ++++ themes/defaultmenu/mainmenu.xml 2012-04-21 17:35:03.369680109 +0000 +@@ -1,5 +1,11 @@ + <?xml version="1.0" encoding="UTF-8" ?> <mythmenu name="MAIN"> - - <button> ++ <button> + <type>TV_WATCH_TV</type> + <text>Watch TV</text> + <description>Watch live television</description> + <action>TV_WATCH_LIVE</action> + </button> -+ -+ <button> + + <button> <type>MENU_MEDIA_LIBRARY</type> - <text>Media Library</text> - <action>MENU library.xml</action> -@@ -31,17 +38,10 @@ +@@ -30,17 +36,10 @@ </button> <button> @@ -26,9 +24,9 @@ - - <button> <type>MENU_UTILITIES_SETUP</type> -- <text>Utilities / Setup</text> +- <text>Setup</text> - <description>Configure MythTV and plugins</description> -- <action>MENU util_menu.xml</action> +- <action>MENU main_settings.xml</action> + <text>Service Menu</text> + <description>Configure your system</description> + <action>MENU linhes.xml</action> |