Fix compilation for earlier flac versions with a patch

4 files changed, 35 insertions, 12 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 652227572ba4..f2b299ba91f7 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.82 2004/02/05 16:43:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.83 2004/02/09 15:57:55 caleb Exp $
+
+  09 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0.ebuild,
+  files/flac-patch.diff:
+  Fix compilation for earlier flac versions with a patch
 
   05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdemultimedia-3.2.0.ebuild:
   Marked ~ppc
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 8c3bedc2d0d3..5ef5313d0cc3 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,17 +1,18 @@
-MD5 5949835b387f70ac27d1a3d6f4a73b70 kdemultimedia-3.1.5.ebuild 2781
-MD5 387d5f4f6dc6fa8f88ff061460e8c994 ChangeLog 12619
+MD5 e001e74325bfe345c33b484127cc9455 kdemultimedia-3.1.4-r1.ebuild 2903
+MD5 13f89157acc5e177f4d07139dfc89139 kdemultimedia-3.1.5.ebuild 2782
+MD5 8f9138c9780c6ca64f844944b827812c kdemultimedia-3.2.0.ebuild 2183
+MD5 a1d4f97c7b8f99717d519cedae400f8b ChangeLog 12776
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 05d84cd7d1c10f5b4d461423bc743ccb kdemultimedia-3.0.5b.ebuild 2520
-MD5 842e0c9e0c60900e237669aff2f29ef8 kdemultimedia-3.1.4-r1.ebuild 2902
-MD5 cad3310bcf2755f127e9f252d351c92c kdemultimedia-3.2.0.ebuild 2115
-MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.4-alpha.diff 300
-MD5 498d3a9ec387535d759af9fd59f3dc07 files/digest-kdemultimedia-3.2.0 73
-MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278
-MD5 d37340290c8c5fd5d8dc6345ec9dee75 files/digest-kdemultimedia-3.0.5b 74
+MD5 6c4174f9b6cdd177f786361168b08e2b kdemultimedia-3.0.5b.ebuild 2521
 MD5 7b2708e69eb657af7e7487bdb7ee7d4f files/digest-kdemultimedia-3.1.4-r1 73
 MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.4-ln-sf.diff 1278
+MD5 a39413062132d248ceae0b20ed262e79 files/flac-patch.diff 450
+MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.4-gentoo-timidity.diff 694
 MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.5-alpha.diff 300
+MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278
+MD5 d37340290c8c5fd5d8dc6345ec9dee75 files/digest-kdemultimedia-3.0.5b 74
 MD5 55cd599c61d48ca121ef4c96a905b6d1 files/kdemultimedia-3.1.5-gentoo-timidity.diff 590
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.4-gentoo-timidity.diff 694
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.5b-gentoo-timidity.diff 694
 MD5 239528cb3f6dd1fcc4e2bc4fd2ba9ba8 files/digest-kdemultimedia-3.1.5 73
+MD5 498d3a9ec387535d759af9fd59f3dc07 files/digest-kdemultimedia-3.2.0 73
+MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.4-alpha.diff 300
diff --git a/kde-base/kdemultimedia/files/flac-patch.diff b/kde-base/kdemultimedia/files/flac-patch.diff
new file mode 100644
index 000000000000..b3cbe3435a82
--- /dev/null
+++ b/kde-base/kdemultimedia/files/flac-patch.diff
@@ -0,0 +1,13 @@
+--- kfile-plugins/flac/configure.in.in	2003/10/16 10:52:00	1.1
++++ kfile-plugins/flac/configure.in.in	2004/01/21 21:27:36	1.3
+@@ -6,7 +6,9 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
+   kde_has_flac_lib=no
+   AC_CHECK_HEADER(FLAC/metadata.h,
+   [ 
+-     kde_has_flac_lib=yes
++     AC_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
++	          kde_has_flac_lib=yes)
++		
+     ])
+   if test "x$kde_has_flac_lib" = "xyes"; then
+       LIBFLAC="-lFLAC"
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild
index 8f40fe514856..d15f16477ff8 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild,v 1.2 2004/02/05 16:43:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild,v 1.3 2004/02/09 15:57:56 caleb Exp $
 inherit kde-dist flag-o-matic
 
 IUSE="nas encode esd motif slang tcltk oggvorbis gtk alsa gstreamer"
@@ -50,3 +50,8 @@ use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --witho
 
 myconf="$myconf $myaudio $myinterface --with-cdda --disable-strict --disable-warnings"
 
+src_unpack()
+{
+	kde_src_unpack
+	epatch ${FILESDIR}/flac-patch.diff
+}