diff --git a/media-libs/zmusic/Manifest b/media-libs/zmusic/Manifest index d7a6b3476eea5..f40beccdeb46b 100644 --- a/media-libs/zmusic/Manifest +++ b/media-libs/zmusic/Manifest @@ -1 +1 @@ -DIST zmusic-1.1.14.tar.gz 2525238 BLAKE2B 6e3270f014170a52774ce30ccb19847f44efc7ed36a0a7cba7024dee5e703d9cd7072d03ea9b404ad43df5b88902907a96b7dceb6c914fdc6ae09f7b44e5a20a SHA512 165e227177d5bbbd1226099f0607c2147eacd26e2b619508994efb63d718709838b5df32ac851bb933058351757979d9bc0d477b4efb87a5c8d528d60c0d954f +DIST zmusic-1.3.0.tar.gz 3003529 BLAKE2B e7b3091e8a92f65e383439a7cef3ddc09657de8243a8ae8d95222697a82d51896ac277aac88477c63ab0e43b22a4d43a40d9edcd5c770fcf4cc8f7de00dcfdee SHA512 c1dd1d47ea9d7fc1ce038e598890058d78d6f0329d2333a2714a4cbafc01a7da8d5108b9f7cd505c2fe6fb47f81101addd8ead4ad15b0a47d585f9e7194a41ae 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 deleted file mode 100644 index e0ec215b5a996..0000000000000 --- a/media-libs/zmusic/files/zmusic-1.1.14-no-sndfile.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6928b8609db9b1c104c4cd4f9b163486121fb0f0 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -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/metadata.xml b/media-libs/zmusic/metadata.xml index d5f7126544d88..3fe9f5529289f 100644 --- a/media-libs/zmusic/metadata.xml +++ b/media-libs/zmusic/metadata.xml @@ -9,7 +9,6 @@ Enable support for MPEG audio playback via media-sound/mpg123 - https://github.com/ZDoom/ZMusic/issues - ZDoom/ZMusic + UZDoom/ZMusic diff --git a/media-libs/zmusic/zmusic-1.1.14.ebuild b/media-libs/zmusic/zmusic-1.3.0.ebuild similarity index 70% rename from media-libs/zmusic/zmusic-1.1.14.ebuild rename to media-libs/zmusic/zmusic-1.3.0.ebuild index 531d9ef356214..0674cecb51d1f 100644 --- a/media-libs/zmusic/zmusic-1.1.14.ebuild +++ b/media-libs/zmusic/zmusic-1.3.0.ebuild @@ -6,26 +6,25 @@ 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" +DESCRIPTION="UZDoom's music system as a standalone library" +HOMEPAGE="https://github.com/UZDoom/ZMusic" +SRC_URI="https://github.com/UZDoom/${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" +KEYWORDS="~amd64 ~arm64 ~ppc64" 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 -) + sndfile? ( media-libs/libsndfile[-minimal] ) +" +RDEPEND=" + ${DEPEND} +" src_prepare() { rm -rf licenses || die