gentoo auto-resync : 10:11:2022 - 09:27:33

5 files changed, 216 insertions, 14 deletions

diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index c7eb7eb7b902..960c3c1f6be7 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,9 +1,11 @@
 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 2381 BLAKE2B 30fbae0d2453b67a8e263f970658b9ec309bbb476900b5187a571cf74224bc162e8174b20350615d55facfba13e0071b890334b002d4651157a6ca0b284fb21b SHA512 2d71a48566997eaa693b375f9a1e5136cf0cf14aea6545203c7d13685efca0851a26a2da407c7ad351e80554b7a435f9e0182c497a7d4d2c3a4e3e5a21e5099f
 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
-EBUILD sdl-mixer-1.2.12-r5.ebuild 3438 BLAKE2B bbc1c4b67af067f344be5fb91c72b610065916a5f0a66362049a16cdd813532b0a93d525d25e695b1c8f2fd5b14bdd3b9f4a3ddea7d8e0ffd0520b6bc27f9fde SHA512 c7e8022f9960b8ae369805e62c55b2bec8c6c078f37427c94d44f014303cae0e463ca0218bc919ffb9554e7101f809665b659c91f1d2ba54f86883c9ec21ba53
-MISC metadata.xml 664 BLAKE2B 95d73b3e7ecc6b155cfad0d5043b63e245ccae5666b80d7ca6acccc71df7c1e76def7ede91a0bfd87b4084a14d3a7b2407a6f5ab537e619ed3cc32c5658248db SHA512 c8d112e07ceaa7c3ca71f023147024ead1fbda761fbb290fa5c1e7a76d17de48a69a8a4859e19df7ac5e36f08bc42805df768bcfe81f3c06afca0d00173cd46a
+EBUILD sdl-mixer-1.2.12-r5.ebuild 3601 BLAKE2B f51bbe3d0cc2c60b47ddf3626a07b45bbfcc5334adf4f1fef0d6fd681b9fac44d47e3e879397329355539288c6d983cc31a600f9e9c4403143688c221e1df881 SHA512 dd3969be4a66304acbf4366dfd387a00ae4558ad7d595f62c7e7790d6206be5fede4ae807abec8a5baaa9484c98b158e5431f4c663306bf6f120cd4b25aefcce
+EBUILD sdl-mixer-1.2.12-r6.ebuild 3660 BLAKE2B 8b140bae4093ad4cfb2d8f69890ec72735e20037033a17fbacb889e749e61d609bb3b252cfa58edb77dbf6d0f3413e6389d70ce5a1b50096606c7cba67274c30 SHA512 570cfd9dce65dfe49f1303d89a0eeb1e6ffb6c0582fd144b1900f274068bae76a9c7e52c04e2c5e80913f862df7deebde79f46696e966641389782c722b7bc3f
+MISC metadata.xml 787 BLAKE2B 4a9a04b0b88ec853de52f1cc7f6ad63e6bd4e5a421906daa2e0935c32d756538ef9aee8631e5be96665dd37ec6c4e47d256e30b01f7cc6ca56f29baaaa5ef27d SHA512 46520c6a56e9d6ff2137e71bf728349ed167f7ec10417345528e6da051e482b3a27158e46ae973d1bd0f348cac9e3f65e8a02eef984b8e00fbb2aced256ad2bd
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 000000000000..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 <sezeroz@gmail.com>
+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 <sezeroz@gmail.com>
+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 <sezeroz@gmail.com>
+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/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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
-<use>
- <flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
- <flag name="midi">basic support for MIDI files</flag>
- <flag name="mod">basic support for MOD files</flag>
- <flag name="playtools">Install playwave and playmus tools (useful for testing)</flag>
- <flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support</flag>
- <flag name="wav">support WAVE files</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
+		<flag name="midi">basic support for MIDI files</flag>
+		<flag name="mod">basic support for MOD files</flag>
+		<flag name="playtools">Install playwave and playmus tools (useful for testing)</flag>
+		<flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support</flag>
+		<flag name="wav">support WAVE files</flag>
+	</use>
+	<upstream>
+		<!-- SDL-1.2 branch -->
+		<remote-id type="github">libsdl-org/SDL_mixer</remote-id>
+	</upstream>
 </pkgmetadata>
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
 
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 000000000000..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? ( >=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
+}