Add patch from Josh Coalson to be able to build with flac 1.1.3 (and an extra one to build with flac 1.1.3-beta2).

Package-Manager: portage-2.1.2_pre3-r6

8 files changed, 420 insertions, 22 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 1b6e5c561c0e..e912c6de8352 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.164 2006/10/19 17:41:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.165 2006/10/21 21:05:57 flameeyes Exp $
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/k3b-0.12.17+flac-1.1.3.patch, +files/k3b-0.12.17-flac-beta.patch,
+  +files/k3b-1.0_pre2+flac-1.1.3.patch, +files/k3b-1.0_pre2-flac-beta.patch,
+  k3b-0.12.17.ebuild, k3b-1.0_pre2.ebuild:
+  Add patch from Josh Coalson to be able to build with flac 1.1.3 (and an
+  extra one to build with flac 1.1.3-beta2).
 
   19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> k3b-0.12.14.ebuild,
   k3b-0.12.15.ebuild, k3b-0.12.16.ebuild, k3b-0.12.17.ebuild,
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 63c2d135bfd9..6fd12b7e9504 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,6 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX k3b-0.12.17+flac-1.1.3.patch 5567 RMD160 a20b5ae7a752b9f91c479218e75ba173af48be44 SHA1 41eae878580d21341ef6b1549a7d43df39c470d6 SHA256 4df6f523d8a05485bf1ccd3cda367460d234dc1b47564e6e8a52bfa58413149c
+MD5 3c1b356f78064e41f208592f55a90c87 files/k3b-0.12.17+flac-1.1.3.patch 5567
+RMD160 a20b5ae7a752b9f91c479218e75ba173af48be44 files/k3b-0.12.17+flac-1.1.3.patch 5567
+SHA256 4df6f523d8a05485bf1ccd3cda367460d234dc1b47564e6e8a52bfa58413149c files/k3b-0.12.17+flac-1.1.3.patch 5567
+AUX k3b-0.12.17-flac-beta.patch 1282 RMD160 c91a54ca3f54e34cd6805b39e5bbbdc058eaa394 SHA1 53a79cb65025ea4a2f31096a891f750b0b7711c9 SHA256 6f74700e5920ac2ec751ee16a8933cb3de5a6b3d6ea90d3a4e1d3d3815b7b8bc
+MD5 346499b52a07847a38dbd070a384c9f4 files/k3b-0.12.17-flac-beta.patch 1282
+RMD160 c91a54ca3f54e34cd6805b39e5bbbdc058eaa394 files/k3b-0.12.17-flac-beta.patch 1282
+SHA256 6f74700e5920ac2ec751ee16a8933cb3de5a6b3d6ea90d3a4e1d3d3815b7b8bc files/k3b-0.12.17-flac-beta.patch 1282
+AUX k3b-1.0_pre2+flac-1.1.3.patch 5609 RMD160 b6bd25cb62ce9cc29b063ae7dc0e944c9f418e01 SHA1 ade2a5c79861041a673f7742ea1ee3925ce163e4 SHA256 e095bb0a63430fabb239a2e5dada90ae71ee0cadb9bb0260d8005fac7270fe3b
+MD5 b88ac085c31602e6cabbaa62c8bfb976 files/k3b-1.0_pre2+flac-1.1.3.patch 5609
+RMD160 b6bd25cb62ce9cc29b063ae7dc0e944c9f418e01 files/k3b-1.0_pre2+flac-1.1.3.patch 5609
+SHA256 e095bb0a63430fabb239a2e5dada90ae71ee0cadb9bb0260d8005fac7270fe3b files/k3b-1.0_pre2+flac-1.1.3.patch 5609
+AUX k3b-1.0_pre2-flac-beta.patch 1108 RMD160 9435f82bc2fcbd2f3f60ff7d08a73fef62730759 SHA1 984c81d245a1d7190c5ea0167dd75e8336ccb525 SHA256 0bba1574407ac11ae373a79d23cb2923dbc7431904968834462f86f83a1d6db8
+MD5 9c6655cdbfa6fb7ee1205e1d8b3627cd files/k3b-1.0_pre2-flac-beta.patch 1108
+RMD160 9435f82bc2fcbd2f3f60ff7d08a73fef62730759 files/k3b-1.0_pre2-flac-beta.patch 1108
+SHA256 0bba1574407ac11ae373a79d23cb2923dbc7431904968834462f86f83a1d6db8 files/k3b-1.0_pre2-flac-beta.patch 1108
 DIST k3b-0.12.14.tar.bz2 4096391 RMD160 fc06fce15d7f4140de9810257c46a217f022caf9 SHA1 02cef09cb6d8f3bfcfd60099aa55fb2706dd5a8e SHA256 00e88c3c1f04b0f8c5e124fced6729bfc7e078fe5d1d449bb07b1f3746eb6ead
 DIST k3b-0.12.15.tar.bz2 4000389 RMD160 9d0ff14b394153d97ef61fcf7b46894ec5d3d511 SHA1 4f2768f6473032fbf6cde2d13b1c2729b7e91e3f SHA256 5e6cb62f38dcb17c5296e53df89d7bb709f0d336b6a41db9be1b464d4638f32a
 DIST k3b-0.12.16.tar.bz2 4004784 RMD160 b4b64924096581bcb0c3432f99f0e27ffe0aca79 SHA1 875ebae1e5bc4ef0f186c1025087ed8005c10248 SHA256 bc686f6e596df32f2c305a1f4948ceddbbfb067045e6b9b314af615319d11fe6
@@ -23,22 +39,22 @@ EBUILD k3b-0.12.16.ebuild 3223 RMD160 c1c0d3beec83396e81760d0c552a3955541c55d0 S
 MD5 6ae7fee091dc73c11b461e4711d236bd k3b-0.12.16.ebuild 3223
 RMD160 c1c0d3beec83396e81760d0c552a3955541c55d0 k3b-0.12.16.ebuild 3223
 SHA256 ecc5915bac750d199f4a3eb77d591fa9af6f48ef3846b76e1dee93ee8c401c09 k3b-0.12.16.ebuild 3223
-EBUILD k3b-0.12.17.ebuild 3300 RMD160 065b18c9fcc525a7c65b9711f3fafac18ed8e3b6 SHA1 d5d0021acfd80089d634c8cebcd8f5876f6fbff8 SHA256 a3d907d6d8030a618a6a5249b6a95d9e33675ffb724b2b72656062d23c4c7812
-MD5 3edce8ee752ab1a2d174f0c05e340f86 k3b-0.12.17.ebuild 3300
-RMD160 065b18c9fcc525a7c65b9711f3fafac18ed8e3b6 k3b-0.12.17.ebuild 3300
-SHA256 a3d907d6d8030a618a6a5249b6a95d9e33675ffb724b2b72656062d23c4c7812 k3b-0.12.17.ebuild 3300
+EBUILD k3b-0.12.17.ebuild 3391 RMD160 10aeb1686df7209be72cc1f4aac64770fce5b001 SHA1 fe998f0150894bdb687a7ecf1c7072ebca5e9a46 SHA256 e546d6c551525f1c1c4689c2b8c587f01c25b5d16a0e3466cd51509058305989
+MD5 a7f11b57ba06d71277fd37a5976842ff k3b-0.12.17.ebuild 3391
+RMD160 10aeb1686df7209be72cc1f4aac64770fce5b001 k3b-0.12.17.ebuild 3391
+SHA256 e546d6c551525f1c1c4689c2b8c587f01c25b5d16a0e3466cd51509058305989 k3b-0.12.17.ebuild 3391
 EBUILD k3b-1.0_pre1.ebuild 3729 RMD160 41bb5bb481dc99fef5c9a43765ea895961d56208 SHA1 7df509445de2cfd85ee78f105893108c77c631c9 SHA256 2af1c6da43f0035aa5a7bfb44dba71693af4a1e507e356a31b3974a4ca975906
 MD5 3f0469b5c9c638c052d4057a42b57b94 k3b-1.0_pre1.ebuild 3729
 RMD160 41bb5bb481dc99fef5c9a43765ea895961d56208 k3b-1.0_pre1.ebuild 3729
 SHA256 2af1c6da43f0035aa5a7bfb44dba71693af4a1e507e356a31b3974a4ca975906 k3b-1.0_pre1.ebuild 3729
-EBUILD k3b-1.0_pre2.ebuild 3994 RMD160 cc019d9ca392d7322694212b793fa2102ff71a7f SHA1 49aba42be76ca99dc5a5451f8f25afccd5152873 SHA256 909aa0173041b785181ad0e086a524651d6d581f03153930d81326a046ada2c6
-MD5 6d77a61c481d2905660fac6800df1130 k3b-1.0_pre2.ebuild 3994
-RMD160 cc019d9ca392d7322694212b793fa2102ff71a7f k3b-1.0_pre2.ebuild 3994
-SHA256 909aa0173041b785181ad0e086a524651d6d581f03153930d81326a046ada2c6 k3b-1.0_pre2.ebuild 3994
-MISC ChangeLog 23571 RMD160 8b4760ab6817af7d572dbd738dfae3b34a126a8b SHA1 7755363b27c0c841d932acc4004850f17460d302 SHA256 c809200398470801974b38223aab510702e0ee32556fd2c2086430f3abc736a0
-MD5 38dbe3f14ae2ad6d9ec6a16bb195327d ChangeLog 23571
-RMD160 8b4760ab6817af7d572dbd738dfae3b34a126a8b ChangeLog 23571
-SHA256 c809200398470801974b38223aab510702e0ee32556fd2c2086430f3abc736a0 ChangeLog 23571
+EBUILD k3b-1.0_pre2.ebuild 4110 RMD160 51cc76410faf9a74fd71be97f07764dbe4c8d2e8 SHA1 7b53a98831b8e16095d64edc12a0f0d41e8a3815 SHA256 799d00ec96dc24e26f8b060645c7b4fbeb8ab67bc111e2de227fe5dcde5b366b
+MD5 590be1c6eb16d5c38df04674eef705d4 k3b-1.0_pre2.ebuild 4110
+RMD160 51cc76410faf9a74fd71be97f07764dbe4c8d2e8 k3b-1.0_pre2.ebuild 4110
+SHA256 799d00ec96dc24e26f8b060645c7b4fbeb8ab67bc111e2de227fe5dcde5b366b k3b-1.0_pre2.ebuild 4110
+MISC ChangeLog 23939 RMD160 542947ee45acf3fc96b50887c3a465f595f5f24d SHA1 439e65e9594783d57f2074c7b7a0597b3c6322e8 SHA256 cfd6e50f28b8574c283dc9387231c7536703dcbf6da39e416e61c7ec26c0baa4
+MD5 c876c80e3575ed7f770c5e7df38c66a3 ChangeLog 23939
+RMD160 542947ee45acf3fc96b50887c3a465f595f5f24d ChangeLog 23939
+SHA256 cfd6e50f28b8574c283dc9387231c7536703dcbf6da39e416e61c7ec26c0baa4 ChangeLog 23939
 MISC metadata.xml 183 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f SHA1 44581aca775d8ca4854c53861174b6147da706b4 SHA256 d004a7535807ea599189a046ac582ca032a91f868bbcf4b72195773dfaf15462
 MD5 6cac9f56ab7373612097cef824badcf7 metadata.xml 183
 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f metadata.xml 183
@@ -64,7 +80,7 @@ SHA256 d44cce2ed2deb1116b03f9b749e054956130ae925bc54ec7158d35e7e126dd76 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFN7jWAiZjviIA2XgRAsOQAKDjaL3rWcR5lMYUIcfo/dOL3O8Y6gCgmnBW
-rHFPgyf/Qs7ZHmmLO2aqkYo=
-=FQjm
+iD8DBQFFOovMAiZjviIA2XgRAsCwAJ9NJOE9gd8z26rOQ8dfZprpqQ154QCg6aqn
+KUVQUbiuHcq3c2HhHo1x1SY=
+=RH5u
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/files/k3b-0.12.17+flac-1.1.3.patch b/app-cdr/k3b/files/k3b-0.12.17+flac-1.1.3.patch
new file mode 100644
index 000000000000..fdfa0563a075
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-0.12.17+flac-1.1.3.patch
@@ -0,0 +1,165 @@
+--- k3b-0.12.17/configure.in.in	2006-08-23 00:32:30.000000000 -0700
++++ k3b-0.12.17-b2/configure.in.in	2006-10-17 19:23:48.000000000 -0700
+@@ -248,7 +248,7 @@
+ have_flac=no
+ if test "$ac_cv_use_flac" = "yes"; then
+   KDE_CHECK_HEADERS(FLAC++/decoder.h, [
+-     AC_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
++     AC_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
+ 	        have_flac=yes,[],$all_libraries)])
+ 
+   # Hack to get the flac version since I was not able to handle the code from
+--- k3b-0.12.17/plugins/decoder/flac/k3bflacdecoder.cpp	2006-08-23 00:31:46.000000000 -0700
++++ k3b-0.12.17-b2/plugins/decoder/flac/k3bflacdecoder.cpp	2006-10-18 14:32:24.000000000 -0700
+@@ -36,11 +36,21 @@
+ #include <taglib/flacfile.h>
+ #endif
+ 
++#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ K_EXPORT_COMPONENT_FACTORY( libk3bflacdecoder, K3bPluginFactory<K3bFLACDecoderFactory>( "libk3bflacdecoder" ) )
+ 
+ 
+ class K3bFLACDecoder::Private
++#ifdef LEGACY_FLAC
+   : public FLAC::Decoder::SeekableStream
++#else
++  : public FLAC::Decoder::Stream
++#endif
+ {
+ public:
+   void open(QFile* f) {
+@@ -64,7 +74,11 @@
+   }
+ 
+   Private(QFile* f)
++#ifdef LEGACY_FLAC
+     : FLAC::Decoder::SeekableStream(),
++#else
++    : FLAC::Decoder::Stream(),
++#endif
+       comments(0) {
+     internalBuffer = new QBuffer();
+     internalBuffer->open(IO_ReadWrite);
+@@ -93,10 +107,17 @@
+   FLAC__uint64 samples;
+   
+ protected:
++#ifdef LEGACY_FLAC
+   virtual FLAC__SeekableStreamDecoderReadStatus read_callback(FLAC__byte buffer[], unsigned *bytes);
+   virtual FLAC__SeekableStreamDecoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset);
+   virtual FLAC__SeekableStreamDecoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset);
+   virtual FLAC__SeekableStreamDecoderLengthStatus length_callback(FLAC__uint64 *stream_length);
++#else
++  virtual FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], size_t *bytes);
++  virtual FLAC__StreamDecoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset);
++  virtual FLAC__StreamDecoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset);
++  virtual FLAC__StreamDecoderLengthStatus length_callback(FLAC__uint64 *stream_length);
++#endif
+   virtual bool eof_callback();
+   virtual void error_callback(FLAC__StreamDecoderErrorStatus){};
+   virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata);
+@@ -112,6 +133,7 @@
+   return file->atEnd();
+ }
+ 
++#ifdef LEGACY_FLAC
+ FLAC__SeekableStreamDecoderReadStatus K3bFLACDecoder::Private::read_callback(FLAC__byte buffer[],                                                                             unsigned *bytes) {
+   long retval =  file->readBlock((char *)buffer, (*bytes));
+   if(-1 == retval) {
+@@ -121,7 +143,19 @@
+     return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
+   }
+ }
++#else
++FLAC__StreamDecoderReadStatus K3bFLACDecoder::Private::read_callback(FLAC__byte buffer[],                                                                             size_t *bytes) {
++  long retval =  file->readBlock((char *)buffer, (*bytes));
++  if(-1 == retval) {
++    return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
++  } else {
++    (*bytes) = retval;
++    return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
++  }
++}
++#endif
+ 
++#ifdef LEGACY_FLAC
+ FLAC__SeekableStreamDecoderSeekStatus 
+ K3bFLACDecoder::Private::seek_callback(FLAC__uint64 absolute_byte_offset) {
+   if(file->at(absolute_byte_offset) == FALSE)
+@@ -129,18 +163,43 @@
+   else
+     return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK;
+ }
++#else
++FLAC__StreamDecoderSeekStatus 
++K3bFLACDecoder::Private::seek_callback(FLAC__uint64 absolute_byte_offset) {
++  if(file->at(absolute_byte_offset) == FALSE)
++    return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
++  else
++    return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
++}
++#endif
+ 
++#ifdef LEGACY_FLAC
+ FLAC__SeekableStreamDecoderTellStatus 
+ K3bFLACDecoder::Private::tell_callback(FLAC__uint64 *absolute_byte_offset) {
+   (*absolute_byte_offset) = file->at();
+   return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
+ }
++#else
++FLAC__StreamDecoderTellStatus 
++K3bFLACDecoder::Private::tell_callback(FLAC__uint64 *absolute_byte_offset) {
++  (*absolute_byte_offset) = file->at();
++  return FLAC__STREAM_DECODER_TELL_STATUS_OK;
++}
++#endif
+ 
++#ifdef LEGACY_FLAC
+ FLAC__SeekableStreamDecoderLengthStatus 
+ K3bFLACDecoder::Private::length_callback(FLAC__uint64 *stream_length) {
+   (*stream_length) = file->size();
+   return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
+ }
++#else
++FLAC__StreamDecoderLengthStatus 
++K3bFLACDecoder::Private::length_callback(FLAC__uint64 *stream_length) {
++  (*stream_length) = file->size();
++  return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
++}
++#endif
+ 
+ 
+ void K3bFLACDecoder::Private::metadata_callback(const FLAC__StreamMetadata *metadata) {
+@@ -260,6 +319,7 @@
+   int bytesCopied;
+   int bytesAvailable;
+ 
++#ifdef LEGACY_FLAC
+   if(d->internalBuffer->size() == 0) {
+     // want more data
+     switch(d->get_state()) {
+@@ -274,6 +334,19 @@
+       return -1;
+     }
+   }
++#else
++  if(d->internalBuffer->size() == 0) {
++    // want more data
++    if(d->get_state() == FLAC__STREAM_DECODER_END_OF_STREAM)
++      d->finish();
++    else if(d->get_state() < FLAC__STREAM_DECODER_END_OF_STREAM) {
++      if(! d->process_single())
++        return -1;
++    }
++    else
++      return -1;
++  }
++#endif
+   
+   bytesAvailable = d->internalBuffer->size() - d->internalBuffer->at();
+   bytesToCopy = QMIN(maxLen, bytesAvailable);
diff --git a/app-cdr/k3b/files/k3b-0.12.17-flac-beta.patch b/app-cdr/k3b/files/k3b-0.12.17-flac-beta.patch
new file mode 100644
index 000000000000..812d405b06ab
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-0.12.17-flac-beta.patch
@@ -0,0 +1,19 @@
+Index: k3b-0.12.17/configure.in.in
+===================================================================
+--- k3b-0.12.17.orig/configure.in.in
++++ k3b-0.12.17/configure.in.in
+@@ -22,11 +22,11 @@ if test "$ac_cv_use_flac" = "yes"; then
+   # Hack to get the flac version since I was not able to handle the code from
+   # the flac guys. This is a strange usage of tr but I don't know too much about
+   # shell scripting and this works, so...
+   # BUT: this does not work if we want to use another flac version than the one installed
+   #      where the flac binary is found!
+-  K3B_FLAC_VERSION_MAJOR=`flac --version|tr -d "flac "|cut -d "." -f 1`
+-  K3B_FLAC_VERSION_MINOR=`flac --version|tr -d "flac "|cut -d "." -f 2`
+-  K3B_FLAC_VERSION_PATCHLEVEL=`flac --version|tr -d "flac "|cut -d "." -f 3`
++  K3B_FLAC_VERSION_MAJOR=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 1`
++  K3B_FLAC_VERSION_MINOR=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 2`
++  K3B_FLAC_VERSION_PATCHLEVEL=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 3`
+   if test \( "$K3B_FLAC_VERSION_MAJOR" -gt 1 -o \
+ 	\( "$K3B_FLAC_VERSION_MAJOR" -eq 1 -a \( "$K3B_FLAC_VERSION_MINOR" -gt 1 -o \
+ 				 \( "$K3B_FLAC_VERSION_MINOR" -eq 1 -a "$K3B_FLAC_VERSION_PATCHLEVEL" -gt 1 \) \
diff --git a/app-cdr/k3b/files/k3b-1.0_pre2+flac-1.1.3.patch b/app-cdr/k3b/files/k3b-1.0_pre2+flac-1.1.3.patch
new file mode 100644
index 000000000000..35e45d8e9006
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0_pre2+flac-1.1.3.patch
@@ -0,0 +1,165 @@
+--- k3b-1.0pre2/plugins/decoder/flac/configure.in.in	2006-08-23 00:32:30.000000000 -0700
++++ k3b-1.0pre2-b2/plugins/decoder/flac/configure.in.in	2006-10-17 19:23:48.000000000 -0700
+@@ -248,7 +248,7 @@
+ have_flac=no
+ if test "$ac_cv_use_flac" = "yes"; then
+   KDE_CHECK_HEADERS(FLAC++/decoder.h, [
+-     AC_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
++     AC_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
+ 	        have_flac=yes,[],$all_libraries)])
+ 
+   # Hack to get the flac version since I was not able to handle the code from
+--- k3b-1.0pre2/plugins/decoder/flac/k3bflacdecoder.cpp	2006-08-23 00:31:46.000000000 -0700
++++ k3b-1.0pre2-b2/plugins/decoder/flac/k3bflacdecoder.cpp	2006-10-18 14:32:24.000000000 -0700
+@@ -36,11 +36,21 @@
+ #include <taglib/flacfile.h>
+ #endif
+ 
++#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ K_EXPORT_COMPONENT_FACTORY( libk3bflacdecoder, K3bPluginFactory<K3bFLACDecoderFactory>( "libk3bflacdecoder" ) )
+ 
+ 
+ class K3bFLACDecoder::Private
++#ifdef LEGACY_FLAC
+   : public FLAC::Decoder::SeekableStream
++#else
++  : public FLAC::Decoder::Stream
++#endif
+ {
+ public:
+   void open(QFile* f) {
+@@ -64,7 +74,11 @@
+   }
+ 
+   Private(QFile* f)
++#ifdef LEGACY_FLAC
+     : FLAC::Decoder::SeekableStream(),
++#else
++    : FLAC::Decoder::Stream(),
++#endif
+       comments(0) {
+     internalBuffer = new QBuffer();
+     internalBuffer->open(IO_ReadWrite);
+@@ -93,10 +107,17 @@
+   FLAC__uint64 samples;
+   
+ protected:
++#ifdef LEGACY_FLAC
+   virtual FLAC__SeekableStreamDecoderReadStatus read_callback(FLAC__byte buffer[], unsigned *bytes);
+   virtual FLAC__SeekableStreamDecoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset);
+   virtual FLAC__SeekableStreamDecoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset);
+   virtual FLAC__SeekableStreamDecoderLengthStatus length_callback(FLAC__uint64 *stream_length);
++#else
++  virtual FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], size_t *bytes);
++  virtual FLAC__StreamDecoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset);
++  virtual FLAC__StreamDecoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset);
++  virtual FLAC__StreamDecoderLengthStatus length_callback(FLAC__uint64 *stream_length);
++#endif
+   virtual bool eof_callback();
+   virtual void error_callback(FLAC__StreamDecoderErrorStatus){};
+   virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata);
+@@ -112,6 +133,7 @@
+   return file->atEnd();
+ }
+ 
++#ifdef LEGACY_FLAC
+ FLAC__SeekableStreamDecoderReadStatus K3bFLACDecoder::Private::read_callback(FLAC__byte buffer[],                                                                             unsigned *bytes) {
+   long retval =  file->readBlock((char *)buffer, (*bytes));
+   if(-1 == retval) {
+@@ -121,7 +143,19 @@
+     return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
+   }
+ }
++#else
++FLAC__StreamDecoderReadStatus K3bFLACDecoder::Private::read_callback(FLAC__byte buffer[],                                                                             size_t *bytes) {
++  long retval =  file->readBlock((char *)buffer, (*bytes));
++  if(-1 == retval) {
++    return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
++  } else {
++    (*bytes) = retval;
++    return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
++  }
++}
++#endif
+ 
++#ifdef LEGACY_FLAC
+ FLAC__SeekableStreamDecoderSeekStatus 
+ K3bFLACDecoder::Private::seek_callback(FLAC__uint64 absolute_byte_offset) {
+   if(file->at(absolute_byte_offset) == FALSE)
+@@ -129,18 +163,43 @@
+   else
+     return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK;
+ }
++#else
++FLAC__StreamDecoderSeekStatus 
++K3bFLACDecoder::Private::seek_callback(FLAC__uint64 absolute_byte_offset) {
++  if(file->at(absolute_byte_offset) == FALSE)
++    return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
++  else
++    return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
++}
++#endif
+ 
++#ifdef LEGACY_FLAC
+ FLAC__SeekableStreamDecoderTellStatus 
+ K3bFLACDecoder::Private::tell_callback(FLAC__uint64 *absolute_byte_offset) {
+   (*absolute_byte_offset) = file->at();
+   return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
+ }
++#else
++FLAC__StreamDecoderTellStatus 
++K3bFLACDecoder::Private::tell_callback(FLAC__uint64 *absolute_byte_offset) {
++  (*absolute_byte_offset) = file->at();
++  return FLAC__STREAM_DECODER_TELL_STATUS_OK;
++}
++#endif
+ 
++#ifdef LEGACY_FLAC
+ FLAC__SeekableStreamDecoderLengthStatus 
+ K3bFLACDecoder::Private::length_callback(FLAC__uint64 *stream_length) {
+   (*stream_length) = file->size();
+   return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
+ }
++#else
++FLAC__StreamDecoderLengthStatus 
++K3bFLACDecoder::Private::length_callback(FLAC__uint64 *stream_length) {
++  (*stream_length) = file->size();
++  return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
++}
++#endif
+ 
+ 
+ void K3bFLACDecoder::Private::metadata_callback(const FLAC__StreamMetadata *metadata) {
+@@ -260,6 +319,7 @@
+   int bytesCopied;
+   int bytesAvailable;
+ 
++#ifdef LEGACY_FLAC
+   if(d->internalBuffer->size() == 0) {
+     // want more data
+     switch(d->get_state()) {
+@@ -274,6 +334,19 @@
+       return -1;
+     }
+   }
++#else
++  if(d->internalBuffer->size() == 0) {
++    // want more data
++    if(d->get_state() == FLAC__STREAM_DECODER_END_OF_STREAM)
++      d->finish();
++    else if(d->get_state() < FLAC__STREAM_DECODER_END_OF_STREAM) {
++      if(! d->process_single())
++        return -1;
++    }
++    else
++      return -1;
++  }
++#endif
+   
+   bytesAvailable = d->internalBuffer->size() - d->internalBuffer->at();
+   bytesToCopy = QMIN(maxLen, bytesAvailable);
diff --git a/app-cdr/k3b/files/k3b-1.0_pre2-flac-beta.patch b/app-cdr/k3b/files/k3b-1.0_pre2-flac-beta.patch
new file mode 100644
index 000000000000..ec34de688854
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0_pre2-flac-beta.patch
@@ -0,0 +1,17 @@
+Index: k3b-1.0pre2/plugins/decoder/flac/configure.in.in
+===================================================================
+--- k3b-1.0pre2.orig/plugins/decoder/flac/configure.in.in
++++ k3b-1.0pre2/plugins/decoder/flac/configure.in.in
+@@ -22,9 +22,9 @@ if test "$ac_cv_use_flac" = "yes"; then
+   AC_CHECK_PROG( have_flac_bin, flac, 1, 0 )
+ 
+   if test "$have_flac_bin" = "1"; then
+-    K3B_FLAC_VERSION_MAJOR=`flac --version|tr -d "flac "|cut -d "." -f 1`
+-    K3B_FLAC_VERSION_MINOR=`flac --version|tr -d "flac "|cut -d "." -f 2`
+-    K3B_FLAC_VERSION_PATCHLEVEL=`flac --version|tr -d "flac "|cut -d "." -f 3`
++    K3B_FLAC_VERSION_MAJOR=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 1`
++    K3B_FLAC_VERSION_MINOR=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 2`
++    K3B_FLAC_VERSION_PATCHLEVEL=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 3`
+     if test \( "$K3B_FLAC_VERSION_MAJOR" -gt 1 -o \
+ 	\( "$K3B_FLAC_VERSION_MAJOR" -eq 1 -a \( "$K3B_FLAC_VERSION_MINOR" -gt 1 -o \
+ 				 \( "$K3B_FLAC_VERSION_MINOR" -eq 1 -a "$K3B_FLAC_VERSION_PATCHLEVEL" -gt 1 \) \
diff --git a/app-cdr/k3b/k3b-0.12.17.ebuild b/app-cdr/k3b/k3b-0.12.17.ebuild
index d43d7a980997..7007a3a5482c 100644
--- a/app-cdr/k3b/k3b-0.12.17.ebuild
+++ b/app-cdr/k3b/k3b-0.12.17.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/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.4 2006/10/19 17:41:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.5 2006/10/21 21:05:57 flameeyes Exp $
 
 inherit kde eutils
 
@@ -21,7 +21,7 @@ DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
 	ffmpeg? ( media-video/ffmpeg )
-	flac? ( ~media-libs/flac-1.1.2 )
+	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
 	vorbis? ( media-libs/libvorbis )
@@ -76,11 +76,15 @@ src_unpack() {
 		done
 		rm -f configure
 	fi
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
+	epatch "${FILESDIR}/${P}-flac-beta.patch"
+	rm -f "${S}/configure"
 }
 
 src_compile() {
-	local myconf="--enable-libsuffix= \
-			--with-external-libsamplerate	\
+	local myconf="--with-external-libsamplerate	\
 			--without-resmgr		\
 			$(use_with kde k3bsetup)	\
 			$(use_with hal)			\
diff --git a/app-cdr/k3b/k3b-1.0_pre2.ebuild b/app-cdr/k3b/k3b-1.0_pre2.ebuild
index 4b845a49071f..a77a4fcae2e9 100644
--- a/app-cdr/k3b/k3b-1.0_pre2.ebuild
+++ b/app-cdr/k3b/k3b-1.0_pre2.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/app-cdr/k3b/k3b-1.0_pre2.ebuild,v 1.3 2006/10/19 17:41:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre2.ebuild,v 1.4 2006/10/21 21:05:57 flameeyes Exp $
 
 inherit kde eutils
 
@@ -24,7 +24,7 @@ DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
 	ffmpeg? ( media-video/ffmpeg )
-	flac? ( ~media-libs/flac-1.1.2 )
+	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
 	vorbis? ( media-libs/libvorbis )
@@ -87,6 +87,11 @@ src_unpack() {
 		done
 		rm -f configure
 	fi
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
+	epatch "${FILESDIR}/${P}-flac-beta.patch"
+	rm -f "${S}/configure"
 }
 
 src_compile() {