Wed Jan 16 00:05:27 PST 2013

2 files changed, 64 insertions, 7 deletions

diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 70ca80682..7eb180b74 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77158 2012-10-05 23:55:11Z jconder $
+# $Id: PKGBUILD 82334 2013-01-15 11:35:06Z allan $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -14,19 +14,22 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
 pkgver=0.26.0
-pkgrel=1
+pkgrel=2
 epoch=1
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
 makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
-             'libvorbis' 'mplayer' 'mythtv' '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'
-	     'python2-oauth' 'python-imaging' 'python2-pycurl' 'taglib' 'zlib')
+             'libvorbis' 'mesa' 'mplayer' 'mythtv'
+	     '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' 'python2-oauth' 'python-imaging'
+	     'python2-pycurl' 'taglib' 'zlib')
 source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2"
+        'cdparanoia.patch'
         'mtd.rc')
 md5sums=('15bd7b2f4173488966f3d761e0eacffa'
+         '5de8dd79d0b8a2b006f3c3258938b6b7'
          '476c12ba074794ad7f4ae092bdf949d6')
 
 build() {
@@ -36,6 +39,8 @@ build() {
   sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php'
   sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp'
 
+  patch -Np1 -i "$srcdir/cdparanoia.patch"
+
   ./configure --prefix=/usr \
               --enable-all \
               --python=python2
@@ -78,7 +83,7 @@ package_mythplugins-mythgame() {
 
 package_mythplugins-mythmusic() {
   pkgdesc="Music playing plugin for MythTV"
-  depends=('mythtv' 'taglib')
+  depends=('mythtv' 'libcdio-paranoia' 'taglib')
 
   cd "$srcdir/$pkgbase-$pkgver/mythmusic"
   make INSTALL_ROOT="$pkgdir" install
diff --git a/community/mythplugins/cdparanoia.patch b/community/mythplugins/cdparanoia.patch
new file mode 100644
index 000000000..b4d1449d5
--- /dev/null
+++ b/community/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