rpms/mythtv/devel mythmusic-busted-cdparanoia-workaround.patch, NONE, 1.1 mythtv.spec, 1.7, 1.8

[Jarod Wilson]

Author: jarod

Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15576

Modified Files:
	mythtv.spec 
Added Files:
	mythmusic-busted-cdparanoia-workaround.patch 
Log Message:
* Tue Sep 23 2008 Jarod Wilson <jarod at wilsonet.com> - 0.21-11
- Work-around for broken cdparanoia header (rhbz#463009)


mythmusic-busted-cdparanoia-workaround.patch:

--- NEW FILE mythmusic-busted-cdparanoia-workaround.patch ---
diff -Naurp mythplugins-0.21/mythmusic.orig/mythmusic/cddecoder.h mythplugins-0.21/mythmusic/mythmusic/cddecoder.h
--- mythplugins-0.21/mythmusic.orig/mythmusic/cddecoder.h	2007-12-19 18:36:13.000000000 -0500
+++ mythplugins-0.21/mythmusic/mythmusic/cddecoder.h	2008-09-23 13:55:40.000000000 -0400
@@ -12,8 +12,11 @@
 #ifdef __linux__
 #include <cdaudio.h>
 extern "C" {
+// temporary hack for busted cdparanoia header
+#define private cdparanoia_private
 #include <cdda_interface.h>
 #include <cdda_paranoia.h>
+#undef private
 }
 #endif
 
diff -Naurp mythplugins-0.21/mythmusic.orig/mythmusic/cdrip.cpp mythplugins-0.21/mythmusic/mythmusic/cdrip.cpp
--- mythplugins-0.21/mythmusic.orig/mythmusic/cdrip.cpp	2007-11-19 11:44:58.000000000 -0500
+++ mythplugins-0.21/mythmusic/mythmusic/cdrip.cpp	2008-09-23 13:55:10.000000000 -0400
@@ -13,8 +13,11 @@
 #ifdef HAVE_CDAUDIO
 #include <cdaudio.h>
 extern "C" {
+// temporary hack for busted cdparanoia header
+#define private cdparanoia_private
 #include <cdda_interface.h>
 #include <cdda_paranoia.h>
+#undef private
 }
 #endif
 


Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mythtv.spec	17 Sep 2008 17:38:02 -0000	1.7
+++ mythtv.spec	23 Sep 2008 19:08:04 -0000	1.8
@@ -22,7 +22,7 @@
 %if "%{branch}" == "trunk"
 Release: 0.2.%{_svnver}%{?dist}
 %else
-Release: 10%{?dist}
+Release: 11%{?dist}
 %endif
 URL: http://www.mythtv.org/
 # The primary license is GPLv2+, but bits are borrowed from a number of
@@ -47,6 +47,7 @@
 #Patch102: mythtv-0.21-fedora-settings.patch
 Patch200: mythplugins-0.21-svnfixes.patch
 #Patch201: mythplugins-0.21-fedora-settings.patch
+Patch202: mythmusic-busted-cdparanoia-workaround.patch
 #
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: freetype-devel >= 2
@@ -527,6 +528,7 @@
 cd mythplugins-%{version}
 %patch200 -p1 -b .svnfixes
 #patch201 -p1 -b .settings
+%patch202 -p1
 
 mv mytharchive/mythburn/themes/Simple\ -\ Autoplay \
    mytharchive/mythburn/themes/Simple_-_Autoplay
@@ -1014,6 +1016,9 @@
 %endif
 
 %changelog
+* Tue Sep 23 2008 Jarod Wilson <jarod at wilsonet.com> - 0.21-11
+- Work-around for broken cdparanoia header (rhbz#463009)
+
 * Wed Sep 17 2008 Jarod Wilson <jarod at wilsonet.com> - 0.21-10
 - Nuke a bunch of configure flags that really shouldn't be
   enabled anymore, per discussion with mythtv devs.