From b982051e7c8e12c3810a0d21d30d687b406b3ae5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Dec 2022 09:35:57 +0000 Subject: gentoo auto-resync : 16:12:2022 - 09:35:57 --- media-libs/sdl-mixer/Manifest | 10 -- ...-Fix-compiling-against-libmodplug-0.8.8.5.patch | 24 ---- .../sdl-mixer/files/sdl-mixer-1.2.12-clang.patch | 11 -- ...dl-mixer-1.2.12-incompatible-func-clang16.patch | 94 --------------- .../files/sdl-mixer-1.2.12-mikmod-r587.patch | 55 --------- .../files/sdl-mixer-1.2.12-mikmod-r588.patch | 36 ------ .../sdl-mixer-1.2.12-parallel-build-slibtool.patch | 92 --------------- .../sdl-mixer/files/sdl-mixer-1.2.12-wav.patch | 35 ------ media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild | 127 -------------------- media-libs/sdl-mixer/sdl-mixer-1.2.12-r7.ebuild | 128 --------------------- 10 files changed, 612 deletions(-) delete mode 100644 media-libs/sdl-mixer/files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch delete mode 100644 media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch delete mode 100644 media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch delete mode 100644 media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch delete mode 100644 media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch delete mode 100644 media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch delete mode 100644 media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch delete mode 100644 media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild delete mode 100644 media-libs/sdl-mixer/sdl-mixer-1.2.12-r7.ebuild (limited to 'media-libs/sdl-mixer') diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest index 4952c29081a3..03798947f0ca 100644 --- a/media-libs/sdl-mixer/Manifest +++ b/media-libs/sdl-mixer/Manifest @@ -1,13 +1,3 @@ -AUX sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch 553 BLAKE2B 9967bfa5cabffe68691fbb1002d01dafb14626596bc3fe0e15dcfd159dca4e542eb3998b08376b24870150beae7927fa3be7822cb9b68ad443544345a042cd6c SHA512 c411f372a817696838ef590db21579da96ca4f7f3170fdd6497ab204c3058138023d89ef379c810b8675091ae9e8c15bc3681085ca56a026cc1d3d22fdbef687 -AUX sdl-mixer-1.2.12-clang.patch 276 BLAKE2B 242e261861bab476d7f83148fc265daee990965cad8c3247dcf7e9e28e6b3aa9b2f491ac51c3517e3db4ab043ac8f8a118ca18c170f826f200df757de303e8db SHA512 2f318a73991783c75b32d05c9f81a42a7fd145a9d78e1cef00d1f2184f7c498e4c0a5a578bd2866315a940af76d4296de660ee94488530815694b7524d1d452e -AUX sdl-mixer-1.2.12-incompatible-func-clang16.patch 3163 BLAKE2B 8bc065998cdf9d3b10c1fcf07c3eb95fb027dbdcf7a1444586a4d08ff407f9fd1b0dd459b3c028df4584690b7adbe6cd88efbfecf4b4eb2344bba2eb84834f4d SHA512 a14a616c2bcd1864afbe43c952ca013fdad0cc56421cc6893bcc89fa3d231ac98778dc1afe956cd2109a0f433fed54bf1a7d001f74bb86e621825de82bf64c14 -AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff4397cd3fd284f2f39102879f5cf4956603075ba79cf0753822a8cbdcf4d1196ac9839f59211e0128bf97c0a1f36f00e70cc7682 SHA512 64ad577331eceea0eb060d0c2b333b664d4edb62cb3336f97b53e5c88f6b4ecdc4004136fef0461cdf999b282064b5809e79308591239bfafbdc3df8360bf123 -AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704 -AUX sdl-mixer-1.2.12-parallel-build-slibtool.patch 4288 BLAKE2B 3beaeddf4e3ff97dc2778dfc79f800b3749a0b0fa511872f353587a3e01ded1cdc9c57c3a89cb3e1a6a34d6848b19aaacba5a2a81c3129906f521c2afc71e2c0 SHA512 b6e42b2ee43b57a3a4f3e8b47b96aa5d94b37f0326cbecca7128eb8b34f0ac00dded506a4d5164156ca23cf1aeaca6aa92f40ec43991fa73a97274a2262fe679 -AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491 -DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96 DIST sdl-mixer-1.2.12_p20221010.tar.gz 5861748 BLAKE2B 95b8e59bf796aa1a1593d8895aa153d62653fc9085e65c380cef3a0394201dd6c5c0deb323d6acecd4bca0e46d11f0ec94ebab8be872654e46d2d56231a1fd12 SHA512 5b15bf81b868968a09f82b160e371355e40a29c95a3e79c3cffa49ab5cc7c3212034d12301c21c8a44aef5c981a7a8fec3cb76e9dfe55619159a613b8dec6557 -EBUILD sdl-mixer-1.2.12-r5.ebuild 3601 BLAKE2B f51bbe3d0cc2c60b47ddf3626a07b45bbfcc5334adf4f1fef0d6fd681b9fac44d47e3e879397329355539288c6d983cc31a600f9e9c4403143688c221e1df881 SHA512 dd3969be4a66304acbf4366dfd387a00ae4558ad7d595f62c7e7790d6206be5fede4ae807abec8a5baaa9484c98b158e5431f4c663306bf6f120cd4b25aefcce -EBUILD sdl-mixer-1.2.12-r7.ebuild 3660 BLAKE2B 8b140bae4093ad4cfb2d8f69890ec72735e20037033a17fbacb889e749e61d609bb3b252cfa58edb77dbf6d0f3413e6389d70ce5a1b50096606c7cba67274c30 SHA512 570cfd9dce65dfe49f1303d89a0eeb1e6ffb6c0582fd144b1900f274068bae76a9c7e52c04e2c5e80913f862df7deebde79f46696e966641389782c722b7bc3f EBUILD sdl-mixer-1.2.12_p20221010.ebuild 3121 BLAKE2B feb56a82e51f56fdb53cc4849f1a4813a1ae943697c62f7322e6d9cbebbc9d4effc68a93300ae8eab418b5a12dec038e3d284ca32fcb97dbfa4c183250aaea5e SHA512 8ea957de4bdd85ba2a8f9ca03177ace3d4e657b668f12ea7cd4ce6ffa45ee7741bbb41efcc49249aa5d704bdbd679e5353d86981ac4c17564b02b57276e326e8 MISC metadata.xml 787 BLAKE2B 4a9a04b0b88ec853de52f1cc7f6ad63e6bd4e5a421906daa2e0935c32d756538ef9aee8631e5be96665dd37ec6c4e47d256e30b01f7cc6ca56f29baaaa5ef27d SHA512 46520c6a56e9d6ff2137e71bf728349ed167f7ec10417345528e6da051e482b3a27158e46ae973d1bd0f348cac9e3f65e8a02eef984b8e00fbb2aced256ad2bd diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch deleted file mode 100644 index 369fe49558f0..000000000000 --- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: hasufell -Date: Fri, 8 Aug 2014 13:49:49 +0200 -Subject: [PATCH] Fix compiling against libmodplug-0.8.8.5 - -pkg-config --cflags libmodplug no longer -reports a subdir and thus we need to use -#include "libmodplug/modplug.h" syntax. ---- - music_modplug.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/music_modplug.h -+++ b/music_modplug.h -@@ -1,6 +1,6 @@ - #ifdef MODPLUG_MUSIC - --#include "modplug.h" -+#include "libmodplug/modplug.h" - #include "SDL_rwops.h" - #include "SDL_audio.h" - #include "SDL_mixer.h" --- -2.0.4 - diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch deleted file mode 100644 index 3c462bd97088..000000000000 --- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SDL_mixer-1.2.12.orig/music_mad.c -+++ SDL_mixer-1.2.12/music_mad.c -@@ -224,7 +224,7 @@ - if ((mp3_mad->status & MS_playing) == 0) { - /* We're not supposed to be playing, so send silence instead. */ - memset(stream, 0, len); -- return; -+ return 0; - } - - out = stream; diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch deleted file mode 100644 index 747611880255..000000000000 --- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch +++ /dev/null @@ -1,94 +0,0 @@ -https://github.com/libsdl-org/SDL_mixer/commit/03bd4ca6aa38c1a382c892cef86296cd621ecc1d -https://github.com/libsdl-org/SDL_mixer/commit/9e6d7b67a00656a68ea0c2eace75c587871549b9 -https://github.com/libsdl-org/SDL_mixer/commit/d28cbc34d63dd20b256103c3fe506ecf3d34d379 -https://github.com/libsdl-org/SDL_mixer/commit/05b12a3c22c0746c29dc5478f5b7fbd8a51a1303 - -From 03bd4ca6aa38c1a382c892cef86296cd621ecc1d Mon Sep 17 00:00:00 2001 -From: Ozkan Sezer -Date: Sun, 7 Oct 2018 10:15:50 +0300 -Subject: [PATCH] backported a warning fix. (from 2.0 branch commit - 6fa075aa693e). - ---- - dynamic_ogg.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dynamic_ogg.h b/dynamic_ogg.h -index 822458d4..8eb91656 100644 ---- a/dynamic_ogg.h -+++ b/dynamic_ogg.h -@@ -31,7 +31,7 @@ typedef struct { - void *handle; - int (*ov_clear)(OggVorbis_File *vf); - vorbis_info *(*ov_info)(OggVorbis_File *vf,int link); -- int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, char *initial, long ibytes, ov_callbacks callbacks); -+ int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks); - ogg_int64_t (*ov_pcm_total)(OggVorbis_File *vf,int i); - #ifdef OGG_USE_TREMOR - long (*ov_read)(OggVorbis_File *vf,char *buffer,int length, int *bitstream); - -From 9e6d7b67a00656a68ea0c2eace75c587871549b9 Mon Sep 17 00:00:00 2001 -From: Ozkan Sezer -Date: Sun, 7 Oct 2018 12:41:20 +0300 -Subject: [PATCH] fixed a warning after commit cb08fb0976e6 - ---- a/dynamic_ogg.c -+++ b/dynamic_ogg.c -@@ -52,7 +52,7 @@ int Mix_InitOgg() - return -1; - } - vorbis.ov_open_callbacks = -- (int (*)(void *, OggVorbis_File *, char *, long, ov_callbacks)) -+ (int (*)(void *, OggVorbis_File *, const char *, long, ov_callbacks)) - SDL_LoadFunction(vorbis.handle, "ov_open_callbacks"); - if ( vorbis.ov_open_callbacks == NULL ) { - SDL_UnloadObject(vorbis.handle); - -From d28cbc34d63dd20b256103c3fe506ecf3d34d379 Mon Sep 17 00:00:00 2001 -From: Ozkan Sezer -Date: Mon, 25 Nov 2019 03:28:02 +0300 -Subject: [PATCH] dynamic_ogg.c: fixed ov_time_seek() signature for - libvorbisidec. - -reported by Vitaly Novichkov. ---- a/dynamic_ogg.c -+++ b/dynamic_ogg.c -@@ -78,7 +78,7 @@ int Mix_InitOgg() - } - vorbis.ov_time_seek = - #ifdef OGG_USE_TREMOR -- (long (*)(OggVorbis_File *,ogg_int64_t)) -+ (int (*)(OggVorbis_File *,ogg_int64_t)) - #else - (int (*)(OggVorbis_File *,double)) - #endif - - -From 05b12a3c22c0746c29dc5478f5b7fbd8a51a1303 Mon Sep 17 00:00:00 2001 -From: Ozkan Sezer -Date: Wed, 23 Sep 2020 05:32:00 +0300 -Subject: [PATCH] mixer.c: add missing dynamic_fluidsynth.h include -- fixes - bug #5296. - ---- - mixer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mixer.c b/mixer.c -index c653d6ed..431f6e69 100644 ---- a/mixer.c -+++ b/mixer.c -@@ -34,6 +34,7 @@ - #include "load_voc.h" - #include "load_ogg.h" - #include "load_flac.h" -+#include "dynamic_fluidsynth.h" - #include "dynamic_flac.h" - #include "dynamic_mod.h" - #include "dynamic_mp3.h" -@@ -1499,4 +1500,3 @@ int Mix_UnregisterAllEffects(int channel) - } - - /* end of mixer.c ... */ -- - diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch deleted file mode 100644 index d99609f8ab25..000000000000 --- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch +++ /dev/null @@ -1,55 +0,0 @@ -http://hg.libsdl.org/SDL_mixer/rev/56cad6484b04 -https://bugs.gentoo.org/445980 - -# HG changeset patch -# User Sam Lantinga -# Date 1342998807 25200 -# Node ID 56cad6484b04f83c8d42428c755a046678506436 -# Parent c92001a2c18f628698c58aa4e05a7335d10d0e9e -Paul P Komkoff Jr fixed malloc/free mismatch in the MikMod driver - ---- a/dynamic_mod.c -+++ b/dynamic_mod.c -@@ -93,6 +93,13 @@ - SDL_UnloadObject(mikmod.handle); - return -1; - } -+ mikmod.MikMod_free = -+ (void (*)(void*)) -+ SDL_LoadFunction(mikmod.handle, "MikMod_free"); -+ if ( mikmod.MikMod_free == NULL ) { -+ SDL_UnloadObject(mikmod.handle); -+ return -1; -+ } - mikmod.Player_Active = - (BOOL (*)(void)) - SDL_LoadFunction(mikmod.handle, "Player_Active"); ---- a/dynamic_mod.h -+++ b/dynamic_mod.h -@@ -35,6 +35,7 @@ - void (*MikMod_RegisterDriver)(struct MDRIVER*); - int* MikMod_errno; - char* (*MikMod_strerror)(int); -+ void (*MikMod_free)(void*); - BOOL (*Player_Active)(void); - void (*Player_Free)(MODULE*); - MODULE* (*Player_LoadGeneric)(MREADER*,int,BOOL); ---- a/music_mod.c -+++ b/music_mod.c -@@ -109,13 +109,13 @@ - - list = mikmod.MikMod_InfoDriver(); - if ( list ) -- free(list); -+ mikmod.MikMod_free(list); - else - mikmod.MikMod_RegisterDriver(mikmod.drv_nos); - - list = mikmod.MikMod_InfoLoader(); - if ( list ) -- free(list); -+ mikmod.MikMod_free(list); - else - mikmod.MikMod_RegisterAllLoaders(); - - diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch deleted file mode 100644 index d47a8d4534c8..000000000000 --- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch +++ /dev/null @@ -1,36 +0,0 @@ -http://hg.libsdl.org/SDL_mixer/rev/2ebb0d016f27 -https://bugs.gentoo.org/445980 - -# HG changeset patch -# User Sam Lantinga -# Date 1343000017 25200 -# Node ID 2ebb0d016f277f7f643d8a66ed0e1099e10d1fba -# Parent 56cad6484b04f83c8d42428c755a046678506436 -Fixed normal linking with libmikmod and linking with earlier versions of libmikmod. - ---- a/dynamic_mod.c -+++ b/dynamic_mod.c -@@ -97,8 +97,8 @@ - (void (*)(void*)) - SDL_LoadFunction(mikmod.handle, "MikMod_free"); - if ( mikmod.MikMod_free == NULL ) { -- SDL_UnloadObject(mikmod.handle); -- return -1; -+ /* libmikmod 3.1 and earlier doesn't have it */ -+ mikmod.MikMod_free = free; - } - mikmod.Player_Active = - (BOOL (*)(void)) -@@ -246,6 +246,11 @@ - mikmod.MikMod_RegisterDriver = MikMod_RegisterDriver; - mikmod.MikMod_errno = &MikMod_errno; - mikmod.MikMod_strerror = MikMod_strerror; -+#if LIBMIKMOD_VERSION < ((3<<16)|(2<<8)) -+ mikmod.MikMod_free = free; -+#else -+ mikmod.MikMod_free = MikMod_free; -+#endif - mikmod.Player_Active = Player_Active; - mikmod.Player_Free = Player_Free; - mikmod.Player_LoadGeneric = Player_LoadGeneric; - diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch deleted file mode 100644 index a9996f9b10e7..000000000000 --- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch +++ /dev/null @@ -1,92 +0,0 @@ -https://github.com/libsdl-org/SDL_mixer/pull/311 - -This is the SDL 1 variant of the SDL 2 patch also in Gentoo. -See: 36d63464d341868f0ba533188238c805710f16e0 (Gentoo) -Bug: https://bugs.gentoo.org/777420 - -From 0b3b8a5f886648c95ce5ed0abb3d4e9e181d7ca6 Mon Sep 17 00:00:00 2001 -From: orbea -Date: Tue, 6 Apr 2021 07:32:27 -0700 -Subject: [PATCH] build: Fix parallel make with slibtool. - ---- -diff --git a/Makefile.in b/Makefile.in -index 293608d..5d27df1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -47,7 +47,7 @@ LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ - LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - --all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE) -+all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE) - - $(srcdir)/configure: $(srcdir)/configure.ac - @echo "Warning, configure is out of date, please re-run autogen.sh" -@@ -55,8 +55,9 @@ $(srcdir)/configure: $(srcdir)/configure.ac - Makefile: $(srcdir)/Makefile.in - $(SHELL) config.status $@ - --$(objects): -- $(SHELL) $(auxdir)/mkinstalldirs $@ -+$(objects)/.created: -+ $(SHELL) $(auxdir)/mkinstalldirs $(objects) -+ touch $@ - - .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist - -@@ -78,7 +79,7 @@ install-hdrs: - done - $(SHELL) $(auxdir)/mkinstalldirs $(libdir)/pkgconfig - $(INSTALL) -m 644 SDL_mixer.pc $(libdir)/pkgconfig/ --install-lib: $(objects) $(objects)/$(TARGET) -+install-lib: $(objects)/$(TARGET) - $(SHELL) $(auxdir)/mkinstalldirs $(libdir) - $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET) - install-bin: ---- a/configure.in -+++ b/configure.in -@@ -626,14 +626,14 @@ OBJECTS=`echo $SOURCES` - DEPENDS=`echo $SOURCES` - OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - DEPENDS=`echo "$DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\ --$(objects)/\2.lo: \1/\2.c\\ -+$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\ - \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'` - - OBJECTS_CXX=`echo $SOURCES_CXX` - DEPENDS_CXX=`echo $SOURCES_CXX` - OBJECTS_CXX=`echo "$OBJECTS_CXX" | sed 's,[[^ ]]*/\([[^ ]]*\)\.cpp,$(objects)/\1.lo,g'` - DEPENDS_CXX=`echo "$DEPENDS_CXX" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.cpp,\\ --$(objects)/\2.lo: \1/\2.cpp\\ -+$(objects)/\2.lo: \1/\2.cpp \$(objects)/.created\\ - \$(LIBTOOL) --mode=compile \$(CXX) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'` - OBJECTS="$OBJECTS $OBJECTS_CXX" - DEPENDS="$DEPENDS $DEPENDS_CXX" -@@ -643,7 +643,7 @@ VERSION_OBJECTS=`echo $VERSION_SOURCES` - VERSION_DEPENDS=`echo $VERSION_SOURCES` - VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` - VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.rc,\\ --$(objects)/\2.o: \1/\2.rc\\ -+$(objects)/\2.o: \1/\2.rc \$(objects)/.created\\ - \$(WINDRES) \$< \$@,g'` - VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\\$,\\\\$,g'` - -@@ -652,7 +652,7 @@ PLAYWAVE_OBJECTS=`echo $PLAYWAVE_SOURCES` - PLAYWAVE_DEPENDS=`echo $PLAYWAVE_SOURCES` - PLAYWAVE_OBJECTS=`echo "$PLAYWAVE_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\ --$(objects)/\2.lo: \1/\2.c\\ -+$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\ - \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'` - PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\\$,\\\\$,g'` - -@@ -661,7 +661,7 @@ PLAYMUS_OBJECTS=`echo $PLAYMUS_SOURCES` - PLAYMUS_DEPENDS=`echo $PLAYMUS_SOURCES` - PLAYMUS_OBJECTS=`echo "$PLAYMUS_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\ --$(objects)/\2.lo: \1/\2.c\\ -+$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\ - \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'` - PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\\$,\\\\$,g'` - diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch deleted file mode 100644 index 38914fd77f15..000000000000 --- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=406739 -Nikos Chantziaras 2012-03-03 03:13:39 EST - -There's a bug in the current version of SDL_mixer where failing to load a WAV sample will result in freeing a resource twice, resulting in an application crash. There is an upstream fix for this: - -http://hg.libsdl.org/SDL_mixer/rev/ea53a85853dd - -Upstream bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1418 - ---- a/mixer.c -+++ b/mixer.c -@@ -610,13 +610,15 @@ - break; - default: - SDL_SetError("Unrecognized sound file type"); -- return(0); -+ if ( freesrc ) { -+ SDL_RWclose(src); -+ } -+ loaded = NULL; -+ break; - } - if ( !loaded ) { -+ /* The individual loaders have closed src if needed */ - SDL_free(chunk); -- if ( freesrc ) { -- SDL_RWclose(src); -- } - return(NULL); - } - - - - - diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild deleted file mode 100644 index 45fe1cea8182..000000000000 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# We may want to grab backports from the SDL-1.2 branch upstream or -# even take snapshots from it in future, as no SDL 1 / 1.2.x releases -# will be made anymore. - -MY_P=${P/sdl-/SDL_} -inherit autotools multilib-minimal - -DESCRIPTION="Simple Direct Media Layer Mixer Library" -HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/" -SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav" - -REQUIRED_USE=" - midi? ( || ( timidity fluidsynth ) ) - timidity? ( midi ) - fluidsynth? ( midi ) - mp3? ( || ( smpeg mad ) ) - smpeg? ( mp3 ) - mad? ( mp3 ) - mod? ( || ( mikmod modplug ) ) - mikmod? ( mod ) - modplug? ( mod ) -" - -RDEPEND=" - >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] - flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] ) - midi? ( - fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] ) - timidity? ( media-sound/timidity++ ) - ) - mod? ( - mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] ) - modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) - ) - mp3? ( - mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] ) - smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] ) - ) - vorbis? ( - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-wav.patch - "${FILESDIR}"/${P}-clang.patch - "${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch - "${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980 - "${FILESDIR}"/${P}-parallel-build-slibtool.patch -) - -src_prepare() { - default - sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die - - # Hack to get eautoconf working - # eautoreconf dies with gettext mismatch errors for now - cat acinclude/* >aclocal.m4 || die - eautoconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-music-flac-shared - --disable-music-fluidsynth-shared - --disable-music-mod-shared - --disable-music-mp3-shared - --disable-music-ogg-shared - $(use_enable wav music-wave) - $(use_enable vorbis music-ogg) - $(use_enable mikmod music-mod) - $(use_enable modplug music-mod-modplug) - $(use_enable flac music-flac) - $(use_enable static-libs static) - $(use_enable smpeg music-mp3) - $(use_enable mad music-mp3-mad-gpl) - $(use_enable timidity music-timidity-midi) - $(use_enable fluidsynth music-fluidsynth-midi) - LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config - ) - ECONF_SOURCE=${S} \ - econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - if multilib_is_native_abi && use playtools; then - emake DESTDIR="${D}" install-bin - fi -} - -multilib_src_install_all() { - dodoc CHANGES README - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - # bug 412035 - # https://bugs.gentoo.org/show_bug.cgi?id=412035 - if use midi ; then - if use fluidsynth; then - ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS" - ewarn "environment variable to the location of a SoundFont file" - ewarn "unless the game or application happens to do this for you." - - if use timidity; then - ewarn "Failing to do so will result in Timidity being used instead." - else - ewarn "Failing to do so will result in silence." - fi - fi - fi -} diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r7.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r7.ebuild deleted file mode 100644 index 04a69cf22ab4..000000000000 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r7.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# We may want to grab backports from the SDL-1.2 branch upstream or -# even take snapshots from it in future, as no SDL 1 / 1.2.x releases -# will be made anymore. - -MY_P=${P/sdl-/SDL_} -inherit autotools multilib-minimal - -DESCRIPTION="Simple Direct Media Layer Mixer Library" -HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/" -SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav" - -REQUIRED_USE=" - midi? ( || ( timidity fluidsynth ) ) - timidity? ( midi ) - fluidsynth? ( midi ) - mp3? ( || ( smpeg mad ) ) - smpeg? ( mp3 ) - mad? ( mp3 ) - mod? ( || ( mikmod modplug ) ) - mikmod? ( mod ) - modplug? ( mod ) -" - -RDEPEND=" - >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] - flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] ) - midi? ( - fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] ) - timidity? ( media-sound/timidity++ ) - ) - mod? ( - mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] ) - modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) - ) - mp3? ( - mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] ) - smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] ) - ) - vorbis? ( - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-wav.patch - "${FILESDIR}"/${P}-clang.patch - "${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch - "${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980 - "${FILESDIR}"/${P}-parallel-build-slibtool.patch - "${FILESDIR}"/${P}-incompatible-func-clang16.patch -) - -src_prepare() { - default - sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die - - # Hack to get eautoconf working - # eautoreconf dies with gettext mismatch errors for now - cat acinclude/* >aclocal.m4 || die - eautoconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-music-flac-shared - --disable-music-fluidsynth-shared - --disable-music-mod-shared - --disable-music-mp3-shared - --disable-music-ogg-shared - $(use_enable wav music-wave) - $(use_enable vorbis music-ogg) - $(use_enable mikmod music-mod) - $(use_enable modplug music-mod-modplug) - $(use_enable flac music-flac) - $(use_enable static-libs static) - $(use_enable smpeg music-mp3) - $(use_enable mad music-mp3-mad-gpl) - $(use_enable timidity music-timidity-midi) - $(use_enable fluidsynth music-fluidsynth-midi) - LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config - ) - ECONF_SOURCE=${S} \ - econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - if multilib_is_native_abi && use playtools; then - emake DESTDIR="${D}" install-bin - fi -} - -multilib_src_install_all() { - dodoc CHANGES README - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - # bug 412035 - # https://bugs.gentoo.org/show_bug.cgi?id=412035 - if use midi ; then - if use fluidsynth; then - ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS" - ewarn "environment variable to the location of a SoundFont file" - ewarn "unless the game or application happens to do this for you." - - if use timidity; then - ewarn "Failing to do so will result in Timidity being used instead." - else - ewarn "Failing to do so will result in silence." - fi - fi - fi -} -- cgit v1.2.3