Add patch from Josh Coalson to be able to build with flac 1.1.3.

Package-Manager: portage-2.1.2_pre3-r6

6 files changed, 151 insertions, 11 deletions

diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index d359438cd61f..454fe4bf5aba 100644
--- a/kde-base/kdemultimedia-kioslaves/ChangeLog
+++ b/kde-base/kdemultimedia-kioslaves/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdemultimedia-kioslaves
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.55 2006/10/21 11:49:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.56 2006/10/21 19:41:56 flameeyes Exp $
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdemultimedia-3.5.5+flac-1.1.3.patch,
+  kdemultimedia-kioslaves-3.5.5.ebuild:
+  Add patch from Josh Coalson to be able to build with flac 1.1.3.
 
   21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdemultimedia-kioslaves-3.5.2.ebuild,
diff --git a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-3.5.5+flac-1.1.3.patch b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-3.5.5+flac-1.1.3.patch
new file mode 100644
index 000000000000..193ce3044b04
--- /dev/null
+++ b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-3.5.5+flac-1.1.3.patch
@@ -0,0 +1,64 @@
+--- kdemultimedia-3.5.5/kioslave/audiocd/configure.in.in	2005-09-10 01:19:49.000000000 -0700
++++ kdemultimedia-3.5.5-b2/kioslave/audiocd/configure.in.in	2006-10-19 14:24:10.000000000 -0700
+@@ -5,7 +5,7 @@
+   have_libFLAC=no
+   KDE_CHECK_HEADER(FLAC/metadata.h,
+   [
+-     KDE_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
++     KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
+ 	          have_libFLAC=yes)
+ 
+     ])
+--- kdemultimedia-3.5.5/kioslave/audiocd/plugins/flac/encoderflac.cpp	2006-01-19 08:40:33.000000000 -0800
++++ kdemultimedia-3.5.5-b2/kioslave/audiocd/plugins/flac/encoderflac.cpp	2006-10-19 14:36:32.000000000 -0700
+@@ -29,6 +29,11 @@
+ #include <kconfig.h>
+ #include <kdebug.h>
+ 
++#if !defined FLAC_API_VERSION_CURRENT || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
+ 
+ extern "C"
+ {
+@@ -47,7 +52,11 @@
+     unsigned long data;
+ };
+ 
++#ifdef LEGACY_FLAC
+ static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
++#else
++static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
++#endif
+ {
+     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
+ 
+@@ -109,9 +118,11 @@
+ long EncoderFLAC::readInit(long size) {
+     kdDebug(7117) << "EncoderFLAC::readInit() called"<< endl;
+     d->data = 0;
++#ifdef LEGACY_FLAC
+     FLAC__stream_encoder_set_write_callback(d->encoder, WriteCallback);
+     FLAC__stream_encoder_set_metadata_callback(d->encoder, MetadataCallback);
+     FLAC__stream_encoder_set_client_data(d->encoder, d);
++#endif
+ 
+     // The options match approximely those of flac compression-level-3
+     FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
+@@ -124,7 +135,13 @@
+     if (size > 0)
+         FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4);
+ 
+-    FLAC__stream_encoder_init(d->encoder);
++#ifdef LEGACY_FLAC
++    if(FLAC__stream_encoder_init(d->encoder) != FLAC__STREAM_ENCODER_OK)
++		; // really should handle an init failure
++#else
++    if(FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d) != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
++		; // really should handle an init failure
++#endif
+     return d->data;
+ }
+ 
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.5.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.5.ebuild
index 0e92b5416526..802aca46eef4 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.5.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.5.ebuild,v 1.2 2006/10/21 11:49:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.5.ebuild,v 1.3 2006/10/21 19:41:56 flameeyes Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kioslave
@@ -15,7 +15,7 @@ DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia
 	media-libs/taglib
 	encode? ( vorbis? ( media-libs/libvorbis )
-	          flac? ( ~media-libs/flac-1.1.2 ) )"
+	          flac? ( >=media-libs/flac-1.1.2 ) )"
 RDEPEND="${DEPEND}
 	encode? ( mp3? ( media-sound/lame ) )"
 
@@ -26,6 +26,8 @@ KMCOMPILEONLY="
 	kscd/libwm
 	libkcddb"
 
+PATCHES="${FILESDIR}/kdemultimedia-${PV}+flac-1.1.3.patch"
+
 src_compile() {
 	myconf="--with-cdparanoia --enable-cdparanoia"
 	if use encode; then
@@ -35,12 +37,12 @@ src_compile() {
 	fi
 
 	DO_NOT_COMPILE="libkcddb kscd" kde-meta_src_compile myconf configure
-	cd $S/libkcddb && make configbase.h cdinfodialogbase.h
+	cd "${S}"/libkcddb && make configbase.h cdinfodialogbase.h
 
 	# Library deps seems not to be built as they should :/
-	cd $S/kscd/libwm/audio && make libworkmanaudio.la && \
-	cd $S/kscd/libwm && make libworkman.la && \
-	cd $S/kscd && make libkcompactdisc.la || \
+	cd "${S}"/kscd/libwm/audio && make libworkmanaudio.la && \
+	cd "${S}"/kscd/libwm && make libworkman.la && \
+	cd "${S}"/kscd && make libkcompactdisc.la || \
 		die "failed to make prerequisite libraries."
 
 	DO_NOT_COMPILE="libkcddb kscd" kde-meta_src_compile make
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index ea942c900a9e..4e0509ab85f6 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.222 2006/10/21 11:42:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.223 2006/10/21 19:46:37 flameeyes Exp $
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdemultimedia-3.5.5+flac-1.1.3.patch, kdemultimedia-3.5.5.ebuild:
+  Add patch from Josh Coalson to be able to build with flac 1.1.3.
 
   21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdemultimedia-3.5.2-r2.ebuild, kdemultimedia-3.5.3.ebuild,
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.5.5+flac-1.1.3.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.5.5+flac-1.1.3.patch
new file mode 100644
index 000000000000..193ce3044b04
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.5.5+flac-1.1.3.patch
@@ -0,0 +1,64 @@
+--- kdemultimedia-3.5.5/kioslave/audiocd/configure.in.in	2005-09-10 01:19:49.000000000 -0700
++++ kdemultimedia-3.5.5-b2/kioslave/audiocd/configure.in.in	2006-10-19 14:24:10.000000000 -0700
+@@ -5,7 +5,7 @@
+   have_libFLAC=no
+   KDE_CHECK_HEADER(FLAC/metadata.h,
+   [
+-     KDE_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
++     KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
+ 	          have_libFLAC=yes)
+ 
+     ])
+--- kdemultimedia-3.5.5/kioslave/audiocd/plugins/flac/encoderflac.cpp	2006-01-19 08:40:33.000000000 -0800
++++ kdemultimedia-3.5.5-b2/kioslave/audiocd/plugins/flac/encoderflac.cpp	2006-10-19 14:36:32.000000000 -0700
+@@ -29,6 +29,11 @@
+ #include <kconfig.h>
+ #include <kdebug.h>
+ 
++#if !defined FLAC_API_VERSION_CURRENT || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
+ 
+ extern "C"
+ {
+@@ -47,7 +52,11 @@
+     unsigned long data;
+ };
+ 
++#ifdef LEGACY_FLAC
+ static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
++#else
++static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
++#endif
+ {
+     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
+ 
+@@ -109,9 +118,11 @@
+ long EncoderFLAC::readInit(long size) {
+     kdDebug(7117) << "EncoderFLAC::readInit() called"<< endl;
+     d->data = 0;
++#ifdef LEGACY_FLAC
+     FLAC__stream_encoder_set_write_callback(d->encoder, WriteCallback);
+     FLAC__stream_encoder_set_metadata_callback(d->encoder, MetadataCallback);
+     FLAC__stream_encoder_set_client_data(d->encoder, d);
++#endif
+ 
+     // The options match approximely those of flac compression-level-3
+     FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
+@@ -124,7 +135,13 @@
+     if (size > 0)
+         FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4);
+ 
+-    FLAC__stream_encoder_init(d->encoder);
++#ifdef LEGACY_FLAC
++    if(FLAC__stream_encoder_init(d->encoder) != FLAC__STREAM_ENCODER_OK)
++		; // really should handle an init failure
++#else
++    if(FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d) != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
++		; // really should handle an init failure
++#endif
+     return d->data;
+ }
+ 
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild
index 9d4b52bc626a..11a579e5db20 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild,v 1.2 2006/10/21 11:42:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild,v 1.3 2006/10/21 19:46:37 flameeyes Exp $
 
 inherit kde-dist flag-o-matic
 
@@ -21,7 +21,7 @@ DEPEND="~kde-base/kdebase-${PV}
 				 =media-libs/gst-plugins-0.8* )
 	encode? ( mp3? ( media-sound/lame )
 			  vorbis? ( media-sound/vorbis-tools )
-			  flac? ( ~media-libs/flac-1.1.2 ) )
+			  flac? ( >=media-libs/flac-1.1.2 ) )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
@@ -33,7 +33,8 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
-PATCHES="${FILESDIR}/juk-3.5.2-do_not_use_gstreamer-0.10.diff"
+PATCHES="${FILESDIR}/juk-3.5.2-do_not_use_gstreamer-0.10.diff
+	${FILESDIR}/kdemultimedia-${PV}+flac-1.1.3.patch"
 
 pkg_setup() {
 	kde_pkg_setup