5 files changed, 115 insertions, 1 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9c1e451e6819..f44de3f2e323 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpg123-base/Manifest b/media-sound/mpg123-base/Manifest
index 471ab480e82d..1dd621c501b2 100644
--- a/media-sound/mpg123-base/Manifest
+++ b/media-sound/mpg123-base/Manifest
@@ -1,3 +1,5 @@
 DIST mpg123-1.32.3.tar.bz2 1111054 BLAKE2B 67f889403c2bb639d675ec5ebea5a19c4b7174971d62bdd8d940ad659e6b0c06dada38422fc9d71b878917aa89e305ec48c8faa78d65d507cd6a0c9a79951359 SHA512 946c1073b6eebfd65333ec543df1caeea25864479e9c8e153fb53d8b636cc756d8d81947f7b5cbedbbfb1ea664d3fb27562ed36e7726d95e80591bd2ad622afc
+DIST mpg123-1.32.9.tar.bz2 1118388 BLAKE2B 370012300ca6cd26daf48cc067692e94c2c37c7549f6581d64e8f7cc9f08c720518ed6aaa10b3c2194ce2ae85afa5564a65dcf7129c6789f90d24be395ff1397 SHA512 dccb640b0845061811cb41bf145587e7093556d686d49a748232b079659b46284b6cc40db42d14febceac11277c58edf2b69d1b4c46c223829a3d15478e2e26c
 EBUILD mpg123-base-1.32.3.ebuild 2943 BLAKE2B e7e3d520ff06a5a7625a3ea4a883ef20dd6d94a6076033dfb7651bb5bd08511ca02b46bb30d8ef7964863bb2b5f4d1012d6e357f240ff06a0e009e99d7d3e793 SHA512 efcd1ace4ee2a5b0bd69481eebe56c37853ad529065241e69dfb75f8b33fb8f014162ff6988f0beccd2eb01346f8f807487ee360fdbe40a4af27b8b53deff671
+EBUILD mpg123-base-1.32.9.ebuild 2890 BLAKE2B 9d5ea5830afd155971d011f6b4ec6fa12c0f9f7d974afc777fccaa544248d87e9c71ba2e1930c1345c1bf1ce063744113501282dba6f8dffbd184fd67a3a54d3 SHA512 c992c90f2b63ac4689725556f09b53551c007ff9849282529a4d768d22c93c36cc3d25294eb66bad4a6e864b4a9811e45d5c8933f5e6e8f749210eceea7e4c87
 MISC metadata.xml 579 BLAKE2B e61622166d7240119fcdb5f79d5b228b5fef1086e818a3c5dce16d70f290b621a8c48efff36ff93d60cb63014e4d33db8401a902cdcc26d2779464788e735cb5 SHA512 f546df9ffe7d486a0f9450f86d531a48227820c597cb60216c61f589478fb312c1c1026deb90929feeb4b6804443ead310dbf1fdc3d1739a13220155c5523707
diff --git a/media-sound/mpg123-base/mpg123-base-1.32.9.ebuild b/media-sound/mpg123-base/mpg123-base-1.32.9.ebuild
new file mode 100644
index 000000000000..2f1267b7dc35
--- /dev/null
+++ b/media-sound/mpg123-base/mpg123-base-1.32.9.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="mpg123"
+MY_P="${MY_PN}-${PV}"
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://downloads.sourceforge.net/${MY_PN}/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+# Note: build system prefers libsdl2 > libsdl. We could in theory add both
+# but it's tricky when it comes to handling switching between them properly.
+# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
+RDEPEND="
+	!<media-sound/mpg123-1.32.3-r100
+	!media-libs/libmpg123
+	dev-libs/libltdl:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/libtool
+	virtual/pkgconfig
+"
+IDEPEND="app-eselect/eselect-mpg123"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	append-lfs-flags
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in coreaudio pulseaudio jack alsa oss sdl portaudio nas ; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+			fi
+		done
+	fi
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio=dummy
+		--with-default-audio="${_audio} dummy"
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123} || die
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index c1addcf7d287..483124be49bb 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -14,5 +14,5 @@ AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6d
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.15.0-r6.ebuild 6011 BLAKE2B 24238b578b48b52f8bb2ef0e7d243039eb2194c358ccdaa970e6bb15fac7eb59524fa17bdd7bff669ec603cdb67339047f504f0617569de237e23a76e353d1cc SHA512 7a8d75c2b5c88a359ccc56405acc972cb4b5ebb77b68c6cebc3e53181befd9b686afbb06096248dd559569b8e1f718f893876d2b31934e485e445e8e6bfb01b8
+EBUILD timidity++-2.15.0-r6.ebuild 6053 BLAKE2B fad5172b51a965bde16c935e6c96b1ed1938c488e6bc2c9bac7ca1d36e41b17874a944194855a039b1ce2c3755b866d039ac06d6c1ed499012cc5c88d645483d SHA512 2d5d7e57e15285584acd2267b74e48268d4063bc558ec96f970afbbb23f80417e1a4483545f22584ece80859068c3e9a03eb8d70cc1b8dadd9a12e0cd601d62c
 MISC metadata.xml 332 BLAKE2B 417167c38c5b331872b74c9dd82d3c386cf4ea5f963201eb20744ff043ff74943867190193f87d7c5220435b38550d6a01a2879803df12934ead428d5f684126 SHA512 5e8adfac2728f35a8bda3e042450c5554ab9aa4a5addbf3dd4fa4dbe3a426a98a9a79fa8cca64c27934707d3564a26bfdc9e5acdb4f79590681885e07cd32bbb
diff --git a/media-sound/timidity++/timidity++-2.15.0-r6.ebuild b/media-sound/timidity++/timidity++-2.15.0-r6.ebuild
index 46912c2f9e09..a7a3f0d5b8cb 100644
--- a/media-sound/timidity++/timidity++-2.15.0-r6.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0-r6.ebuild
@@ -97,6 +97,9 @@ src_configure() {
 	# This avoids a bunch of implicit decl. errors which only happen with USE=-Xaw3d(?!)
 	append-cppflags -DSTDC_HEADERS
 
+	# bug #943939
+	append-cflags -std=gnu17
+
 	local myeconfargs=(
 		--localstatedir=/var/state/${PN}
 		--with-module-dir="${EPREFIX}/usr/share/timidity"