From bb7f78571109f3fcfa39486fe1248816fdeded96 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 7 Aug 2012 12:41:55 -0500
Subject: mythtv & plugins

---
 abs/core/mythtv/stable-0.25/git_src/git_hash        |  2 +-
 abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD    |  2 +-
 abs/core/mythtv/stable-0.25/mythplugins/__changelog |  1 +
 abs/core/mythtv/stable-0.25/mythtv/PKGBUILD         | 20 ++++++++++++--------
 4 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 abs/core/mythtv/stable-0.25/mythplugins/__changelog

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 ae0574c..83e574c 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 @@
-f0e2ad85dbdd6dd4041a8b1e7d8b17e7b8746b63
+46cab93562429cd19029402a2387f63a72aeb898
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
index 2ebe525..51549e6 100644
--- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
@@ -101,7 +101,7 @@ package_mythnetvision() {
   pkgdesc="MythNetvision plugin for MythTV"
 
 
-  depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth'  'python-lxml' )
+  depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth'  'python2-lxml' )
 #  replaces=('mythnetvision')
   cd "${srcdir}/${_gitname}/${pkgbase}/mythnetvision"
   make INSTALL_ROOT="${pkgdir}" install || return 1
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/__changelog b/abs/core/mythtv/stable-0.25/mythplugins/__changelog
new file mode 100644
index 0000000..48cdce8
--- /dev/null
+++ b/abs/core/mythtv/stable-0.25/mythplugins/__changelog
@@ -0,0 +1 @@
+placeholder
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 0d5f979..8ed3ef1 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -14,9 +14,10 @@ url="http://www.mythtv.org/"
 license=('GPL')
 depends=('mysql-clients' 
          'qt'
+	 'qtwebkit'
          'lame'
          'lirc-utils'
-         'ffmpeg-svn'
+         'ffmpeg'
          'fribidi'
          'perl-soap-lite'
          'perl-date-manip' 
@@ -29,7 +30,7 @@ depends=('mysql-clients'
          'wget' 
          'libiec61883'
          'mysql-python'
-         'python-lxml'
+         'python2-lxml'
          'mesa'
          'libxinerama'
          'libxrandr'
@@ -43,7 +44,8 @@ depends=('mysql-clients'
          'perl-io-socket-inet6'
          'glew'
          'openssl'
-         'libxml2')
+         'libxml2'
+	 'libass' )
 
 #glew for gpu commerical flagging
 #openssl for roap
@@ -119,11 +121,13 @@ 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/
-  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
+
+#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
 
   # make log dir
   mkdir -p ${pkgdir}/var/log/mythtv
-- 
cgit v0.12