diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2008-06-08 20:11:49 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2008-06-08 20:11:49 +0000 |
commit | 778b5bf41bdf1e860078ebf454e2e04ccf99cec7 (patch) | |
tree | a53b88c815b20d13c23ac0c9ac9e97dbb2301d4f /media-libs/sdl-sound | |
parent | Fixup src_unpack, hand edit patch to apply with CVS keyword replacements, rem... (diff) | |
download | historical-778b5bf41bdf1e860078ebf454e2e04ccf99cec7.tar.gz historical-778b5bf41bdf1e860078ebf454e2e04ccf99cec7.tar.bz2 historical-778b5bf41bdf1e860078ebf454e2e04ccf99cec7.zip |
old
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'media-libs/sdl-sound')
-rw-r--r-- | media-libs/sdl-sound/Manifest | 4 | ||||
-rw-r--r-- | media-libs/sdl-sound/files/flac-1.1.3.patch | 126 | ||||
-rw-r--r-- | media-libs/sdl-sound/files/gcc331.patch | 23 | ||||
-rw-r--r-- | media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild | 61 |
4 files changed, 0 insertions, 214 deletions
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest index ac47223008a2..fe37727ad8f8 100644 --- a/media-libs/sdl-sound/Manifest +++ b/media-libs/sdl-sound/Manifest @@ -1,8 +1,4 @@ -AUX flac-1.1.3.patch 4844 RMD160 d8c522132b0597ba56d8cc8bf38805b2c4c86366 SHA1 5658117dcdc69397f9b2bec8e4c0b20d7630c386 SHA256 5ffe81fe08453f4abaa2611f9646db6b8fad0dfeaaf8c98b94613d5c6295c691 -AUX gcc331.patch 1235 RMD160 cb0a55cefe5fe7440a77871b5a08ec739d375e91 SHA1 dbaa85d9f14a667a57e8150ed6bfad3afeb7903e SHA256 c904b03821d2d224def0f8a75e0ee7a78d897de69f6027ef9c17ac053bc82640 -DIST SDL_sound-1.0.1.tar.gz 1019056 RMD160 28d934d604e5db9b3b0b681785406587323ea765 SHA1 9cb8550facf64f941179ba5767f763d1d52ddd6b SHA256 8289b483d994283d599686643d402d073c8dd6c067a9c5b232a7e3e03eca4089 DIST SDL_sound-1.0.3.tar.gz 1127100 RMD160 8e56daa71f827a4a22e7071a4e4f37c21dd96105 SHA1 1984bc20b2c756dc71107a5a0a8cebfe07e58cb1 SHA256 3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df -EBUILD sdl-sound-1.0.1-r2.ebuild 1745 RMD160 aab568b65120fa7e2becb8e81b4767eb4c890f9b SHA1 7ad8239a8691baebe3137e451db465c7bf301a7a SHA256 6899e7cb6a7f9e40ed126cb806d60ef99893739e1fdbbcad6edfdebbbfcdd342 EBUILD sdl-sound-1.0.3.ebuild 1339 RMD160 1c44a649a788d84a52fb2e0f85a09db47955132c SHA1 cac8814ecde741a594b1f9765fe274abdb375e3a SHA256 8630b93e392a7143e534bba587b22c113786d6f9f17afbd6278d5a27f02c84aa MISC ChangeLog 5607 RMD160 da7dc0917cafda4489a5d6062876e13bb2dc1d9d SHA1 9c097ab802f2425927667e197666537109d2764f SHA256 d349377405e7fd6ab29e235f08930d33d712705b8d2d29d9d46b74fe852490e8 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/media-libs/sdl-sound/files/flac-1.1.3.patch b/media-libs/sdl-sound/files/flac-1.1.3.patch deleted file mode 100644 index d0ed49194d31..000000000000 --- a/media-libs/sdl-sound/files/flac-1.1.3.patch +++ /dev/null @@ -1,126 +0,0 @@ -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/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 -+#else -+#undef LEGACY_FLAC -+#endif -+ -+#ifdef LEGACY_FLAC - #include <FLAC/seekable_stream_decoder.h> - - #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 <FLAC/stream_decoder.h> -+ -+#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/files/gcc331.patch b/media-libs/sdl-sound/files/gcc331.patch deleted file mode 100644 index a4021d1359c6..000000000000 --- a/media-libs/sdl-sound/files/gcc331.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- acinclude.m4.orig 2003-01-12 14:03:14.000000000 -0800 -+++ acinclude.m4 2003-10-14 18:33:09.000000000 -0700 -@@ -587,16 +587,11 @@ - } - else - { -- printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the --minimum version\n", $smpeg_major_version, $smpeg_minor_version, --$smpeg_micro_version); -- printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is --correct, then it is\n", major, minor, micro); -+ printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version); -+ printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); -- printf("*** If smpeg-config was wrong, set the environment variable --SMPEG_CONFIG\n"); -- printf("*** to point to the correct copy of smpeg-config, and remove --the file\n"); -+ printf("*** If smpeg-config was wrong, set the environment variable SMPEG_CONFIG\n"); -+ printf("*** to point to the correct copy of smpeg-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } 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 deleted file mode 100644 index 0811dbf9bc34..000000000000 --- a/media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2007 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.18 2007/11/01 19:06:05 armin76 Exp $ - -inherit flag-o-matic autotools eutils - -MY_P="${P/sdl-/SDL_}" -DESCRIPTION="A library that handles the decoding of sound file formats" -HOMEPAGE="http://icculus.org/SDL_sound/" -SRC_URI="http://icculus.org/SDL_sound/downloads/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="flac mikmod vorbis speex physfs mp3 mpeg" - -RDEPEND=">=media-libs/libsdl-1.2 - flac? ( media-libs/flac ) - mikmod? ( >=media-libs/libmikmod-3.1.9 media-libs/libmodplug ) - vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) - speex? ( media-libs/speex media-libs/libogg ) - physfs? ( dev-games/physfs ) - mpeg? ( media-libs/smpeg )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - # Scrub local libtool.m4 crap and then some #167736 - sed -i -e '/libtool.m4/,/^FOO_MARKER$/d' acinclude.m4 - epatch "${FILESDIR}"/gcc331.patch - epatch "${FILESDIR}"/flac-1.1.3.patch - eautoreconf -} - -src_compile() { - use mikmod \ - && append-flags $(pkg-config libmodplug --cflags) \ - && sed -i 's:modplug\.h:libmodplug/modplug.h:' configure - econf \ - --disable-dependency-tracking \ - --enable-midi \ - $(use_enable mpeg smpeg) \ - $(use_enable mp3 mpglib) \ - $(use_enable flac) \ - $(use_enable speex) \ - $(use_enable mikmod) \ - $(use_enable mikmod modplug) \ - $(use_enable physfs) \ - $(use_enable vorbis ogg) \ - || die - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc CHANGELOG CREDITS README TODO -} |