[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/, media-libs/sdl-mixer/files/
commit: 6fcf95a555e9350936385713443c8abb778033d5
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 04:44:34 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 04:44:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fcf95a5
media-libs/sdl-mixer: drop 1.2.12-r5, 1.2.12-r7
Signed-off-by: Sam James gentoo.org>
media-libs/sdl-mixer/Manifest | 1 -
...-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, 603 deletions(-)
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 236a8f32c48a..46d191f4d738 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,2 +1 @@
-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
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..
---
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..
--- 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..
---
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
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/, media-libs/sdl-mixer/files/
commit: 3ece26abf8b9b5a09d17bf166e441cb9746ee4d8 Author: Sam James gentoo org> AuthorDate: Thu Nov 10 10:04:58 2022 + Commit: Sam James gentoo org> CommitDate: Thu Nov 10 10:05:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ece26ab media-libs/sdl-mixer: backport additional header patch We're going to do a snapshot but it feels right to fix this bit first as it got introduced by one of the previous patches (only shows up with some USE flag combos). Bug: https://bugs.gentoo.org/880619 Signed-off-by: Sam James gentoo.org> ...dl-mixer-1.2.12-incompatible-func-clang16.patch | 30 ++ ...1.2.12-r6.ebuild => sdl-mixer-1.2.12-r7.ebuild} | 0 2 files changed, 30 insertions(+) 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 index 0f104d5d6ffe..747611880255 100644 --- 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 @@ -1,6 +1,7 @@ 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 @@ -62,3 +63,32 @@ reported by Vitaly Novichkov. (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/sdl-mixer-1.2.12-r6.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r7.ebuild similarity index 100% rename from media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild rename to media-libs/sdl-mixer/sdl-mixer-1.2.12-r7.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/, media-libs/sdl-mixer/files/
commit: 0646663bfcadb4ffe7550e2bb41097f42818ed49 Author: Sam James gentoo org> AuthorDate: Wed Apr 7 05:50:42 2021 + Commit: Sam James gentoo org> CommitDate: Wed Apr 7 06:10:46 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0646663b media-libs/sdl-mixer: fix slibtool (parallel) build Thanks-to: orbea riseup.net> See: 36d63464d341868f0ba533188238c805710f16e0 Bug: https://bugs.gentoo.org/777420 Signed-off-by: Sam James gentoo.org> .../sdl-mixer-1.2.12-parallel-build-slibtool.patch | 92 ++ media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild| 8 +- 2 files changed, 99 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..a9996f9b10e --- /dev/null +++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch @@ -0,0 +1,92 @@ +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
