Flac 1.1.3 patch from Josh Coalson, small fixes

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/media-sound/bossogg/ChangeLog b/media-sound/bossogg/ChangeLog
index 29a5d08eb68f23ee970b6bcc9956cec4ec27caa1..43275c87d277c869f3d4dceb8e76d296dd662799 100644 (file)
--- a/media-sound/bossogg/ChangeLog
+++ b/media-sound/bossogg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/bossogg
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.21 2007/01/05 17:24:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.22 2007/01/08 18:53:14 aballier Exp $
+
+  08 Jan 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/bossogg-0.13.6+flac-1.1.3.patch,
+  +files/bossogg-0.13.6-metadata.patch, +files/bossogg-0.13.6-sigkill.patch,
+  bossogg-0.13.6-r3.ebuild:
+  Flac 1.1.3 patch from Josh Coalson, small fixes
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> bossogg-0.13.5.ebuild,
   bossogg-0.13.6-r2.ebuild, bossogg-0.13.6-r3.ebuild:

diff --git a/media-sound/bossogg/Manifest b/media-sound/bossogg/Manifest
index 694b9a174231503bfa0d20e1f44e841e8e64173d..4e248b5a96eca61aa56654baafff800353c48266 100644 (file)
--- a/media-sound/bossogg/Manifest
+++ b/media-sound/bossogg/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX bossogg-0.13.6+flac-1.1.3.patch 7420 RMD160 b99dd98a5703021585b9711cc58f128621ffc8fc SHA1 5ef8076fd5760d0fdb7eb66d6f8a7d5de15770ad SHA256 bfbba5d7db0ed6674be2ca58f401c3b475e6e7de43c823dbad7bb988d066500a
+MD5 dd8708456a2771fb0892b1527c7afd10 files/bossogg-0.13.6+flac-1.1.3.patch 7420
+RMD160 b99dd98a5703021585b9711cc58f128621ffc8fc files/bossogg-0.13.6+flac-1.1.3.patch 7420
+SHA256 bfbba5d7db0ed6674be2ca58f401c3b475e6e7de43c823dbad7bb988d066500a files/bossogg-0.13.6+flac-1.1.3.patch 7420
 AUX bossogg-0.13.6-Makefile.patch 1673 RMD160 2f7396fd8e196f60900b94fc7a5929622c461807 SHA1 e2805bb6ae1b9753fe930ff4aaa8bd8a524775d8 SHA256 056243759834d76d3dd56879a678a7e6156dcd4e6390d544da5bc61734c562e8
 MD5 1258e23a47f430724dd4a6b18798641c files/bossogg-0.13.6-Makefile.patch 1673
 RMD160 2f7396fd8e196f60900b94fc7a5929622c461807 files/bossogg-0.13.6-Makefile.patch 1673
@@ -9,11 +13,19 @@ AUX bossogg-0.13.6-gcc4.patch 1099 RMD160 59d2896fa29b3de688ef312f605921818d1bab
 MD5 986dd155135ce535ebc1b77485b6bd40 files/bossogg-0.13.6-gcc4.patch 1099
 RMD160 59d2896fa29b3de688ef312f605921818d1babcf files/bossogg-0.13.6-gcc4.patch 1099
 SHA256 3b210bf534332cf239ba394bb63e1dbd32e3d0051003c901914e390785c308fc files/bossogg-0.13.6-gcc4.patch 1099
+AUX bossogg-0.13.6-metadata.patch 405 RMD160 522916a4b838b9d5a745f4069dd3732d9a4d9f32 SHA1 6e1e16187e42f509e61a427b414c06133a2c0270 SHA256 572a538d556c39b51e2730ac1cdfcbae7bc97e65b5d76d19127133e26ed61f91
+MD5 69d2107383a2e892fcf42c0e9688795a files/bossogg-0.13.6-metadata.patch 405
+RMD160 522916a4b838b9d5a745f4069dd3732d9a4d9f32 files/bossogg-0.13.6-metadata.patch 405
+SHA256 572a538d556c39b51e2730ac1cdfcbae7bc97e65b5d76d19127133e26ed61f91 files/bossogg-0.13.6-metadata.patch 405
+AUX bossogg-0.13.6-sigkill.patch 404 RMD160 ae674393b63ca56226d9191d32de2722829deff6 SHA1 83eed3d6261e6dfd5d58076cfc9a45040167cb2c SHA256 8c1e7d4d44f619cbeca4c4ba9982c3e89153910b31628abf195636f87377707d
+MD5 1dfe86210182cb75648c0f277873e6cc files/bossogg-0.13.6-sigkill.patch 404
+RMD160 ae674393b63ca56226d9191d32de2722829deff6 files/bossogg-0.13.6-sigkill.patch 404
+SHA256 8c1e7d4d44f619cbeca4c4ba9982c3e89153910b31628abf195636f87377707d files/bossogg-0.13.6-sigkill.patch 404
 AUX bossogg.initd 609 RMD160 1a88a35a67bb69461c0811b3c990501e7873894f SHA1 b6cde285c1d5233210e960c4bcdbc46e4c181d72 SHA256 408683dc3567c89900e2b66ef1106ac54bd425e80d6493c4bce35db9257a373f
 MD5 3089685b6a78e3a1a57cd7315f1245b4 files/bossogg.initd 609
 RMD160 1a88a35a67bb69461c0811b3c990501e7873894f files/bossogg.initd 609
 SHA256 408683dc3567c89900e2b66ef1106ac54bd425e80d6493c4bce35db9257a373f files/bossogg.initd 609
-DIST bossogg-0.13.5.tar.gz 333613
+DIST bossogg-0.13.5.tar.gz 333613 RMD160 d9057147c138737297a983aa7601ddfffde12511 SHA1 dbbfec53000910f9fdf1b8f2dea7346d3c610f2b SHA256 2067732f1615eb4ff261d898d75015096fa0574ef84a0453efd2b820911d91ec
 DIST bossogg-0.13.6.tar.gz 338025 RMD160 b2c6c7802e9ba667968cc46eb7471f7cd267f6cc SHA1 4b2e8735f3ed82b58a46246417c2268d27c74283 SHA256 59f9891ed4b12d38f61c170db677c0d818602e030f52fda47546a701d3302150
 EBUILD bossogg-0.13.5.ebuild 1455 RMD160 fbf44c73bf7069687e20dd6d0fc0b7e2a9c9e506 SHA1 edee7c00a1a47345548d93b353095fce029fd2a8 SHA256 aa822bcdcdae16c5a874d43ff3916760675de196b1661f498f613ea8b8d78493
 MD5 046afe8026db72c0ec3d074a7a32af27 bossogg-0.13.5.ebuild 1455
@@ -23,21 +35,21 @@ EBUILD bossogg-0.13.6-r2.ebuild 1587 RMD160 b47859f1e0e5034289918e2819ca60969d17
 MD5 7c6615e9f5b612295439aca075cb36f6 bossogg-0.13.6-r2.ebuild 1587
 RMD160 b47859f1e0e5034289918e2819ca60969d170004 bossogg-0.13.6-r2.ebuild 1587
 SHA256 d1558913a3884b6797c2e4a369c914ca4a8d96da4a7cb560d8133296c9984581 bossogg-0.13.6-r2.ebuild 1587
-EBUILD bossogg-0.13.6-r3.ebuild 1654 RMD160 d559df7a4482eaffd3312b93cdf922dbeebe1016 SHA1 f250ace0220ba4822b37986bf040d2bc1a1c6f74 SHA256 917476dae4178fd819ecc9c1ca1d5e5aa99c56ced3d191815bacf049b4502495
-MD5 3da168beb24659be9ff42b2979e1c9fe bossogg-0.13.6-r3.ebuild 1654
-RMD160 d559df7a4482eaffd3312b93cdf922dbeebe1016 bossogg-0.13.6-r3.ebuild 1654
-SHA256 917476dae4178fd819ecc9c1ca1d5e5aa99c56ced3d191815bacf049b4502495 bossogg-0.13.6-r3.ebuild 1654
-MISC ChangeLog 3707 RMD160 0bd2b0d807369295d86328f8675d1961be6aa7c5 SHA1 a116b63b5f584918958d2550aab868e6c7b65f4d SHA256 b3a90dbc9b8a012e396ee90a2bc12ee972d2f3b975c7f118420358c6d7e17215
-MD5 40bb75353974959b340726420f6263da ChangeLog 3707
-RMD160 0bd2b0d807369295d86328f8675d1961be6aa7c5 ChangeLog 3707
-SHA256 b3a90dbc9b8a012e396ee90a2bc12ee972d2f3b975c7f118420358c6d7e17215 ChangeLog 3707
+EBUILD bossogg-0.13.6-r3.ebuild 1784 RMD160 a27c23c27fa25d6a2034fe7e17e2c80ffed3d591 SHA1 7ed533d3049a43609d4445966bec51adb4a1ef8c SHA256 9ce35111ea544e3b574ca6b20fbd1fe5a2fcfab9befc3b937fc8423e04311dfd
+MD5 8f64f7e36169193971c29fa5bb6faf3b bossogg-0.13.6-r3.ebuild 1784
+RMD160 a27c23c27fa25d6a2034fe7e17e2c80ffed3d591 bossogg-0.13.6-r3.ebuild 1784
+SHA256 9ce35111ea544e3b574ca6b20fbd1fe5a2fcfab9befc3b937fc8423e04311dfd bossogg-0.13.6-r3.ebuild 1784
+MISC ChangeLog 3956 RMD160 abd0836f5dde0bcd2c880c437b86b2f3fb7e8c6a SHA1 b38ae0a059f190f8c69043e5f27961900d3541bb SHA256 7b004d67a815dafe761f9d83a6f96a754b40b022cfcb4520238871ff1857210b
+MD5 780faa857970d8ff82881fcbd76b277b ChangeLog 3956
+RMD160 abd0836f5dde0bcd2c880c437b86b2f3fb7e8c6a ChangeLog 3956
+SHA256 7b004d67a815dafe761f9d83a6f96a754b40b022cfcb4520238871ff1857210b ChangeLog 3956
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 5744dec050eb39224fe02fcdd1e74bed files/digest-bossogg-0.13.5 66
-RMD160 136429ebc0d09a79ea14133d79472e4d0456bff4 files/digest-bossogg-0.13.5 66
-SHA256 12205166958317a894c6b9ec1c5cf874ef8072953e9e536c4ebbbdc99b748eb9 files/digest-bossogg-0.13.5 66
+MD5 d10c604be4af15a16b649bde1b28666c files/digest-bossogg-0.13.5 244
+RMD160 b016ea3f29a28c5c34c2d3040c2cf9137b588463 files/digest-bossogg-0.13.5 244
+SHA256 d1572698b73a478a6cd3435e469dd318ee5d6a55bf5c4780338e75994e9d9ef7 files/digest-bossogg-0.13.5 244
 MD5 c3c44c783dcfd6989059534fe34b5ecb files/digest-bossogg-0.13.6-r2 244
 RMD160 b3eb2c27c364bebfb20b4b8ef50b85aa2b1f8d56 files/digest-bossogg-0.13.6-r2 244
 SHA256 0b5131dd0fa689a2f853a070587925fde243d62b8967dc67269d9ada1d8e4bce files/digest-bossogg-0.13.6-r2 244
@@ -47,7 +59,7 @@ SHA256 0b5131dd0fa689a2f853a070587925fde243d62b8967dc67269d9ada1d8e4bce files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnonmAiZjviIA2XgRAsRvAKCOQQWJUi6DoBjP6sEY2fDIzFZy2wCfbOc6
-VPBuUKvQBLtS7kNsTBll9g4=
-=X68C
+iD8DBQFFopMgvFcC4BYPU0oRAp47AJ9KQlgqVJz/8V0QMq8NhAedGx5P2ACdGDrq
+FcCQsdt+0de604ZT/1he5lE=
+=iRhE
 -----END PGP SIGNATURE-----

diff --git a/media-sound/bossogg/bossogg-0.13.6-r3.ebuild b/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
index 3648e034258a09040397f62f5148dc08213cb1f7..558caa56321d328450e63fd117aaca04707eadce 100644 (file)
--- a/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r3.ebuild,v 1.6 2007/01/05 17:24:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r3.ebuild,v 1.7 2007/01/08 18:53:14 aballier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -19,14 +19,14 @@ LICENSE="GPL-2"
 
 DEPEND=">=media-libs/libao-0.8.3
        media-libs/libshout
-       flac? ( ~media-libs/flac-1.1.2 )
+       flac? ( >=media-libs/flac-1.1.2 )
        vorbis? ( media-libs/libvorbis )
        mad? ( media-libs/libmad
                media-libs/id3lib )
        =dev-db/sqlite-2*"
 
 RDEPEND="${DEPEND}
-        dev-python/pysqlite"
+        <dev-python/pysqlite-2"
 
 src_unpack() {
        unpack ${A}
@@ -34,6 +34,9 @@ src_unpack() {
 
        epatch "${FILESDIR}/${P}-Makefile.patch"
        epatch "${FILESDIR}/${P}-gcc4.patch"
+       epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
+       epatch "${FILESDIR}/${P}-metadata.patch"
+       epatch "${FILESDIR}/${P}-sigkill.patch"
 
        eautoreconf
 }

diff --git a/media-sound/bossogg/files/bossogg-0.13.6+flac-1.1.3.patch b/media-sound/bossogg/files/bossogg-0.13.6+flac-1.1.3.patch
new file mode 100644 (file)
index 0000000..0ddc0b1
--- /dev/null
+++ b/media-sound/bossogg/files/bossogg-0.13.6+flac-1.1.3.patch
@@ -0,0 +1,237 @@
+diff -ru --exclude=Makefile.in --exclude=Makefile bossogg-0.13.6/boss3/bossao/bossao.c bossogg-0.13.6-b2/boss3/bossao/bossao.c
+--- bossogg-0.13.6/boss3/bossao/bossao.c       2004-04-01 17:44:26.000000000 -0800
++++ bossogg-0.13.6-b2/boss3/bossao/bossao.c    2006-10-30 23:25:47.000000000 -0800
+@@ -46,7 +46,11 @@
+ #endif
+ 
+ #ifdef HAVE_FLAC
++#ifdef LEGACY_FLAC
+ #include <FLAC/file_decoder.h>
++#else
++#include <FLAC/stream_decoder.h>
++#endif
+ #include "flac.h"
+ #endif
+ 
+diff -ru --exclude=Makefile.in --exclude=Makefile bossogg-0.13.6/boss3/bossao/bossao.h bossogg-0.13.6-b2/boss3/bossao/bossao.h
+--- bossogg-0.13.6/boss3/bossao/bossao.h       2004-04-01 17:44:26.000000000 -0800
++++ bossogg-0.13.6-b2/boss3/bossao/bossao.h    2006-10-30 23:17:54.000000000 -0800
+@@ -38,6 +38,14 @@
+ 
+ #define RATE 44100
+ 
++#if defined(HAVE_FLAC) && !defined(LEGACY_FLAC)
++#include <FLAC/export.h>
++// FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#endif
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -50,7 +58,11 @@
+   struct mp3_t *mp3;
+ #endif
+ #ifdef HAVE_FLAC
++#ifdef LEGACY_FLAC
+   struct FLAC__FileDecoder *flac;
++#else
++  struct FLAC__StreamDecoder *flac;
++#endif
+ #endif
+ } songlib_s;
+ 
+diff -ru --exclude=Makefile.in --exclude=Makefile bossogg-0.13.6/boss3/bossao/flac.c bossogg-0.13.6-b2/boss3/bossao/flac.c
+--- bossogg-0.13.6/boss3/bossao/flac.c 2004-04-01 17:44:26.000000000 -0800
++++ bossogg-0.13.6-b2/boss3/bossao/flac.c      2006-10-30 23:26:07.000000000 -0800
+@@ -22,7 +22,19 @@
+ #include <string.h>
+ #include <Python.h>
+ 
++#if !defined(LEGACY_FLAC)
++#include <FLAC/export.h>
++// FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#endif
++#endif
++
++#ifdef LEGACY_FLAC
+ #include <FLAC/file_decoder.h>
++#else
++#include <FLAC/stream_decoder.h>
++#endif
+ #include <FLAC/metadata.h>
+ #include <ao/ao.h>
+ #include <pthread.h>
+@@ -32,15 +44,17 @@
+ #include "bossao.h"
+ #include "flac.h"
+ 
+-static FLAC__bool eof_callback (const FLAC__SeekableStreamDecoder *decoder, void *client_data)
+-{
+-  //printf ("FLAC got eof\n");
+-}
+-
++#ifdef LEGACY_FLAC
+ static FLAC__StreamDecoderWriteStatus write_callback (const FLAC__FileDecoder *decoder,
+                                                     const FLAC__Frame *frame,
+                                                     const FLAC__int32 *const buffer[],
+                                                     void *client_data)
++#else
++static FLAC__StreamDecoderWriteStatus write_callback (const FLAC__StreamDecoder *decoder,
++                                                    const FLAC__Frame *frame,
++                                                    const FLAC__int32 *const buffer[],
++                                                    void *client_data)
++#endif
+ {
+   //printf ("in write\n");
+   size_t size = frame->header.blocksize * frame->header.channels;
+@@ -76,16 +90,28 @@
+   return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+ }
+ 
++#ifdef LEGACY_FLAC
+ static void metadata_callback (const FLAC__FileDecoder *decoder,
+                               const FLAC__StreamMetadata *metadata,
+                               void *client_data)
++#else
++static void metadata_callback (const FLAC__StreamDecoder *decoder,
++                              const FLAC__StreamMetadata *metadata,
++                              void *client_data)
++#endif
+ {
+   //printf ("Doing nothing in metadata callback\n");
+ }
+ 
++#ifdef LEGACY_FLAC
+ static void error_callback (const FLAC__FileDecoder *decoder,
+                           const FLAC__StreamDecoderErrorStatus status,
+                           void *client_data)
++#else
++static void error_callback (const FLAC__StreamDecoder *decoder,
++                          const FLAC__StreamDecoderErrorStatus status,
++                          void *client_data)
++#endif
+ {
+   printf ("A FLAC error occured\n");
+  }
+@@ -93,9 +119,15 @@
+ void *prepare_flac (song_s *song, char *filename)
+ {
+   //song->songlib->flac = malloc (sizeof (FLAC__FileDecoder));
++#ifdef LEGACY_FLAC
+   song->songlib->flac = FLAC__file_decoder_new ();
+   FLAC__FileDecoder *decoder = (FLAC__FileDecoder *)song->songlib->flac;
++#else
++  song->songlib->flac = FLAC__stream_decoder_new ();
++  FLAC__StreamDecoder *decoder = (FLAC__StreamDecoder *)song->songlib->flac;
++#endif
+   
++#ifdef LEGACY_FLAC
+   /* callbacks here? */
+   FLAC__file_decoder_set_write_callback (decoder, write_callback);
+   FLAC__file_decoder_set_metadata_callback (decoder, metadata_callback);
+@@ -108,13 +140,21 @@
+   FLAC__SeekableStreamDecoderState state = FLAC__file_decoder_init (decoder);
+   //printf ("inited\n");
+   if (state != FLAC__FILE_DECODER_OK) {
+-    printf ("Problem initizlizing FLAC file decoder: %d", state);
++    printf ("Problem initializing FLAC file decoder: %d", state);
+     if (state == FLAC__FILE_DECODER_ALREADY_INITIALIZED)
+       printf ("already inited\n");
+     if (state == FLAC__FILE_DECODER_SEEKABLE_STREAM_DECODER_ERROR)
+       printf ("seekable decoder error\n");
+     return NULL;
+   }
++#else
++  FLAC__StreamDecoderInitStatus init_status = FLAC__stream_decoder_init_file (decoder, filename, write_callback, metadata_callback, error_callback, song);
++  //printf ("inited\n");
++  if (init_status != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++    printf ("Problem initializing FLAC decoder: %s\n", FLAC__StreamDecoderInitStatusString[init_status]);
++    return NULL;
++  }
++#endif
+ 
+   FLAC__Metadata_SimpleIterator *it = FLAC__metadata_simple_iterator_new ();
+   if (!FLAC__metadata_simple_iterator_init (it, filename, 1, 0)) {
+@@ -142,12 +182,22 @@
+ 
+ int destroy_flac (song_s *song)
+ {
++#ifdef LEGACY_FLAC
+   FLAC__FileDecoder *decoder = (FLAC__FileDecoder *)song->songlib->flac;
++#else
++  FLAC__StreamDecoder *decoder = (FLAC__StreamDecoder *)song->songlib->flac;
++#endif
+ 
+   if (decoder != NULL) {
++#ifdef LEGACY_FLAC
+     FLAC__file_decoder_finish (decoder);
+     /* seperate this somehow? */
+     FLAC__file_decoder_delete (decoder);
++#else
++    FLAC__stream_decoder_finish (decoder);
++    /* seperate this somehow? */
++    FLAC__stream_decoder_delete (decoder);
++#endif
+     //free (decoder);
+     decoder = NULL;
+   }
+@@ -157,15 +207,30 @@
+ 
+ long chunk_play_flac (song_s *song, char *buffer)
+ {
++#ifdef LEGACY_FLAC
+   FLAC__FileDecoder *decoder = (FLAC__FileDecoder *)song->songlib->flac;
++#else
++  FLAC__StreamDecoder *decoder = (FLAC__StreamDecoder *)song->songlib->flac;
++#endif
+   //printf ("trying to play a chunk %x\n", decoder);
++#ifdef LEGACY_FLAC
+   FLAC__file_decoder_process_single (decoder);
++#else
++  FLAC__stream_decoder_process_single (decoder);
++#endif
+   //printf ("done chunking\n");
+ 
++#ifdef LEGACY_FLAC
+   if (FLAC__file_decoder_get_state (decoder) == FLAC__FILE_DECODER_END_OF_FILE) {
+     //printf ("flac reached end of file\n");
+     return 0;
+   }
++#else
++  if (FLAC__stream_decoder_get_state (decoder) == FLAC__STREAM_DECODER_END_OF_STREAM) {
++    //printf ("flac reached end of file\n");
++    return 0;
++  }
++#endif
+ 
+   return 1;
+ }
+diff -ru --exclude=Makefile.in --exclude=Makefile bossogg-0.13.6/boss3/bossao/flac.h bossogg-0.13.6-b2/boss3/bossao/flac.h
+--- bossogg-0.13.6/boss3/bossao/flac.h 2004-04-01 17:44:26.000000000 -0800
++++ bossogg-0.13.6-b2/boss3/bossao/flac.h      2006-10-30 16:59:06.000000000 -0800
+@@ -17,8 +17,20 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#if !defined(LEGACY_FLAC)
++#include <FLAC/export.h>
++// FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#endif
++#endif
++
+ typedef struct flac_t {
++#ifdef LEGACY_FLAC
+   FLAC__FileDecoder *decoder;
++#else
++  FLAC__StreamDecoder *decoder;
++#endif
+ 
+ } flac_s;
+ 

diff --git a/media-sound/bossogg/files/bossogg-0.13.6-metadata.patch b/media-sound/bossogg/files/bossogg-0.13.6-metadata.patch
new file mode 100644 (file)
index 0000000..429431b
--- /dev/null
+++ b/media-sound/bossogg/files/bossogg-0.13.6-metadata.patch
@@ -0,0 +1,11 @@
+--- bossogg-0.13.6/boss3/metadata/Makefile.am.old      2006-12-09 14:23:39.000000000 +0100
++++ bossogg-0.13.6/boss3/metadata/Makefile.am  2006-12-09 14:23:48.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ python_LTLIBRARIES=_id3.la
+ 
+-_id3_la_LDFLAGS=-module @METADATA_LIBS@
++_id3_la_LDFLAGS=-module
+ _id3_la_CFLAGS=-I../bossao
+ _id3_la_CXXFLAGS=-I../bossao
+ _id3_la_SOURCES=id3.h id3.c id3_wrap.c ${USE_OGG} ${USE_ID3} 

diff --git a/media-sound/bossogg/files/bossogg-0.13.6-sigkill.patch b/media-sound/bossogg/files/bossogg-0.13.6-sigkill.patch
new file mode 100644 (file)
index 0000000..c0e915a
--- /dev/null
+++ b/media-sound/bossogg/files/bossogg-0.13.6-sigkill.patch
@@ -0,0 +1,11 @@
+--- bossogg-0.13.6/bossogg.old 2007-01-08 19:27:24.000000000 +0100
++++ bossogg-0.13.6/bossogg     2007-01-08 19:27:55.000000000 +0100
+@@ -214,8 +214,6 @@
+       interfaces = []
+ 
+       #Setup signal handlers
+-      signal.signal(signal.SIGKILL, stopBoss)
+-      signal.signal(signal.SIGSTOP, stopBoss)
+       signal.signal(signal.SIGQUIT, stopBoss)
+       signal.signal(signal.SIGTERM, stopBoss)
+       signal.signal(signal.SIGINT, stopBoss)

diff --git a/media-sound/bossogg/files/digest-bossogg-0.13.5 b/media-sound/bossogg/files/digest-bossogg-0.13.5
index 50e39bfebfdca412f25154582d943b8d75ef3e60..f1ee88e848817388b2b953ff556765229fbe92e9 100644 (file)
--- a/media-sound/bossogg/files/digest-bossogg-0.13.5
+++ b/media-sound/bossogg/files/digest-bossogg-0.13.5
@@ -1 +1,3 @@
 MD5 8ce79ef7c1aef04b2bcf9d7907967462 bossogg-0.13.5.tar.gz 333613
+RMD160 d9057147c138737297a983aa7601ddfffde12511 bossogg-0.13.5.tar.gz 333613
+SHA256 2067732f1615eb4ff261d898d75015096fa0574ef84a0453efd2b820911d91ec bossogg-0.13.5.tar.gz 333613