summaryrefslogtreecommitdiffstats
path: root/abs/core/mythtv
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-08-09 00:10:48 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-08-09 00:10:48 (GMT)
commiteb79c361fd072b1b5a7529f6694f5050d8373c3f (patch)
treeca77d6c7972a868dcb34f738f4b8870d564e02e7 /abs/core/mythtv
parent15699db7cc8429c3f9d7a2b516b91889e010984d (diff)
parent90514910be147bd0aa416dc29ab4cb0791844cc4 (diff)
downloadlinhes_pkgbuild-eb79c361fd072b1b5a7529f6694f5050d8373c3f.zip
linhes_pkgbuild-eb79c361fd072b1b5a7529f6694f5050d8373c3f.tar.gz
linhes_pkgbuild-eb79c361fd072b1b5a7529f6694f5050d8373c3f.tar.bz2
Merge remote-tracking branch 'origin/testing' into testing
# By Cecil (8) and Michael Hanson (4) # Via Cecil (2) and Michael Hanson (1) * origin/testing: mplayer: nothing to see here bluez: update to 4.101 linhes-scripts:Corrected scripting errors in ripD_eject.sh. linhes-scripts:Modifed ripD_eject.sh to use HandBrakeCLI. mplayer: minor correction to PKGBUILD. No pkg built. handbrake:Bumped to 0.9.8. Closes #838. mythtv:Bumped to add deps for backing up DVD. mythtv:Bumped to compiles latest 0.25.2. Added DVD backup menu. mythplugins:Bumped to compiles latest 0.25.2. linhes-scripts:Added scripts to backup one's DVD. lsdvd:initial inclusion. For use with ripD. linhes-scripts: fix for myth2mkv Conflicts: abs/core/mplayer/PKGBUILD abs/core/mythtv/stable-0.25/git_src/git_hash abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
Diffstat (limited to 'abs/core/mythtv')
-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/PKGBUILD20
-rw-r--r--abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml39
-rw-r--r--abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch10
-rw-r--r--abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch13
6 files changed, 67 insertions, 19 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 83e574c..0891f19 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 @@
-46cab93562429cd19029402a2387f63a72aeb898
+a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
index 51549e6..bd4a40c 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=4
+pkgrel=6
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 8ed3ef1..8d77484 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=9
+pkgrel=11
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://www.mythtv.org/"
license=('GPL')
depends=('mysql-clients'
'qt'
- 'qtwebkit'
+ 'qtwebkit'
'lame'
'lirc-utils'
'ffmpeg'
@@ -45,7 +45,9 @@ depends=('mysql-clients'
'glew'
'openssl'
'libxml2'
- 'libass' )
+ 'lsdvd'
+ 'libass'
+ 'dvdbackup')
#glew for gpu commerical flagging
#openssl for roap
@@ -121,13 +123,11 @@ package() {
# patch the xml LinHES style
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/
-
-#jM
-# 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/util_menu.xml.patch || return 1
+ 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/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/dvd_backup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml
new file mode 100644
index 0000000..2647d81
--- /dev/null
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<mythmenu name="OPTICAL_DISK">
+
+ <button>
+ <type>DVD_RIP</type>
+ <text>Mirror DVD</text>
+ <description>Creates a mirror of your DVD</description>
+ <action>EXEC /usr/LH/bin/ripD_eject.sh m &amp;</action>
+ </button>
+
+ <button>
+ <type>DVD_RIP</type>
+ <text>ISO of DVD</text>
+ <description>Creates an ISO of your DVD</description>
+ <action>EXEC /usr/LH/bin/ripD_eject.sh i &amp;</action>
+ </button>
+
+ <button>
+ <type>DVD_RIP</type>
+ <text>High Quality</text>
+ <description>Creates a high quality MPEG4 of your DVD</description>
+ <action>EXEC /usr/LH/bin/ripD_eject.sh h &amp;</action>
+ </button>
+
+ <button>
+ <type>DVD_RIP</type>
+ <text>Normal Quality</text>
+ <description>Creates a normal quality MPEG4 of your DVD</description>
+ <action>EXEC /usr/LH/bin/ripD_eject.sh n &amp;</action>
+ </button>
+
+ <button>
+ <type>DVD_RIP</type>
+ <text>Low Quality</text>
+ <description>Creates a low quality MPEG4 of your DVD</description>
+ <action>EXEC /usr/LH/bin/ripD_eject.sh l &amp;</action>
+ </button>
+
+</mythmenu>
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 9b083ac..73a8940 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,5 +1,5 @@
---- 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
+--- themes/defaultmenu/mainmenu.xml.orig 2012-07-29 21:39:46.000000000 +0000
++++ themes/defaultmenu/mainmenu.xml 2012-07-29 21:41:50.000000000 +0000
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<mythmenu name="MAIN">
@@ -12,7 +12,7 @@
<button>
<type>MENU_MEDIA_LIBRARY</type>
-@@ -30,17 +36,10 @@
+@@ -30,18 +36,11 @@
</button>
<button>
@@ -27,9 +27,11 @@
- <text>Setup</text>
- <description>Configure MythTV and plugins</description>
- <action>MENU main_settings.xml</action>
+- <password>SetupPinCode</password>
+ <text>Service Menu</text>
+ <description>Configure your system</description>
-+ <action>MENU linhes.xml</action>
++ <action>MENU linhes.xml</action>
++ <password>SetupPinCode</password>
</button>
</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
index 143424f..1ff2db2 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
@@ -1,10 +1,17 @@
---- themes/defaultmenu/optical_menu.xml.orig 2010-11-06 00:39:43.000000000 +0000
-+++ themes/defaultmenu/optical_menu.xml 2010-11-06 00:42:59.000000000 +0000
-@@ -26,6 +26,13 @@
+--- themes/defaultmenu/optical_menu.xml.orig 2012-05-02 18:41:38.000000000 +0000
++++ themes/defaultmenu/optical_menu.xml 2012-07-30 05:33:03.000000000 +0000
+@@ -17,6 +17,20 @@
</button>
<button>
+ <type>DVD_RIP</type>
++ <text>Backup DVD</text>
++ <description>Backup your DVDs</description>
++ <action>MENU dvd_backup.xml</action>
++ </button>
++
++ <button>
++ <type>DVD_RIP</type>
+ <text>Import video files from DVD</text>
+ <description>Import video files from a data DVD</description>
+ <action>EXEC /usr/LH/bin/importfiles.sh</action>