diff options
| author | Britney Fransen <brfransen@gmail.com> | 2018-08-21 20:11:34 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2018-08-21 20:11:34 (GMT) |
| commit | f5c3244d991ea56575fea38668c6f3958124ad4c (patch) | |
| tree | ba412cabc33b449e9e9345195fbe84c5e337c322 | |
| parent | dda78ea873382b1b7ed0f3868bb4c5f84b27418a (diff) | |
| download | linhes_pkgbuild-f5c3244d991ea56575fea38668c6f3958124ad4c.zip linhes_pkgbuild-f5c3244d991ea56575fea38668c6f3958124ad4c.tar.gz linhes_pkgbuild-f5c3244d991ea56575fea38668c6f3958124ad4c.tar.bz2 | |
mythtv & mythplugins: update to latest -fixes
4 files changed, 19 insertions, 3 deletions
diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash index d3aa589..524ff49 100644 --- a/abs/core/mythtv/stable-29/git_src/git_hash +++ b/abs/core/mythtv/stable-29/git_src/git_hash @@ -1 +1 @@ -03d4baabf36088da8cc30840b4bdb4a3ef0a8a22 +e5fc66e822072037aeaf8c54c4292f17f65cef56 diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD index fc01856..7dcae9e 100644 --- a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=29.1 -pkgrel=7 +pkgrel=9 arch=('x86_64') url="http://www.mythtv.org" license=('GPL') @@ -20,6 +20,7 @@ makedepends=('cdrkit' 'dcraw' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexi 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python2-pillow' 'python2-pycurl' 'zlib') source=('mythburn.py-aspectratio.patch' + 'mythburn.cpp-python2.patch' 'cdparanoia.patch' '0317-0336-MythMusic-Fix-Playlist-copyTracks-and-removeAllTrack.patch' ) @@ -40,6 +41,7 @@ prepare() { msg "Change python to python2" find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np1 -i "$srcdir/mythburn.cpp-python2.patch" msg "Patching Configure" cd ${srcdir}/${pkgbase} @@ -130,5 +132,6 @@ package_mythzoneminder() { } md5sums=('e98c2a09bcb051fdde959fb4bb2e5ab2' + 'b9edd8f7da64ffa74baa91092bd48cc9' '5de8dd79d0b8a2b006f3c3258938b6b7' '0299d0214c0d3a452c0284352435d698') diff --git a/abs/core/mythtv/stable-29/mythplugins/mythburn.cpp-python2.patch b/abs/core/mythtv/stable-29/mythplugins/mythburn.cpp-python2.patch new file mode 100644 index 0000000..2c43f9e --- /dev/null +++ b/abs/core/mythtv/stable-29/mythplugins/mythburn.cpp-python2.patch @@ -0,0 +1,13 @@ +diff --git a/mythplugins/mytharchive/mytharchive/mythburn.cpp b/mythplugins/mytharchive/mytharchive/mythburn.cpp +index 4188579bb0..639f17abe9 100644 +--- a/mythplugins/mytharchive/mytharchive/mythburn.cpp ++++ b/mythplugins/mytharchive/mytharchive/mythburn.cpp +@@ -950,7 +950,7 @@ void MythBurn::runScript() + QFile::remove(logDir + "/mythburncancel.lck"); + + createConfigFile(configDir + "/mydata.xml"); +- commandline = "python " + GetShareDir() + "mytharchive/scripts/mythburn.py"; ++ commandline = "python2 " + GetShareDir() + "mytharchive/scripts/mythburn.py"; + commandline += " -j " + configDir + "/mydata.xml"; // job file + commandline += " -l " + logDir + "/progress.log"; // progress log + commandline += " > " + logDir + "/mythburn.log 2>&1 &"; // Logs diff --git a/abs/core/mythtv/stable-29/mythtv/PKGBUILD b/abs/core/mythtv/stable-29/mythtv/PKGBUILD index 5061c20..a850229 100644 --- a/abs/core/mythtv/stable-29/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=29.1 -pkgrel=7 +pkgrel=9 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('x86_64') |