Merge branch 'testing'

11 files changed, 162 insertions, 95 deletions

diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 76debbd..90dd836 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-7f548de029ed84870538c87193b8b9f650cf0c5a
+b305eb5b7fc662146e74983fa3754d622695cdeb
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash_web b/abs/core/mythtv/stable-0.27/git_src/git_hash_web
index fbb64a1..90a5feb 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash_web
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash_web
@@ -1 +1 @@
-6d10afe73e1fb5f21688d4b6d6919cab618e6e88
+fca2bd2f78136a5363b1fbe7a313677b6bd1adc5
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 8a651cd..1747521 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -8,8 +8,8 @@ pkgname=('mytharchive'
          'mythnews'
          'mythweather'
          'mythzoneminder')
-pkgver=0.27
-pkgrel=9
+pkgver=0.27.4
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
@@ -17,9 +17,10 @@ makedepends=('cdrkit' 'dcraw' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexi
              'libvorbis' 'mesa' 'libgl' 'mplayer' "mythtv>=${pkgver}"
              'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
              'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
-             'perl-xml-simple' 'perl-xml-xpath' 'python-oauth' 'python-imaging'
+             'perl-xml-simple' 'perl-xml-xpath' 'python-oauth' 'python2-pillow'
              'python-pycurl' 'zlib')
-source=('mythburn.py-aspectratio.patch')
+source=('mythburn.py-aspectratio.patch' 'archivemenu.xml.patch' 'archiveutils.xml.patch'
+        'cdparanoia.patch')
 
 build() {
     if [ -e ${srcdir}/mythplugins ]
@@ -33,6 +34,9 @@ build() {
     cp -rp ../git_src/mythtv/mythplugins $srcdir
     cd ${srcdir}/${pkgbase}
 
+    msg "Patching configure"
+    patch -Np1 -i "$srcdir/cdparanoia.patch"
+
     msg "Configuring mythplugins"
     ./configure --prefix=/usr \
                 --enable-all \
@@ -46,9 +50,11 @@ build() {
 package_mytharchive() {
     pkgdesc="Create DVDs or archive recorded shows in MythTV"
     depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' "mythtv>=${pkgver}"
-             'python-imaging')
+             'mjpegtools' 'python2-pillow')
     cd "${srcdir}/${_gitname}/${pkgbase}/mytharchive"
     patch mythburn/scripts/mythburn.py < $srcdir/mythburn.py-aspectratio.patch || return 1
+    patch theme/menus/archivemenu.xml < $srcdir/archivemenu.xml.patch || return 1
+    patch theme/menus/archiveutils.xml < $srcdir/archiveutils.xml.patch || return 1
     make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
@@ -75,7 +81,7 @@ package_mythgame() {
 
 package_mythmusic() {
     pkgdesc="Music playing plugin for MythTV"
-    depends=('cdparanoia' 'fftw' 'flac' 'libcdaudio' 'libcdio' 
+    depends=('cdparanoia' 'fftw' 'flac' 'libcdaudio' 'libcdio-paranoia' 
              'libvisual-plugins' 'libvorbis' "mythtv>=${pkgver}" 'taglib')
     cd "${srcdir}/${_gitname}/${pkgbase}/mythmusic"
     make INSTALL_ROOT="${pkgdir}" install || return 1
@@ -113,4 +119,7 @@ package_mythzoneminder() {
     make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
-md5sums=('e98c2a09bcb051fdde959fb4bb2e5ab2')
+md5sums=('e98c2a09bcb051fdde959fb4bb2e5ab2'
+         '0364d2613f22943f3d4c9d5ee43c1982'
+         '1063cf62878cd341476f28f63cb12782'
+         '5de8dd79d0b8a2b006f3c3258938b6b7')
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/archivemenu.xml.patch b/abs/core/mythtv/stable-0.27/mythplugins/archivemenu.xml.patch
new file mode 100644
index 0000000..f53e9d0
--- /dev/null
+++ b/abs/core/mythtv/stable-0.27/mythplugins/archivemenu.xml.patch
@@ -0,0 +1,32 @@
+--- archivemenu.xml.orig	2014-02-11 23:01:41.292364208 +0000
++++ archivemenu.xml	2014-02-11 23:02:13.544892518 +0000
+@@ -3,12 +3,14 @@
+    <button>
+       <type>ARCHIVE_CREATE_DVD</type>
+       <text>Create DVD</text>
++      <description>Save recordings and videos to video DVD</description>
+       <action>ARCHIVE_CREATE_DVD</action>
+    </button>
+ 
+    <button>
+       <type>ARCHIVE_CREATE_ARCHIVE</type>
+       <text>Create Archive</text>
++      <description>Save recordings and videos to a native archive</description>
+       <action>ARCHIVE_CREATE_ARCHIVE</action>
+   </button>
+ 
+@@ -22,12 +24,14 @@
+    <button>
+        <type>ARCHIVE_IMPORT_VIDEO</type>
+        <text>Import Archive</text>
++       <description>Import recordings from a native archive</description>
+        <action>ARCHIVE_IMPORT_VIDEO</action>
+    </button>
+ 
+    <button>
+        <type>ARCHIVE_UTILITIES</type>
+        <text>Archive Utilities</text>
++       <description>Utilities for MythArchive</description>
+        <action>MENU archiveutils.xml</action>
+    </button>
+ 
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/archiveutils.xml.patch b/abs/core/mythtv/stable-0.27/mythplugins/archiveutils.xml.patch
new file mode 100644
index 0000000..9c17678
--- /dev/null
+++ b/abs/core/mythtv/stable-0.27/mythplugins/archiveutils.xml.patch
@@ -0,0 +1,27 @@
+--- archiveutils.xml.orig	2014-02-11 23:01:41.292364208 +0000
++++ archiveutils.xml	2014-02-11 23:02:13.544892518 +0000
+@@ -2,19 +2,22 @@
+ 
+    <button>
+       <type>ARCHIVE_LAST_LOG</type>
+-      <text>Show Log Viewer</text>
++      <text>Log Viewer</text>
++      <description>Show the Archive Log Viewer</description>
+       <action>ARCHIVE_LAST_LOG</action>
+    </button>
+ 
+    <button>
+        <type>ARCHIVE_TEST_DVD</type>
+        <text>Play Created DVD</text>
++       <description>Play the last created archive DVD</description>
+        <action>ARCHIVE_TEST_DVD</action>
+    </button>
+ 
+    <button>
+        <type>ARCHIVE_BURN_DVD</type>
+-       <text>Burn DVD</text>
++       <text>Burn Created DVD</text>
++       <description>Burn the last created archive to DVD</description>
+        <action>ARCHIVE_BURN_DVD</action>
+    </button>
+ 
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/cdparanoia.patch b/abs/core/mythtv/stable-0.27/mythplugins/cdparanoia.patch
new file mode 100644
index 0000000..b4d1449
--- /dev/null
+++ b/abs/core/mythtv/stable-0.27/mythplugins/cdparanoia.patch
@@ -0,0 +1,52 @@
+diff -Nru a/configure b/configure
+--- a/configure	2012-10-02 23:30:24.000000000 +1300
++++ b/configure	2013-01-09 14:54:40.448916370 +1300
+@@ -649,7 +649,7 @@
+         echo "MythMusic requires FLAC."
+     fi
+ 
+-    if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
++    if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
+         disable cdio
+     fi
+ 
+diff -Nru a/mythmusic/mythmusic/cddecoder.cpp b/mythmusic/mythmusic/cddecoder.cpp
+--- a/mythmusic/mythmusic/cddecoder.cpp	2012-10-02 23:30:24.000000000 +1300
++++ b/mythmusic/mythmusic/cddecoder.cpp	2013-01-09 14:53:37.031690618 +1300
+@@ -14,7 +14,7 @@
+ #include <QString>
+ 
+ // libcdio
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #include <cdio/logging.h>
+ 
+ // MythTV
+diff -Nru a/mythmusic/mythmusic/cddecoder.h b/mythmusic/mythmusic/cddecoder.h
+--- a/mythmusic/mythmusic/cddecoder.h	2012-10-02 23:30:24.000000000 +1300
++++ b/mythmusic/mythmusic/cddecoder.h	2013-01-09 14:53:12.328140979 +1300
+@@ -11,8 +11,8 @@
+ #endif
+ 
+ #ifdef HAVE_CDIO
+-# include <cdio/cdda.h>
+-# include <cdio/paranoia.h>
++# include <cdio/paranoia/cdda.h>
++# include <cdio/paranoia/paranoia.h>
+ #endif
+ 
+ class Metadata;
+diff -Nru a/mythmusic/mythmusic/cdrip.cpp b/mythmusic/mythmusic/cdrip.cpp
+--- a/mythmusic/mythmusic/cdrip.cpp	2012-10-02 23:30:24.000000000 +1300
++++ b/mythmusic/mythmusic/cdrip.cpp	2013-01-09 14:54:11.815330268 +1300
+@@ -8,8 +8,8 @@
+ 
+ #include "config.h"
+ #ifdef HAVE_CDIO
+-# include <cdio/cdda.h>
+-# include <cdio/paranoia.h>
++# include <cdio/paranoia/cdda.h>
++# include <cdio/paranoia/paranoia.h>
+ #endif //def HAVE_CDIO
+ 
+ // C++ includes
diff --git a/abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch b/abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch
deleted file mode 100644
index d8f4a0c..0000000
--- a/abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b20171597097f8b933065ef3291c63194d310fbf Mon Sep 17 00:00:00 2001
-From: George Nassas <george@nassas.com>
-Date: Sun, 10 Jun 2012 13:36:42 -0400
-Subject: [PATCH] protect metadata loads from multiple threads
-
----
- mythtv/libs/libmythmetadata/dbaccess.cpp |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/mythtv/libs/libmythmetadata/dbaccess.cpp b/mythtv/libs/libmythmetadata/dbaccess.cpp
-index 67cd904..46adb7a 100644
---- a/mythtv/libs/libmythmetadata/dbaccess.cpp
-+++ b/mythtv/libs/libmythmetadata/dbaccess.cpp
-@@ -47,8 +47,11 @@ class SingleValueImp
- 
-     virtual ~SingleValueImp() {}
- 
-+    mutable QMutex mutex;
-+
-     void load_data()
-     {
-+        QMutexLocker locker(&mutex);
-         if (!m_ready)
-         {
-             fill_from_db();
-@@ -271,8 +274,11 @@ class MultiValueImp
-                 .arg(m_value_name).arg(m_table_name).arg(m_id_name);
-     }
- 
-+    mutable QMutex mutex;
-+
-     void load_data()
-     {
-+        QMutexLocker locker(&mutex);
-         if (!m_ready)
-         {
-             fill_from_db();
-@@ -730,8 +736,11 @@ class FileAssociationsImp
-         }
-     }
- 
-+    mutable QMutex mutex;
-+
-     void load_data()
-     {
-+        QMutexLocker locker(&mutex);
-         if (!m_ready)
-         {
-             fill_from_db();
--- 
-1.7.2.5
-
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 973fed4..1ecc448 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
-pkgver=0.27
-pkgrel=9
+pkgver=0.27.4
+pkgrel=2
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('avahi' 'faad2' 'fftw' 'glew' 'lame' 'libass' 'libavc1394' 'libcdio'
          'mysql-clients' 'mysql-python' 'openssl' 'perl-date-manip' 'perl-dbd-mysql'
          'perl-io-socket-inet6' 'perl-libwww' 'perl-math-round'
          'perl-net-upnp' 'perl-soap-lite' 'perl-xml-sax' 'python-pycurl'
-         'python2-lxml' 'qt' 'qtwebkit' 'taglib' 'urlgrabber' 'x264' 'xmltv')
+         'python2-lxml' 'qt' 'qtwebkit' 'taglib' 'urlgrabber' 'wget' 'x264' 'xmltv')
 makedepends=('mesa' 'libgl' 'yasm' 'git' 'rsync')
 replaces=()
 groups=('pvr')
@@ -20,8 +20,7 @@ backup=()
 install='mythtv.install'
 
 patches=('myth_settings.patch' 
-         '0001-protect-metadata-loads-from-multiple-threads.patch'
-         #http://code.mythtv.org/trac/ticket/10825   thread safety in video metadata load
+         'videoAlwaysUseBookmark.patch'
          'suggestedstarttime.patch.v1')
          #http://code.mythtv.org/trac/ticket/11562   next mythfilldatabase run in mythweb
 
@@ -103,6 +102,6 @@ package() {
 }
 
 md5sums=('5f3e43567e62afe17bad39f5a9b604cf'
-         '67f7316c750fba17fa578d10840b9dbd'
+         '41098e898361a5a3cde3eaae358482a8'
          '35a7fd3e3057691e3b1bf355bb9e8b16'
          '65a08d8949431ecdeb51a686dc6f9c21')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mainmenu.xml.patch
index 73a8940..3ddce0b 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mainmenu.xml.patch
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mainmenu.xml.patch
@@ -1,37 +1,15 @@
---- 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">
-+    <button>
-+        <type>TV_WATCH_TV</type>
-+        <text>Watch TV</text>
-+        <description>Watch live television</description>
-+        <action>TV_WATCH_LIVE</action>
-+    </button>
+--- themes/defaultmenu/mainmenu.xml.orig	2014-09-02 20:03:34.658600292 +0000
++++ themes/defaultmenu/mainmenu.xml	2014-09-03 15:49:34.820056829 +0000
+@@ -45,9 +45,9 @@
  
      <button>
-         <type>MENU_MEDIA_LIBRARY</type>
-@@ -30,18 +36,11 @@
-     </button>
- 
-     <button>
--        <type>TV_WATCH_TV</type>
--        <text>Watch TV</text>
--        <description>Watch live television</description>
--        <action>TV_WATCH_LIVE</action>
--    </button>
--
--    <button>
          <type>MENU_UTILITIES_SETUP</type>
 -        <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>
-+	<password>SetupPinCode</password>
++        <action>MENU linhes.xml</action>
+         <password>SetupPinCode</password>
      </button>
  
- </mythmenu>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/videoAlwaysUseBookmark.patch b/abs/core/mythtv/stable-0.27/mythtv/videoAlwaysUseBookmark.patch
new file mode 100644
index 0000000..7a0b428
--- /dev/null
+++ b/abs/core/mythtv/stable-0.27/mythtv/videoAlwaysUseBookmark.patch
@@ -0,0 +1,22 @@
+--- src/mythtv/programs/mythfrontend/main.cpp.orig	2014-10-05 21:16:54.226667223 +0000
++++ src/mythtv/programs/mythfrontend/main.cpp	2014-10-06 20:31:16.822482368 +0000
+@@ -1166,14 +1166,11 @@
+ 
+     if (useBookmark && bookmarkPresent)
+     {
+-        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+-        BookmarkDialog *bookmarkdialog = new BookmarkDialog(pginfo, mainStack);
+-        if (!bookmarkdialog->Create())
+-        {
+-            delete bookmarkdialog;
+-            delete pginfo;
+-            return res;
+-        }
++        TV::StartTV(pginfo, kStartTVNoFlags);
++
++        res = 0;
++
++        delete pginfo;
+     }
+     else
+     {
diff --git a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
index 75e8d47..df18538 100644
--- a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweb
 pkgver=0.27
-pkgrel=2
+pkgrel=5
 commit_hash=`cat ../git_src/git_hash_web`
 pkgdesc="Web interface for MythTV's backend, $commit_hash"
 arch=('i686' 'x86_64')