diff options
author | Britney Fransen <brfransen@gmail.com> | 2013-07-02 14:40:58 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2013-07-02 14:40:58 (GMT) |
commit | 6df05bf800839e95f4b03f67207e7fdba3a4c90b (patch) | |
tree | 6d98eb6a8eb3ed5c16f8b8a1a2ad8c8ac5083d3b /abs/core/mythtv/stable-0.25 | |
parent | 5d810f391b2071415598c8d29dd96d4c1c38ae1d (diff) | |
parent | c9041c8753b14ad9616c8dc3deb0e0426d94fd5f (diff) | |
download | linhes_pkgbuild-6df05bf800839e95f4b03f67207e7fdba3a4c90b.zip linhes_pkgbuild-6df05bf800839e95f4b03f67207e7fdba3a4c90b.tar.gz linhes_pkgbuild-6df05bf800839e95f4b03f67207e7fdba3a4c90b.tar.bz2 |
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/mythtv/stable-0.25')
5 files changed, 11 insertions, 10 deletions
diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash index e29adf1..474b835 100644 --- a/abs/core/mythtv/stable-0.25/git_src/git_hash +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash @@ -1 +1 @@ -79a24c90efd3308895880cbad4a4e550986aedda +ed3b7d10a63178bff5ce4134613ff86a85d73830 diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD index e5dea15..3228a58 100644 --- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD @@ -12,7 +12,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.25 -pkgrel=17 +pkgrel=18 arch=('i686' 'x86_64') url="http://www.mythtv.org" diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index 3da2079..730bb71 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mythtv pkgver=0.25 -pkgrel=25 +pkgrel=26 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -66,7 +66,9 @@ install='mythtv.install' #http://code.mythtv.org/trac/ticket/10773 mythexpress #http://code.mythtv.org/trac/ticket/10825 mythexpress #http://code.mythtv.org/trac/ticket/11032 mythexpress -patchs=('myth_settings.patch' 'MythBase.php.patch' +#patchs=('myth_settings.patch' 'MythBase.php.patch' + +patchs=('myth_settings.patch' 'bonjour-correction.patch' '0001-protect-metadata-loads-from-multiple-threads.patch' '0004-restore-fe-netcontrol-play-resume-functionality.patch') @@ -155,7 +157,6 @@ package() { md5sums=('7ef6de58240e7aad389a0b13d91b1cf6' '2babd4b8e146a7538d18dcd55695b0be' '322f48528b350f0e6aebfff6eab4c4ee' - '9ec33d6956464283636c1f9a781dd4fd' '8e2a055bb3beae04c88a8e603e080422' '67f7316c750fba17fa578d10840b9dbd' 'ae23e6a8cffbe335fa37bf59978bf7a2' diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch index 8c36a62..8f80928 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch @@ -5,8 +5,8 @@ <button> + <type>STREAM</type> -+ <text>Play Online Streams</text> -+ <description></description> ++ <text>Online Content</text> ++ <description>Play content from online sources</description> + <action>MENU gen_is.xml</action> + </button> + diff --git a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD index 5e1c853..728b6dc 100644 --- a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.25 -pkgrel=6 +pkgrel=7 commit_hash=`cat ../git_src/git_hash_web` @@ -13,7 +13,8 @@ depends=('mythtv>=0.25' 'lighttpd' 'php' 'local-website') groups=('mythtv-extras') install=mythweb.install #http://code.mythtv.org/trac/ticket/10504 -patches=(schedules.php.patch sorting.php.patch tv-schedules.php.patch) +#patches=(schedules.php.patch sorting.php.patch tv-schedules.php.patch) +patches=(schedules.php.patch tv-schedules.php.patch) source=(`echo ${patches[@]:0}` mythweb.include mythweb_gen_light.conf) DOCROOT=/data/srv/httpd/mythweb @@ -69,7 +70,6 @@ build() { } md5sums=('392e570594859c026ac12194920246d8' - '53cc59d6a8bf144027b25d5dcbfffc66' '515e29fda503c199888a91553e1815a0' '7645a6399434cbba35639713ac5d88e0' 'df190116b3aba35720fb6631885f973f') |