[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/, media-libs/sdl2-mixer/files/
commit: a1398a9405db4b188db6a57c96c356fa4ecd9406
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Sep 23 18:06:01 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Sep 23 18:06:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1398a94
media-libs/sdl2-mixer: Drop old
Signed-off-by: James Le Cuirot gentoo.org>
media-libs/sdl2-mixer/Manifest | 1 -
.../files/sdl2-mixer-2.0.4-fluidsynth.patch| 30 -
.../files/sdl2-mixer-2.0.4-slibtool.patch | 81 -
media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r2.ebuild | 124
media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r3.ebuild | 125 -
media-libs/sdl2-mixer/sdl2-mixer-2.6.3.ebuild | 105 -
6 files changed, 466 deletions(-)
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 5c52bb2ed71f..d1f5b72a1e64 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,3 +1,2 @@
-DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B
ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491
SHA512
98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
DIST SDL2_mixer-2.6.2.tar.gz 9934376 BLAKE2B
9cf378d03046389b3625b90ca7a4c34d9b80e0908bccef454adedc21f16f24d99acc0fc3522ba981be89d8c58c7a6e877e7d98c798b157529e2cb26141faec8c
SHA512
16baa9d8b345bf0224538cbfb2ae9fc5d3deea2b454f41a98006c938fe7a65d5a8c84e28a76f98a4dd971c4fe5cf0219d8bf73331cf11f2702e01600eb197658
DIST SDL2_mixer-2.6.3.tar.gz 9935069 BLAKE2B
9908bdc549300af05b4fbcbb6c0533913ae62bfa2f761118983e0da58a4bcd68c2d008fa5bbcd94b0141241e54f1cd507e275e2d4b637214b803dabdbc5b0250
SHA512
2e9da045d2fdab97236c3901b3d441834a67a47c8851ddfb817c9db6f23ed9fb355a5ef8d2158d0c9959a83934e8cd1b95db8a69eaddf8f7fcca115f01818740
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-fluidsynth.patch
b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-fluidsynth.patch
deleted file mode 100644
index cd740ac85c11..
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-fluidsynth.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6160668079f91d57a5d7bf0b40ffdd843be70daf Mon Sep 17 00:00:00 2001
-From: Sam Lantinga
-Date: Wed, 20 Jan 2021 10:17:10 -0800
-Subject: [PATCH] Fixed use-after-free in music_fluidsynth.c
-
-Tom M.
-
-There is a dangerous use-after-free in FLUIDSYNTH_Delete(): the settings
object is deleted **before** the synth. Since the settings have been created
first to initialize the synth, you must first delete the synth and then delete
the settings. This currently crashes all applications that use fluidsynth 2.1.6
and SDL2_mixer. Please apply the attached patch and release a bug fix release.
-
-Originally reported at https://github.com/FluidSynth/fluidsynth/issues/748
- src/codecs/music_fluidsynth.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/codecs/music_fluidsynth.c b/src/codecs/music_fluidsynth.c
-index 8667f0d9..a47247f4 100644
a/music_fluidsynth.c
-+++ b/music_fluidsynth.c
-@@ -285,9 +285,10 @@ static void FLUIDSYNTH_Stop(void *context)
- static void FLUIDSYNTH_Delete(void *context)
- {
- FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
-+fluid_settings_t *settings =
fluidsynth.fluid_synth_get_settings(music->synth);
- fluidsynth.delete_fluid_player(music->player);
--
fluidsynth.delete_fluid_settings(fluidsynth.fluid_synth_get_settings(music->synth));
- fluidsynth.delete_fluid_synth(music->synth);
-+fluidsynth.delete_fluid_settings(settings);
- SDL_free(music);
- }
-
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-slibtool.patch
b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-slibtool.patch
deleted file mode 100644
index 374e1441fcd7..
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-slibtool.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://bugs.gentoo.org/777420
-
-commit 174dfd47e6da498dbaf057579a15235c077b71d0
-Author: orbea
-Date: Wed Mar 24 15:56:27 2021 -0700
-
-fix build failure with slibtool and parallel make (#bug 5494)
-
-diff --git a/Makefile.in b/Makefile.in
-index 2ff24b2..6774663 100644
a/Makefile.in
-+++ b/Makefile.in
-@@ -46,7 +46,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.in
- @echo "Warning, configure.in is out of date"
-@@ -56,8 +56,9 @@ $(srcdir)/configure: $(srcdir)/configure.in
- Makefile: $(srcdir)/Makef
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/, media-libs/sdl2-mixer/files/
commit: 66b0c1ea58b968df55f721e6af3046a6901caa59
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Sep 5 17:08:20 2021 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Sep 5 17:09:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b0c1ea
media-libs/sdl2-mixer: Backport patch to fix FluidSynth memory issue
Signed-off-by: James Le Cuirot gentoo.org>
.../files/sdl2-mixer-2.0.4-fluidsynth.patch| 30 +
media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild | 125 +
2 files changed, 155 insertions(+)
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-fluidsynth.patch
b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-fluidsynth.patch
new file mode 100644
index 000..cd740ac85c1
--- /dev/null
+++ b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-fluidsynth.patch
@@ -0,0 +1,30 @@
+From 6160668079f91d57a5d7bf0b40ffdd843be70daf Mon Sep 17 00:00:00 2001
+From: Sam Lantinga
+Date: Wed, 20 Jan 2021 10:17:10 -0800
+Subject: [PATCH] Fixed use-after-free in music_fluidsynth.c
+
+Tom M.
+
+There is a dangerous use-after-free in FLUIDSYNTH_Delete(): the settings
object is deleted **before** the synth. Since the settings have been created
first to initialize the synth, you must first delete the synth and then delete
the settings. This currently crashes all applications that use fluidsynth 2.1.6
and SDL2_mixer. Please apply the attached patch and release a bug fix release.
+
+Originally reported at https://github.com/FluidSynth/fluidsynth/issues/748
+---
+ src/codecs/music_fluidsynth.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/codecs/music_fluidsynth.c b/src/codecs/music_fluidsynth.c
+index 8667f0d9..a47247f4 100644
+--- a/music_fluidsynth.c
b/music_fluidsynth.c
+@@ -285,9 +285,10 @@ static void FLUIDSYNTH_Stop(void *context)
+ static void FLUIDSYNTH_Delete(void *context)
+ {
+ FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
++fluid_settings_t *settings =
fluidsynth.fluid_synth_get_settings(music->synth);
+ fluidsynth.delete_fluid_player(music->player);
+-
fluidsynth.delete_fluid_settings(fluidsynth.fluid_synth_get_settings(music->synth));
+ fluidsynth.delete_fluid_synth(music->synth);
++fluidsynth.delete_fluid_settings(settings);
+ SDL_free(music);
+ }
+
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
new file mode 100644
index 000..dcbbcee2dae
--- /dev/null
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="SDL2_mixer-${PV}"
+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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools
static-libs timidity tremor vorbis +wav"
+REQUIRED_USE="
+ midi? ( || ( timidity fluidsynth ) )
+ timidity? ( midi )
+ fluidsynth? ( midi )
+ mad? ( mp3 )
+ mod? ( || ( mikmod modplug ) )
+ mikmod? ( mod )
+ modplug? ( mod )
+ tremor? ( vorbis )
+"
+
+RDEPEND="
+ >=media-libs/libsdl2-2.0.7[${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}] )
+ !mad? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+ )
+ opus? ( >=media-libs/opusfile-0.2 )
+ vorbis? (
+ tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}]
)
+ !tremor? (
+ >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+ >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.4-slibtool.patch"
+ "${FILESDIR}/${PN}-2.0.4-fluidsynth.patch"
+)
+
+src_prepare() {
+ default
+
+ # for slibtool patch in 2.0.4, can drop in future with eautoreconf
+ rm aclocal.m4 || die
+ eautoreconf
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ --disable-sdltest
+ --enable-music-cmd
+ $(use_ena
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/, media-libs/sdl2-mixer/files/
commit: 36d63464d341868f0ba533188238c805710f16e0 Author: Sam James gentoo org> AuthorDate: Thu Mar 25 13:24:32 2021 + Commit: Sam James gentoo org> CommitDate: Thu Mar 25 13:24:32 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d63464 media-libs/sdl2-mixer: fix slibtool build Thanks-to: orbea riseup.net> Closes: https://bugs.gentoo.org/777420 Signed-off-by: Sam James gentoo.org> .../files/sdl2-mixer-2.0.4-slibtool.patch | 81 ++ media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild | 17 - 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-slibtool.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-slibtool.patch new file mode 100644 index 000..374e1441fcd --- /dev/null +++ b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-slibtool.patch @@ -0,0 +1,81 @@ +https://bugs.gentoo.org/777420 + +commit 174dfd47e6da498dbaf057579a15235c077b71d0 +Author: orbea +Date: Wed Mar 24 15:56:27 2021 -0700 + +fix build failure with slibtool and parallel make (#bug 5494) + +diff --git a/Makefile.in b/Makefile.in +index 2ff24b2..6774663 100644 +--- a/Makefile.in b/Makefile.in +@@ -46,7 +46,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.in + @echo "Warning, configure.in is out of date" +@@ -56,8 +56,9 @@ $(srcdir)/configure: $(srcdir)/configure.in + 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 + +diff --git a/configure.in b/configure.in +index 240a322..557f640 100644 +--- a/configure.in b/configure.in +@@ -695,14 +695,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" +@@ -712,7 +712,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'` + +@@ -721,7 +721,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'` + +@@ -730,7 +730,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/sdl2-mixer/sdl2-mixer-2.0.4.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild index f16378bca0a..7f066768f34 100644 --- a/media-l
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/, media-libs/sdl2-mixer/files/
commit: 0e1b9622598387d633bd0a2bc4e37577b0c586b3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Sep 16 14:52:32 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Sep 16 18:55:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e1b9622
media-libs/sdl2-mixer: Drop old
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/sdl2-mixer/Manifest | 1 -
.../sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch| 39 ---
media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild | 119 -
3 files changed, 159 deletions(-)
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 0d918d8cc4e..a1ec538edf3 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,2 +1 @@
-DIST SDL2_mixer-2.0.1.tar.gz 10213891 BLAKE2B
3f6889e7cf8e4e159bdf18f1e4e9543ffc9160d325c8011fa3b4e7e1903b2b8aa013ef180847c878fe71a8639a069af440c41ae165aeb67d5259338795347a30
SHA512
bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d
DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B
9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4
SHA512
c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
deleted file mode 100644
index 6d617e046cb..000
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-
-diff -r f095b3477c8e -r 6afe73e1e74b configure.in
a/configure.in Sun Jan 03 09:25:52 2016 -0800
-+++ b/configure.in Mon Jan 04 21:40:14 2016 -0800
-@@ -609,7 +609,6 @@
- smpeg_lib=[`find_lib "libsmpeg2*.so.*"`]
- ;;
- esac
--SOURCES="$SOURCES $srcdir/*_mp3.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
- if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib !=
x; then
- echo "-- dynamic libsmpeg -> $smpeg_lib"
-@@ -637,11 +636,6 @@
- AC_MSG_RESULT($have_libmad)
- if test x$have_libmad = xyes; then
- SOURCES="$SOURCES $srcdir/music_mad.c"
--if echo "$SOURCES" | grep "load_mp3.c" >/dev/null; then
--:
--else
--SOURCES="$SOURCES $srcdir/load_mp3.c"
--fi
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MAD_MUSIC"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
- else
-@@ -649,7 +643,9 @@
- fi
- fi
-
--if test x$have_smpeg != xyes -a x$have_libmad != xyes; then
-+if test x$have_smpeg = xyes -o x$have_libmad = xyes; then
-+ SOURCES="$SOURCES $srcdir/*_mp3.c"
-+else
- AC_MSG_WARN([MP3 support disabled])
- fi
-
-
-
-
-
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
deleted file mode 100644
index 8fbeeb1f303..000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-MY_P=SDL2_mixer-${PV}
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/";
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz";
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg
static-libs timidity tremor 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 )
- tremor? ( vorbis )
- "
-
-RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${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++ )
- )
- mp3? (
- mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
- smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
- )
- mod? (
- modplug? (
>=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
- mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
- )
- vorbis? (
- tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}]
)
- !tremor? (
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_US
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/, media-libs/sdl2-mixer/files/
commit: 94c9568fe73d41a3edac521bea8bad10d3adb026
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Sep 1 14:13:40 2018 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Sep 1 14:13:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c9568f
media-libs/sdl2-mixer: Patch to fix 2.0.2 smpeg build issue
Closes: https://bugs.gentoo.org/636014
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch | 21 +
media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild | 4
2 files changed, 25 insertions(+)
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
new file mode 100644
index 000..1377feddb39
--- /dev/null
+++ b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
@@ -0,0 +1,21 @@
+--- SDL2_mixer-2.0.2/music_smpeg-orig.c2017-12-06 20:47:21.691153833
-0500
SDL2_mixer-2.0.2/music_smpeg.c 2017-12-06 20:47:30.032153222 -0500
+@@ -138,7 +138,7 @@
+ SDL_free(music);
+ return NULL;
+ }
+-smpeg.SMPEG_actualSpec(mp3, &music_spec);
++smpeg.SMPEG_actualSpec(music->mp3, &music_spec);
+
+ music->freesrc = freesrc;
+ return music;
+--- SDL2_mixer-2.0.2/music_smpeg-orig.c2017-12-06 21:03:44.907081811
-0500
SDL2_mixer-2.0.2/music_smpeg.c 2017-12-06 23:34:36.696418752 -0500
+@@ -174,6 +174,7 @@
+ int left = (len - smpeg.SMPEG_playAudio(music->mp3, stream, len));
+ if (left > 0) {
+ stream += (len - left);
++}
+ return left;
+ }
+
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
index 53e5155abee..440a2a2ff04 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
@@ -50,6 +50,10 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${P}-smpeg.patch
+)
+
multilib_src_configure() {
local myeconfargs=(
$(use_enable static-libs static)
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/, media-libs/sdl2-mixer/files/
commit: 68c1dd7a631f6edc41daceac971414d6a224694f
Author: Michael Sterrett gentoo org>
AuthorDate: Tue Feb 16 00:51:16 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Tue Feb 16 01:37:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c1dd7a
media-libs/sdl2-mixer: clean old
Package-Manager: portage-2.2.26
media-libs/sdl2-mixer/Manifest | 1 -
...-Fix-compiling-against-libmodplug-0.8.8.5.patch | 25 -
media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild | 115 -
3 files changed, 141 deletions(-)
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index d765ce3a..da4e2fa 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,2 +1 @@
-DIST SDL2_mixer-2.0.0.tar.gz 10119589 SHA256
a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b SHA512
e04594abc13c2b6527cd92a94a8d3e18436e9e6aaee21bab83e288e259a2fb20aae8433765d07feeb3b5bf253951323d67054239091e79720846770beb30be4d
WHIRLPOOL
58385d7bdb3382af4f9d3aa9904b40083fe1139af0c938fa807904d70d4561180f65314bb2ab56f3b67a35140252e72802753ed723bca2536a4745fad43cb905
DIST SDL2_mixer-2.0.1.tar.gz 10213891 SHA256
5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f SHA512
bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d
WHIRLPOOL
b9ebeaad35ed92e8de111872d17ceefdc996e91f3b35fa9ab62573fae972e1a1626cc86141260c69af87a53a0880230ec399fe06fa3c5a98b20d82be8515
diff --git
a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.0-Fix-compiling-against-libmodplug-0.8.8.5.patch
b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.0-Fix-compiling-against-libmodplug-0.8.8.5.patch
deleted file mode 100644
index 786931d..000
---
a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.0-Fix-compiling-against-libmodplug-0.8.8.5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru SDL2_mixer-2.0.0.orig/dynamic_modplug.h
SDL2_mixer-2.0.0/dynamic_modplug.h
SDL2_mixer-2.0.0.orig/dynamic_modplug.h2013-08-10 13:39:55.0
-0400
-+++ SDL2_mixer-2.0.0/dynamic_modplug.h 2014-11-29 03:00:38.288969276 -0500
-@@ -21,7 +21,7 @@
-
- #ifdef MODPLUG_MUSIC
-
--#include "modplug.h"
-+#include "libmodplug/modplug.h"
-
- typedef struct {
- int loaded;
-diff -ru SDL2_mixer-2.0.0.orig/music_modplug.h SDL2_mixer-2.0.0/music_modplug.h
SDL2_mixer-2.0.0.orig/music_modplug.h 2013-08-10 13:39:58.0
-0400
-+++ SDL2_mixer-2.0.0/music_modplug.h 2014-11-29 03:00:05.346347058 -0500
-@@ -21,7 +21,7 @@
-
- #ifdef MODPLUG_MUSIC
-
--#include "modplug.h"
-+#include "libmodplug/modplug.h"
- #include "SDL_rwops.h"
- #include "SDL_audio.h"
- #include "SDL_mixer.h"
-Only in SDL2_mixer-2.0.0: music_modplug.h.orig
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild
b/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild
deleted file mode 100644
index b223c4b..000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-MY_P=SDL2_mixer-${PV}
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/";
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz";
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg
static-libs timidity tremor 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 )
- tremor? ( vorbis )
- "
-
-RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${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++ )
- )
- mp3? (
- mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
- smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
- )
- mod? (
- modplug? (
>=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
- mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
- )
- vorbis? (
- tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}]
)
- !tremor? (
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
- )"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-Fix-compiling-against-libm
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/, media-libs/sdl2-mixer/files/
commit: 76d3480fb1fac5c608a9873849e5bbd305d273d7
Author: Michael Sterrett gentoo org>
AuthorDate: Tue Jan 5 20:47:44 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Tue Jan 5 22:38:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d3480f
media-libs/sdl2-mixer: use upstream patch instead of sed hack to fix mp3
configure code
Package-Manager: portage-2.2.26
.../sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch| 39 ++
media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild | 7 ++--
2 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
new file mode 100644
index 000..6d617e0
--- /dev/null
+++ b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
@@ -0,0 +1,39 @@
+
+diff -r f095b3477c8e -r 6afe73e1e74b configure.in
+--- a/configure.in Sun Jan 03 09:25:52 2016 -0800
b/configure.in Mon Jan 04 21:40:14 2016 -0800
+@@ -609,7 +609,6 @@
+ smpeg_lib=[`find_lib "libsmpeg2*.so.*"`]
+ ;;
+ esac
+-SOURCES="$SOURCES $srcdir/*_mp3.c"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
+ if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib !=
x; then
+ echo "-- dynamic libsmpeg -> $smpeg_lib"
+@@ -637,11 +636,6 @@
+ AC_MSG_RESULT($have_libmad)
+ if test x$have_libmad = xyes; then
+ SOURCES="$SOURCES $srcdir/music_mad.c"
+-if echo "$SOURCES" | grep "load_mp3.c" >/dev/null; then
+-:
+-else
+-SOURCES="$SOURCES $srcdir/load_mp3.c"
+-fi
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MAD_MUSIC"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
+ else
+@@ -649,7 +643,9 @@
+ fi
+ fi
+
+-if test x$have_smpeg != xyes -a x$have_libmad != xyes; then
++if test x$have_smpeg = xyes -o x$have_libmad = xyes; then
++ SOURCES="$SOURCES $srcdir/*_mp3.c"
++else
+ AC_MSG_WARN([MP3 support disabled])
+ fi
+
+
+
+
+
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
index 8fb8354..4814ca8 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils multilib-minimal
+inherit autotools eutils multilib-minimal
MY_P=SDL2_mixer-${PV}
DESCRIPTION="Simple Direct Media Layer Mixer Library"
@@ -52,8 +52,9 @@ DEPEND=${RDEPEND}
S=${WORKDIR}/${MY_P}
src_prepare() {
- # ugly workaround to bad SOURCES building code (bug #570804)
- sed -i -e '/echo.*load_mp3/s/load//' configure || die
+ # upstream patch to fix building with both smpeg and mad mp3 support
(bug #570804)
+ epatch "${FILESDIR}"/${P}-mp3.patch
+ eautoreconf
}
multilib_src_configure() {
