From c21e956c0e974883accb708d8368ca54e2ab8670 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 12 Dec 2006 22:35:31 +0000 Subject: [PATCH] Added patch from Josh Coalson (from FLAC) and closing bug #157849. Package-Manager: portage-2.1.2_rc2-r2 --- media-libs/sdl-sound/ChangeLog | 6 +- media-libs/sdl-sound/Manifest | 30 +++-- media-libs/sdl-sound/files/flac-1.1.3.patch | 126 ++++++++++++++++++ .../sdl-sound/sdl-sound-1.0.1-r2.ebuild | 3 +- 4 files changed, 155 insertions(+), 10 deletions(-) create mode 100644 media-libs/sdl-sound/files/flac-1.1.3.patch diff --git a/media-libs/sdl-sound/ChangeLog b/media-libs/sdl-sound/ChangeLog index fd698be5a237..788a57833e32 100644 --- a/media-libs/sdl-sound/ChangeLog +++ b/media-libs/sdl-sound/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/sdl-sound # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/ChangeLog,v 1.23 2006/11/07 19:17:30 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/ChangeLog,v 1.24 2006/12/12 22:35:31 wolf31o2 Exp $ + + 12 Dec 2006; Chris Gianelloni + +files/flac-1.1.3.patch, sdl-sound-1.0.1-r2.ebuild: + Added patch from Josh Coalson (from FLAC) and closing bug #157849. 07 Nov 2006; Michael Sterrett sdl-sound-1.0.1-r1.ebuild, sdl-sound-1.0.1-r2.ebuild: diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest index c4bce29fe8e7..16c1cfad594e 100644 --- a/media-libs/sdl-sound/Manifest +++ b/media-libs/sdl-sound/Manifest @@ -1,3 +1,10 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX flac-1.1.3.patch 4844 RMD160 d8c522132b0597ba56d8cc8bf38805b2c4c86366 SHA1 5658117dcdc69397f9b2bec8e4c0b20d7630c386 SHA256 5ffe81fe08453f4abaa2611f9646db6b8fad0dfeaaf8c98b94613d5c6295c691 +MD5 302aa9dc94cc71dd3339ca3177d36e1c files/flac-1.1.3.patch 4844 +RMD160 d8c522132b0597ba56d8cc8bf38805b2c4c86366 files/flac-1.1.3.patch 4844 +SHA256 5ffe81fe08453f4abaa2611f9646db6b8fad0dfeaaf8c98b94613d5c6295c691 files/flac-1.1.3.patch 4844 AUX gcc331.patch 1235 RMD160 cb0a55cefe5fe7440a77871b5a08ec739d375e91 SHA1 dbaa85d9f14a667a57e8150ed6bfad3afeb7903e SHA256 c904b03821d2d224def0f8a75e0ee7a78d897de69f6027ef9c17ac053bc82640 MD5 8bbc02320ecd20c8a7ed18a63f317ca1 files/gcc331.patch 1235 RMD160 cb0a55cefe5fe7440a77871b5a08ec739d375e91 files/gcc331.patch 1235 @@ -7,14 +14,14 @@ EBUILD sdl-sound-1.0.1-r1.ebuild 1238 RMD160 581650174b2767ab207bebb63ff2026e44c MD5 65e59a39e2cabf729168aff84f803cb8 sdl-sound-1.0.1-r1.ebuild 1238 RMD160 581650174b2767ab207bebb63ff2026e44cf97b2 sdl-sound-1.0.1-r1.ebuild 1238 SHA256 b3f1334f7053325d5e0411272fcdc4e6eb08ba97f14425063da5e2e985376341 sdl-sound-1.0.1-r1.ebuild 1238 -EBUILD sdl-sound-1.0.1-r2.ebuild 1637 RMD160 340d79e3c554d99f3e722a23f9445d546c2a0288 SHA1 c75d3292f1b1ffc1fe6f9a6f78b240037cd401c1 SHA256 8ace8f7a34e160f44b45d015a540c958b3d5e370450e677d0329f75ac8be4b79 -MD5 0e5b76b03b5201cf0f214e480f8cb1b4 sdl-sound-1.0.1-r2.ebuild 1637 -RMD160 340d79e3c554d99f3e722a23f9445d546c2a0288 sdl-sound-1.0.1-r2.ebuild 1637 -SHA256 8ace8f7a34e160f44b45d015a540c958b3d5e370450e677d0329f75ac8be4b79 sdl-sound-1.0.1-r2.ebuild 1637 -MISC ChangeLog 3685 RMD160 64c7ac5d2f61809465d9536f02edd62c897ec471 SHA1 1e7b6a3b5a6cacaccd780b58a27bed898a1133d5 SHA256 879f0a79214e540da1b14c1c37795dc04cc43eada1db2ed4f03741042e8de522 -MD5 c7b30093144c46f4a0cf6a0e8401787a ChangeLog 3685 -RMD160 64c7ac5d2f61809465d9536f02edd62c897ec471 ChangeLog 3685 -SHA256 879f0a79214e540da1b14c1c37795dc04cc43eada1db2ed4f03741042e8de522 ChangeLog 3685 +EBUILD sdl-sound-1.0.1-r2.ebuild 1679 RMD160 87c98b7a41b319770c3df0809d10ba49831cddb3 SHA1 1a57af5bdf0cafae9765f9831b741f008c0ae4ed SHA256 739098d3cc43c6e0e98282d041d78907e4c62b7803e120085981ac00f53eaaa2 +MD5 3f2545da6dd5c7763324cc8c89546c5b sdl-sound-1.0.1-r2.ebuild 1679 +RMD160 87c98b7a41b319770c3df0809d10ba49831cddb3 sdl-sound-1.0.1-r2.ebuild 1679 +SHA256 739098d3cc43c6e0e98282d041d78907e4c62b7803e120085981ac00f53eaaa2 sdl-sound-1.0.1-r2.ebuild 1679 +MISC ChangeLog 3862 RMD160 262ae1b3906c86f84275ca20cc227623fdb3e5f6 SHA1 550c13cd51a1bd91b41d6ca8f54293d6cd2a3b76 SHA256 1ce99145abc154f91e5dd330c712618a7ffba2f5eeaab5d1768c2aa75cbbf5ad +MD5 efd41e35f9edc02c3d1a7fb7681be8fa ChangeLog 3862 +RMD160 262ae1b3906c86f84275ca20cc227623fdb3e5f6 ChangeLog 3862 +SHA256 1ce99145abc154f91e5dd330c712618a7ffba2f5eeaab5d1768c2aa75cbbf5ad ChangeLog 3862 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -25,3 +32,10 @@ SHA256 80a951727833441b7af1972863c025dfde3219044d8bca92abce4ec5276aaf6e files/di MD5 3148af24b1e50a7e5ee276edd4700495 files/digest-sdl-sound-1.0.1-r2 250 RMD160 a13ea096dd2f925500e055d957f0684df80a3453 files/digest-sdl-sound-1.0.1-r2 250 SHA256 80a951727833441b7af1972863c025dfde3219044d8bca92abce4ec5276aaf6e files/digest-sdl-sound-1.0.1-r2 250 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFfy66kT4lNIS36YERAgxsAJ42Vj2hKvVzHedV7/NS1cYTmWxH2ACgjdAx +pKq1mTqD+5lGpjdmYFuNw+Y= +=/txh +-----END PGP SIGNATURE----- diff --git a/media-libs/sdl-sound/files/flac-1.1.3.patch b/media-libs/sdl-sound/files/flac-1.1.3.patch new file mode 100644 index 000000000000..d0ed49194d31 --- /dev/null +++ b/media-libs/sdl-sound/files/flac-1.1.3.patch @@ -0,0 +1,126 @@ +diff -u -r SDL_sound-1.0.1/configure.in SDL_sound-1.0.1-flac/configure.in +--- SDL_sound-1.0.1/configure.in 2003-10-12 20:49:54.000000000 +0200 ++++ SDL_sound-1.0.1-flac/configure.in 2006-12-11 20:43:46.546583251 +0100 +@@ -155,9 +155,12 @@ + dnl FLAC developers tend to break their API with every release, so we're + dnl checking for the latest-and-greatest here so we don't have to support + dnl obsolete versions. ++dnl Starting with FLAC 1.1.3: ++dnl libFLAC supports Ogg FLAC (no more libOggFLAC) so we also need -logg ++dnl the libFLAC .so version is also #defined in FLAC/export.h + + dnl Hooray for shitty autoconf bugs! +-x="C__seekable_stream_decoder_process_single" ++x="C__stream_decoder_process_single" + flcsym="FLA$x" + dnl Check for libFLAC + AC_ARG_ENABLE(flac, +@@ -167,7 +170,7 @@ + AC_CHECK_HEADER(FLAC/stream_decoder.h, have_flac_hdr=yes) + AC_CHECK_LIB(FLAC, $flcsym, have_flac_lib=yes) + if test x$have_flac_hdr = xyes -a x$have_flac_lib = xyes; then +- LIBS="$LIBS -lFLAC" ++ LIBS="$LIBS -lFLAC -logg" + AC_DEFINE(SOUND_SUPPORTS_FLAC) + fi + fi +diff -u -r SDL_sound-1.0.1/decoders/flac.c SDL_sound-1.0.1-flac/decoders/flac.c +--- SDL_sound-1.0.1/decoders/flac.c 2003-03-10 23:44:14.000000000 +0100 ++++ SDL_sound-1.0.1-flac/decoders/flac.c 2006-12-11 20:43:57.880097062 +0100 +@@ -44,6 +44,16 @@ + #define __SDL_SOUND_INTERNAL__ + #include "SDL_sound_internal.h" + ++#include ++ ++/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */ ++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 ++#define LEGACY_FLAC ++#else ++#undef LEGACY_FLAC ++#endif ++ ++#ifdef LEGACY_FLAC + #include + + #define D_END_OF_STREAM FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM +@@ -80,6 +90,34 @@ + typedef FLAC__SeekableStreamDecoderSeekStatus d_seek_status_t; + typedef FLAC__SeekableStreamDecoderTellStatus d_tell_status_t; + typedef FLAC__SeekableStreamDecoderLengthStatus d_length_status_t; ++#else ++#include ++ ++#define D_END_OF_STREAM FLAC__STREAM_DECODER_END_OF_STREAM ++ ++#define d_new() FLAC__stream_decoder_new() ++#define d_process_metadata(x) FLAC__stream_decoder_process_until_end_of_metadata(x) ++#define d_process_one_frame(x) FLAC__stream_decoder_process_single(x) ++#define d_get_state(x) FLAC__stream_decoder_get_state(x) ++#define d_finish(x) FLAC__stream_decoder_finish(x) ++#define d_delete(x) FLAC__stream_decoder_delete(x) ++ ++typedef FLAC__StreamDecoder decoder_t; ++typedef FLAC__StreamDecoderReadStatus d_read_status_t; ++ ++#define D_SEEK_STATUS_OK FLAC__STREAM_DECODER_SEEK_STATUS_OK ++#define D_SEEK_STATUS_ERROR FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ++#define D_TELL_STATUS_OK FLAC__STREAM_DECODER_TELL_STATUS_OK ++#define D_TELL_STATUS_ERROR FLAC__STREAM_DECODER_TELL_STATUS_ERROR ++#define D_LENGTH_STATUS_OK FLAC__STREAM_DECODER_LENGTH_STATUS_OK ++#define D_LENGTH_STATUS_ERROR FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ++ ++#define d_seek_absolute(x, y) FLAC__stream_decoder_seek_absolute(x, y) ++ ++typedef FLAC__StreamDecoderSeekStatus d_seek_status_t; ++typedef FLAC__StreamDecoderTellStatus d_tell_status_t; ++typedef FLAC__StreamDecoderLengthStatus d_length_status_t; ++#endif + + #define D_WRITE_CONTINUE FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE + #define D_READ_END_OF_STREAM FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM +@@ -141,9 +179,15 @@ + } /* free_flac */ + + ++#ifdef LEGACY_FLAC + static d_read_status_t read_callback( + const decoder_t *decoder, FLAC__byte buffer[], + unsigned int *bytes, void *client_data) ++#else ++static d_read_status_t read_callback( ++ const decoder_t *decoder, FLAC__byte buffer[], ++ size_t *bytes, void *client_data) ++#endif + { + flac_t *f = (flac_t *) client_data; + Uint32 retval; +@@ -400,6 +444,7 @@ + BAIL_MACRO(ERR_OUT_OF_MEMORY, 0); + } /* if */ + ++#ifdef LEGACY_FLAC + d_set_read_callback(decoder, read_callback); + d_set_write_callback(decoder, write_callback); + d_set_metadata_callback(decoder, metadata_callback); +@@ -410,6 +455,7 @@ + d_set_eof_callback(decoder, eof_callback); + + d_set_client_data(decoder, f); ++#endif + + f->rw = internal->rw; + f->sample = sample; +@@ -418,7 +464,12 @@ + f->is_flac = 0 /* !!! FIXME: should be "has_extension", not "0". */; + + internal->decoder_private = f; ++ /* really should check the init return value here: */ ++#ifdef LEGACY_FLAC + d_init(decoder); ++#else ++ FLAC__stream_decoder_init_stream(decoder, read_callback, seek_callback, tell_callback, length_callback, eof_callback, write_callback, metadata_callback, error_callback, f); ++#endif + + sample->flags = SOUND_SAMPLEFLAG_NONE; + diff --git a/media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild index d7a8fe96d261..372e839ba037 100644 --- a/media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild +++ b/media-libs/sdl-sound/sdl-sound-1.0.1-r2.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/media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild,v 1.9 2006/11/08 20:58:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild,v 1.10 2006/12/12 22:35:31 wolf31o2 Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -32,6 +32,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/gcc331.patch + epatch "${FILESDIR}"/flac-1.1.3.patch eautoreconf } -- 2.26.2