gentoo auto-resync : 10:03:2025 - 01:49:12

3 files changed, 80 insertions, 0 deletions

diff --git a/media-libs/zmusic/Manifest b/media-libs/zmusic/Manifest
index f03291d91f9b..52b532b5e62f 100644
--- a/media-libs/zmusic/Manifest
+++ b/media-libs/zmusic/Manifest
@@ -1,4 +1,7 @@
+AUX zmusic-1.1.14-no-sndfile.patch 765 BLAKE2B 3f4335c4e33b14de363c069c05b1d9d89637f06b6583347bff75eb5f0eef4ae8ce9f7a4c8f76ae021b13bf06987ce4b271fa296f5b01271f2069a17970a348b2 SHA512 091d4dbcfee86bca2972cf9a597b427c9f5386c23e10dfc4f043830cc6f1ca206bb0291dcf644627ca766d26923a598aa52725d4f3cef92d127596de4e4fc76e
 AUX zmusic-1.1.4-gcc-13.patch 4687 BLAKE2B 357cc66bb9a639f3e3507484aba5cc179b4a20f09a7cfbdd1d9e4be0bc77daa47ed7653ac3d7f08817879744bd516b87cd01fbc50251e8e374d205cf239a89d8 SHA512 433b7309a3528f6cf8f82f853dde936507bf3477f1278eb8cfd4228a02203611c150af8e08e7231ac60b4844ecafe9149d0a532154a876f7d3d8afc6a752889a
+DIST zmusic-1.1.14.tar.gz 2525238 BLAKE2B 6e3270f014170a52774ce30ccb19847f44efc7ed36a0a7cba7024dee5e703d9cd7072d03ea9b404ad43df5b88902907a96b7dceb6c914fdc6ae09f7b44e5a20a SHA512 165e227177d5bbbd1226099f0607c2147eacd26e2b619508994efb63d718709838b5df32ac851bb933058351757979d9bc0d477b4efb87a5c8d528d60c0d954f
 DIST zmusic-1.1.4.tar.gz 1809045 BLAKE2B aae64fa8b10b44d79ce4738527e613e65c65a8e367dc998f966938ccc10b9689a58decb702c1ca943ed3371092b69ed91dbe4645b707626ac525d29d750334d5 SHA512 5188fb095897769514c4a4698fabb5640e7ca86fe0665d4bfe6649a940b00ac02d87decda626be8a848ba6db0a468cc985d74d0fda2d3da8657fee079e0bde73
+EBUILD zmusic-1.1.14.ebuild 1173 BLAKE2B a8b46f8789900e50347b4c47c38a60bcc423e64b7e12f62904cff1c5e15361e176d74ed05511201366815d67a8be340607e8e54474e6bfbc7ccff6f1827e65b1 SHA512 2f54587cb4272328fc47889394ba97241c76871afcdc2dad9fb39fd93dabe9c32800ff4aa81e09c6d25352c698f99ba102bdb3864b9caa3d530edc60682cf40b
 EBUILD zmusic-1.1.4.ebuild 1397 BLAKE2B bb2fc347aed87ad739f46756d82ec923dc0b9d2c6f304b831b0a822d405cab4128093e6e0fb6989d36727f61f147a07e729a8e5742a802514d3b50ef1e1029d1 SHA512 7584aeb23e6fa02a52383192f0c68b30bf2659dfdf9190cc0dcd05447b62b0eb1614013e73588ef4266f222616768a2f16d537cebbfb730a58cd1159c60d95c3
 MISC metadata.xml 603 BLAKE2B 52e13af0f2edb86d365022e7a128c24c14ec3ca713934b807a4bcf017d8441cd83665b1cc2a99e43740ec199254163a32c2da34b3d9637e063e033c0a1b87c8f SHA512 fc3edde4fb851282af90a21d936e7d9b143a18f17a2074b942a284ff2a2cfd2aaf989d300e750e35d13777c123919b1c27a8de0f02814432ea11b4309b3d060d
diff --git a/media-libs/zmusic/files/zmusic-1.1.14-no-sndfile.patch b/media-libs/zmusic/files/zmusic-1.1.14-no-sndfile.patch
new file mode 100644
index 000000000000..e0ec215b5a99
--- /dev/null
+++ b/media-libs/zmusic/files/zmusic-1.1.14-no-sndfile.patch
@@ -0,0 +1,27 @@
+From 6928b8609db9b1c104c4cd4f9b163486121fb0f0 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 8 Mar 2025 21:53:55 +0000
+Subject: [PATCH] Fix building with no sndfile support at all
+
+The stub functions still reference SNDFILE, so we still need to include
+the bundled header in this case.
+---
+ source/decoder/sndfile_decoder.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/source/decoder/sndfile_decoder.h b/source/decoder/sndfile_decoder.h
+index 2645ebd..3bf916a 100644
+--- a/source/decoder/sndfile_decoder.h
++++ b/source/decoder/sndfile_decoder.h
+@@ -43,6 +43,8 @@ private:
+     static sf_count_t file_tell(void *user_data);
+ };
+ 
++#else
++#include "../thirdparty/sndfile.h"
+ #endif
+ 
+ #endif /* SNDFILE_DECODER_H */
+-- 
+2.48.1
+
diff --git a/media-libs/zmusic/zmusic-1.1.14.ebuild b/media-libs/zmusic/zmusic-1.1.14.ebuild
new file mode 100644
index 000000000000..531d9ef35621
--- /dev/null
+++ b/media-libs/zmusic/zmusic-1.1.14.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PN="ZMusic"
+DESCRIPTION="GZDoom's music system as a standalone library"
+HOMEPAGE="https://github.com/ZDoom/ZMusic"
+SRC_URI="https://github.com/ZDoom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="alsa mpg123 +sndfile"
+
+DEPEND="
+	dev-libs/glib:2
+	alsa? ( media-libs/alsa-lib )
+	mpg123? ( media-sound/mpg123 )
+	sndfile? ( media-libs/libsndfile[-minimal] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-sndfile.patch
+)
+
+src_prepare() {
+	rm -rf licenses || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/860117
+	# https://github.com/ZDoom/ZMusic/issues/56
+	filter-lto
+
+	local mycmakeargs=(
+		-DDYN_SNDFILE=OFF
+		-DDYN_MPG123=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)"
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake_src_configure
+}