rev 12262 - in branches/kde4/packages/kdemultimedia/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-09-27 13:50:14 +0000 (Sat, 27 Sep 2008)
New Revision: 12262

Added:
   branches/kde4/packages/kdemultimedia/debian/patches/10_r865240_cdparanoia.diff
Modified:
   branches/kde4/packages/kdemultimedia/debian/changelog
   branches/kde4/packages/kdemultimedia/debian/patches/series
Log:
kdemultimedia 4.1.2


Modified: branches/kde4/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/changelog	2008-09-27 13:38:55 UTC (rev 12261)
+++ branches/kde4/packages/kdemultimedia/debian/changelog	2008-09-27 13:50:14 UTC (rev 12262)
@@ -1,3 +1,11 @@
+kdemultimedia (4:4.1.2-0) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Add patch  10_r865240_cdparanoia taken from KDE rev 865240 to build against 
+    cdparanoia 10.2.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 25 Sep 2008 23:10:35 +0200
+
 kdemultimedia (4:4.1.1-1) experimental; urgency=low
 
   * New upstream release.

Added: branches/kde4/packages/kdemultimedia/debian/patches/10_r865240_cdparanoia.diff
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/patches/10_r865240_cdparanoia.diff	                        (rev 0)
+++ branches/kde4/packages/kdemultimedia/debian/patches/10_r865240_cdparanoia.diff	2008-09-27 13:50:14 UTC (rev 12262)
@@ -0,0 +1,27 @@
+--- a/kioslave/audiocd/plugins/wav/encodercda.cpp	(revision 865239)
++++ b/kioslave/audiocd/plugins/wav/encodercda.cpp	(revision 865240)
+@@ -42,7 +42,10 @@
+ // Remove this by calculating CD_FRAMESIZE_RAW from the frames
+ extern "C"
+ {
++  //cdda_interface.h in cdparanoia 10.2 has a member called 'private' which the C++ compiler doesn't like
++  #define private _private
+   #include <cdda_interface.h>
++  #undef private
+ }
+ 
+ inline int16_t swap16 (int16_t i)
+--- a/kioslave/audiocd/audiocd.cpp	(revision 865239)
++++ b/kioslave/audiocd/audiocd.cpp	(revision 865240)
+@@ -27,8 +27,11 @@
+ #include <kdemacros.h>
+ extern "C"
+ {
++	//cdda_interface.h in cdparanoia 10.2 has a member called 'private' which the C++ compiler doesn't like
++	#define private _private   
+ 	#include <cdda_interface.h>
+ 	#include <cdda_paranoia.h>
++	#undef private
+ 	void paranoiaCallback(long, int);
+ 
+ 	KDE_EXPORT int kdemain(int argc, char ** argv);

Modified: branches/kde4/packages/kdemultimedia/debian/patches/series
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/patches/series	2008-09-27 13:38:55 UTC (rev 12261)
+++ branches/kde4/packages/kdemultimedia/debian/patches/series	2008-09-27 13:50:14 UTC (rev 12262)
@@ -1 +1,2 @@
+10_r865240_cdparanoia.diff
 97_fix_target_link_libraries.diff