[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/
commit: 5e30ed11ab770d1357107541330dd80ce113183f
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 3 15:45:54 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 3 15:45:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e30ed11
media-libs/sdl-mixer: Stabilize 1.2.12_p20221010 x86, #883985
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
index e15f193b6209..7c4950f1504f 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 8c4a7d265508261188c7bc33274ecb441bb8b9db
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 3 11:40:04 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 3 11:40:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4a7d26
media-libs/sdl-mixer: Stabilize 1.2.12_p20221010 amd64, #883985
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
index 111697b263e2..e15f193b6209 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 7ccd69b14361c4d3612006f17f72f77c142e31b3
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 2 19:41:15 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 2 19:41:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ccd69b1
media-libs/sdl-mixer: Stabilize 1.2.12_p20221010 arm64, #883985
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
index 6f09219c5133..111697b263e2 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 20d10ac2395905713aab6b85cf057467352d4137
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 2 18:56:41 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 2 18:56:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d10ac2
media-libs/sdl-mixer: Stabilize 1.2.12_p20221010 ppc64, #883985
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
index 0aac301608c3..6f09219c5133 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 1880bb1eb74908e8bc5983d7ef45bfd0216e6c97
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 2 18:56:38 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 2 18:56:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1880bb1e
media-libs/sdl-mixer: Stabilize 1.2.12_p20221010 ppc, #883985
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
index 7acf287ac9d3..0aac301608c3 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: d32b22dc6bf2c646e1e0214f28f1c9e14d35f130
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 2 08:48:43 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 2 08:48:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32b22dc
media-libs/sdl-mixer: Stabilize 1.2.12_p20221010 sparc, #883985
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
index fd3f51ceef8d..7acf287ac9d3 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 6515f2b657f4ba96324fa6d320a0d4c9d06620ba
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 2 08:21:34 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 2 08:21:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6515f2b6
media-libs/sdl-mixer: Stabilize 1.2.12_p20221010 arm, #883985
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
index bd78de80724e..fd3f51ceef8d 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: ea848dd692680870ca7d7019979b6abc399989da
Author: Sam James gentoo org>
AuthorDate: Fri Nov 11 06:25:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 11 06:29:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea848dd6
media-libs/sdl-mixer: drop superfluous autoreconf
Upstream commit configure etc to git, so even though they don't make releases,
we
don't need autoreconf \o/
Signed-off-by: Sam James gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
index 91e0c76faf44..bd78de80724e 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -5,7 +5,7 @@ EAPI=8
# Check SDL-1.2 branch for possible backports/new snapshots
-inherit autotools multilib-minimal
+inherit multilib-minimal
SDL_MIXER_COMMIT="7804621c533dddfe970e97c94c4ea72d48ed7f48"
@@ -54,12 +54,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-src_prepare() {
- default
-
- eautoreconf
-}
-
multilib_src_configure() {
local myeconfargs=(
--disable-music-flac-shared
[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/files/, media-libs/sdl-mixer/
commit: 24c9402d23e17f82fd06e074f460da2645698244
Author: Sam James gentoo org>
AuthorDate: Thu Nov 10 06:45:50 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 10 06:45:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c9402d
media-libs/sdl-mixer: fix Clang 16 compatibility
Closes: https://bugs.gentoo.org/880619
Signed-off-by: Sam James gentoo.org>
...dl-mixer-1.2.12-incompatible-func-clang16.patch | 64 +++
media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild| 128 +
2 files changed, 192 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
new file mode 100644
index ..0f104d5d6ffe
--- /dev/null
+++
b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch
@@ -0,0 +1,64 @@
+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
+
+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
+
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild
new file mode 100644
index ..04a69cf22ab4
--- /dev/null
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild
@@ -0,0 +1,128 @@
+# 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? (
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 161cf5dee023f32c4642b8a9675dc609eb8b4374 Author: Sam James gentoo org> AuthorDate: Thu Nov 10 06:30:49 2022 + Commit: Sam James gentoo org> CommitDate: Thu Nov 10 06:30:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=161cf5de media-libs/sdl-mixer: add github upstream metadata Note we need the SDL-1.2 branch. Signed-off-by: Sam James gentoo.org> media-libs/sdl-mixer/metadata.xml | 28 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/media-libs/sdl-mixer/metadata.xml b/media-libs/sdl-mixer/metadata.xml index e21b7d3404e3..164919840177 100644 --- a/media-libs/sdl-mixer/metadata.xml +++ b/media-libs/sdl-mixer/metadata.xml @@ -1,16 +1,20 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - ga...@gentoo.org - Gentoo Games Project - - - Use media-sound/fluidsynth for MIDI support - basic support for MIDI files - basic support for MOD files - Install playwave and playmus tools (useful for testing) - Use media-libs/smpeg for MP3 support - support WAVE files - + + ga...@gentoo.org + Gentoo Games Project + + + Use media-sound/fluidsynth for MIDI support + basic support for MIDI files + basic support for MOD files + Install playwave and playmus tools (useful for testing) + Use media-libs/smpeg for MP3 support + support WAVE files + + + + libsdl-org/SDL_mixer +
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 4389d11fbdcbcd2847962814b6dc8a2507a47524
Author: Sam James gentoo org>
AuthorDate: Thu Nov 10 06:39:33 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 10 06:39:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4389d11f
media-libs/sdl-mixer: add explicit backports/snapshot TODO
Signed-off-by: Sam James gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild | 4
1 file changed, 4 insertions(+)
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
index 1e21b42d4cad..45fe1cea8182 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
@@ -3,6 +3,10 @@
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
[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
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 3e5c54adf02f84fff35e746792a7c3e4cce6ce72
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 27 21:10:32 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 28 12:26:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5c54ad
media-libs/sdl-mixer: EAPI-7 bump, https, drop eutils/ltprune
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 87 +
1 file changed, 47 insertions(+), 40 deletions(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index d9efb2a003f..7757eec8749 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -1,18 +1,20 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils ltprune multilib-minimal
+EAPI=7
MY_P=${P/sdl-/SDL_}
+inherit multilib-minimal
+
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;
+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 )
@@ -23,60 +25,65 @@ REQUIRED_USE="
mod? ( || ( mikmod modplug ) )
mikmod? ( mod )
modplug? ( mod )
- "
+"
-RDEPEND=">=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+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}] )
)
- mod? (
- modplug? (
>=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
- mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
- )
vorbis? (
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- )"
-DEPEND=${RDEPEND}
+ >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
-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
+)
src_prepare() {
- epatch \
- "${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 #445980
- sed -i \
- -e '/link.*play/s/-o/$(LDFLAGS) -o/' \
- Makefile.in || die
+ default
+ sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die
}
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 \
- --disable-music-flac-shared \
- --disable-music-fluidsynth-shared \
- --disable-music-mod-shared \
- --disable-music-mp3-shared \
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 06a6bc43f053c7597c87c6adfe5ed81faabbb894
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Jan 6 14:24:12 2021 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Jan 6 14:26:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a6bc43
media-libs/sdl-mixer: drop x86-macos
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 3b9eec7e2a7..d9efb2a003f 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@
SRC_URI="http://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-macos ~x86-solaris"
+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 ) )
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: a12c8b67e1f862c60ddd9d82a73f4f702cc4fa6b
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Mon Nov 30 20:41:34 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Nov 30 21:11:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12c8b67
media-libs/sdl-mixer: drop to ~hppa
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index a677f855c5c..3b9eec7e2a7 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="http://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-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg
static-libs timidity vorbis +wav"
REQUIRED_USE="
midi? ( || ( timidity fluidsynth ) )
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 8b1aae91dacd6023540af1fa26ee60ce04188a37
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Aug 8 08:41:02 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Aug 8 08:49:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1aae91
media-libs/sdl-mixer: stable 1.2.12-r4 for hppa, bug #730970
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 3b9eec7e2a7..a677f855c5c 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="http://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-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg
static-libs timidity vorbis +wav"
REQUIRED_USE="
midi? ( || ( timidity fluidsynth ) )
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 57fe33cc35dc0613f1289167622c04c67bed038d
Author: Sam James gentoo org>
AuthorDate: Sun Jul 26 00:40:50 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Jul 26 00:40:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57fe33cc
media-libs/sdl-mixer: arm stable (bug #730970)
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index f5b751bcf63..3b9eec7e2a7 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="http://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-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg
static-libs timidity vorbis +wav"
REQUIRED_USE="
midi? ( || ( timidity fluidsynth ) )
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 731c2dfba5525a09dd56084c166f38bfcae841e2
Author: Sam James gentoo org>
AuthorDate: Fri Jul 10 00:08:11 2020 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 10 00:15:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=731c2dfb
media-libs/sdl-mixer: arm64 stable (bug #730970)
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 653af1e96bf..f5b751bcf63 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="http://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-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg
static-libs timidity vorbis +wav"
REQUIRED_USE="
midi? ( || ( timidity fluidsynth ) )
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 23b79b93879c2709f271e9cfd7120a37eb37602d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 10 22:13:02 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 10 22:45:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b79b93
media-libs/sdl-mixer: Add missing media-sound/fluidsynth slot op
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 789b3348622..8d73e8e50b6 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -28,7 +28,7 @@ REQUIRED_USE="
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}] )
+ fluidsynth? (
>=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
timidity? ( media-sound/timidity++ )
)
mp3? (
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: ab0512b7268eae4710533811d32a51074fd95005
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 15 19:09:27 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 15 20:04:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0512b7
media-libs/sdl-mixer: De-stabilise arm
The only reverse dependency of media-sound/timidity++ forcing arm.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index d1394db134e..789b3348622 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="http://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 sh sparc x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg
static-libs timidity vorbis +wav"
REQUIRED_USE="
midi? ( || ( timidity fluidsynth ) )
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: bbe8321749b9aecd7e6f95ca5d2da8dce154d6c9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Sep 14 18:25:51 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 15 02:30:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe83217
media-libs/sdl-mixer: Drop to ~hppa
The only reverse dependency of media-sound/fluidsynth forcing hppa.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 722f378c122..d1394db134e 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@
SRC_URI="http://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 sh sparc x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg
static-libs timidity vorbis +wav"
REQUIRED_USE="
midi? ( || ( timidity fluidsynth ) )
[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/
commit: 92452bff16a9d15bbd24f687c789e34f8f953064
Author: Michael Sterrett gentoo org>
AuthorDate: Thu Dec 17 20:06:16 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Fri Dec 18 00:39:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92452bff
clean old
Package-Manager: portage-2.2.24
media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild | 107
1 file changed, 107 deletions(-)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild
b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild
deleted file mode 100644
index 85e86ed..000
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils
-
-MY_P=${P/sdl-/SDL_}
-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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-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 )
- "
-
-DEPEND=">=media-libs/libsdl-1.2.10
- flac? ( media-libs/flac )
- midi? (
- fluidsynth? ( media-sound/fluidsynth )
- timidity? ( media-sound/timidity++ )
- )
- mp3? (
- mad? ( media-libs/libmad )
- smpeg? ( >=media-libs/smpeg-0.4.4-r1 )
- )
- mod? (
- modplug? ( media-libs/libmodplug )
- mikmod? ( >=media-libs/libmikmod-3.1.10 )
- )
- vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )"
-RDEPEND="${DEPEND}
- playtools? ( !media-libs/sdl2-mixer[playtools] )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch \
- "${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 #445980
- sed -i \
- -e '/link.*play/s/-o/$(LDFLAGS) -o/' \
- Makefile.in || die
-}
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- --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)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- if use playtools; then
- emake DESTDIR="${D}" install-bin
- fi
- dodoc CHANGES README
- if ! use static-libs ; then
- find "${D}" -type f -name '*.la' -exec rm {} + || die
- fi
-}
-
-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
-}
