summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2013-02-01 01:58:06 (GMT)
committerJames Meyer <james.meyer@operamail.com>2013-02-01 01:58:06 (GMT)
commit6a910a0f6dd00dd2361d5ab259d37f1d5797ff50 (patch)
treede24bfbd4551fa34fee7804664b69e7fe757a94a
parentf5e4d5cd76772c52fe652d4a6472266109298bdd (diff)
downloadlinhes_pkgbuild-6a910a0f6dd00dd2361d5ab259d37f1d5797ff50.zip
linhes_pkgbuild-6a910a0f6dd00dd2361d5ab259d37f1d5797ff50.tar.gz
linhes_pkgbuild-6a910a0f6dd00dd2361d5ab259d37f1d5797ff50.tar.bz2
mythtv: latest .25-fixes and change mythbackup/restore call lh_system_$op to replace mythbackup/mythrestore. mythbackup no longer works correctly with the new windowmanager
refs #900
-rw-r--r--abs/core/mythtv/stable-0.25/git_src/git_hash2
-rw-r--r--abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD2
-rw-r--r--abs/core/mythtv/stable-0.25/mythtv/PKGBUILD8
-rw-r--r--abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml6
-rw-r--r--abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml5
5 files changed, 12 insertions, 11 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 43086a0..e29adf1 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 @@
-18c793a2450b03b78ac227d8b0417395530d55d9
+79a24c90efd3308895880cbad4a4e550986aedda
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
index de7f43f..e5dea15 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=16
+pkgrel=17
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 764dca9..3da2079 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=24
+pkgrel=25
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -102,9 +102,9 @@ build() {
#sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgver/" version.pro
#find bindings/python contrib -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
+
#Fix Python DepreciationWarning
- sed -i 's/return super(Artwork, cls).__new__(cls, attr, parent, imagetype)/return super(Artwork, cls).__new__(cls)/' ${srcdir}/mythtv/bindings/python/MythTV/dataheap.py
+ sed -i 's/return super(Artwork, cls).__new__(cls, attr, parent, imagetype)/return super(Artwork, cls).__new__(cls)/' ${srcdir}/mythtv/bindings/python/MythTV/dataheap.py
ARCH=${CARCH/_/-}
./configure --prefix=/usr --cpu=${ARCH} \
@@ -141,7 +141,7 @@ package() {
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
+ #patch -p0 < ${startdir}/menu-xml/util_menu.xml.patch || return 1
# make log dir
mkdir -p ${pkgdir}/var/log/mythtv
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml
index 5914b33..7890d88 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml
@@ -1,17 +1,17 @@
<mythmenu name="LinHES">
-
<button>
<type>BACKUP</type>
<text>Do you wish to backup?</text>
+ <description></description>
<action>NONE</action>
</button>
<button>
<type>BACKUP</type>
<text>Yes</text>
- <action>EXEC sudo /usr/LH/bin/mythbackup</action>
+ <action>EXEC sudo /usr/LH/bin/lh_system_backup &amp;</action>
</button>
-
+
<button>
<type>BACKUP</type>
<text>No</text>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml
index 8f5c285..161f13f 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml
@@ -3,15 +3,16 @@
<button>
<type>RESTORE</type>
<text>Do you wish to restore?</text>
+ <description>This will restore from most recent backup.</description>
<action>NONE</action>
</button>
<button>
<type>RESTORE</type>
<text>Yes</text>
- <action>EXEC sudo /usr/LH/bin/mythrestore</action>
+ <action>EXEC sudo /usr/LH/bin/lh_system_restore &amp;</action>
</button>
-
+
<button>
<type>BACKUP</type>
<text>No</text>