Fix USE=flac handling, bug 207987.

(Portage version: 2.1.4)

4 files changed, 60 insertions, 7 deletions

diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index c4010eee5dd1..b062ae13ce55 100644
--- a/kde-base/kdemultimedia-kioslaves/ChangeLog
+++ b/kde-base/kdemultimedia-kioslaves/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdemultimedia-kioslaves
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.80 2008/01/28 22:55:14 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.81 2008/01/29 05:42:23 ingmar Exp $
+
+*kdemultimedia-kioslaves-4.0.0-r1 (29 Jan 2008)
+
+  29 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch,
+  +kdemultimedia-kioslaves-4.0.0-r1.ebuild,
+  -kdemultimedia-kioslaves-4.0.0.ebuild:
+  Fix USE=flac handling, bug 207987.
 
   28 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
   kdemultimedia-kioslaves-3.5.8.ebuild:
diff --git a/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-4.0.0 b/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-4.0.0-r1
index 95b7325c286d..95b7325c286d 100644
--- a/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-4.0.0
+++ b/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-4.0.0-r1
diff --git a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch
new file mode 100644
index 000000000000..98df4cf05ec6
--- /dev/null
+++ b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch
@@ -0,0 +1,46 @@
+Index: kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp
+===================================================================
+--- kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp (revision 749997)
++++ kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp (working copy)
+@@ -48,7 +48,16 @@ public:
+     unsigned long data;
+ };
+ 
+-static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
++static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder,
++                                                    const FLAC__byte buffer[],
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
++                                                    unsigned bytes,
++#else
++                                                    size_t bytes,
++#endif
++                                                    unsigned samples,
++                                                    unsigned current_frame,
++                                                    void *client_data)
+ {
+     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
+ 
+@@ -110,9 +119,11 @@ unsigned long EncoderFLAC::size(long tim
+ long EncoderFLAC::readInit(long size) {
+     kDebug(7117) << "EncoderFLAC::readInit() called";
+     d->data = 0;
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
+     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);
+@@ -125,7 +136,11 @@ long EncoderFLAC::readInit(long size) {
+     if (size > 0)
+         FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4);
+ 
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
+     FLAC__stream_encoder_init(d->encoder);
++#else
++    FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d);
++#endif
+     return d->data;
+ }
+ 
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0-r1.ebuild
index f6a485b7ce13..364d2fa3ab41 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0.ebuild,v 1.1 2008/01/17 23:51:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0-r1.ebuild,v 1.1 2008/01/29 05:42:23 ingmar Exp $
 
 EAPI="1"
 
@@ -13,23 +13,22 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug flac vorbis"
 RESTRICT="test"
 
-# FIXME: find libOggFLAC.so
-#	flac? ( media-libs/flac )
 DEPEND="${DEPEND}
 	>=kde-base/libkcddb-${PV}:${SLOT}
 	>=kde-base/libkcompactdisc-${PV}:${SLOT}
 	media-sound/cdparanoia
+	flac? ( media-libs/flac )
 	vorbis? ( media-libs/libvorbis )"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="libkcompactdisc/"
 KMCOMPILEONLY="libkcddb/"
 
+PATCHES="${FILESDIR}/${P}-flac-1.1.3.patch"
+
 src_compile() {
-	# FIXME: there should be a flac flag, but it doesn't work since I can't
-	# figure out how to get libOggFLAC.so
-	#	$(cmake-utils_use_with flac Flac)
 	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with flac Flac)
 		$(cmake-utils_use_with vorbis OggVorbis)"
 
 	kde4-meta_src_compile