[gentoo-commits] repo/gentoo:master commit in: media-libs/zmusic/
commit: bbf16bca76a546a205f0c816a7bd0dd3c9a6353e Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Jul 2 13:33:05 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Jul 2 20:27:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf16bca media-libs/zmusic: update HOMEPAGE Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31712 Signed-off-by: James Le Cuirot gentoo.org> media-libs/zmusic/metadata.xml| 4 ++-- media-libs/zmusic/zmusic-1.1.4.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-libs/zmusic/metadata.xml b/media-libs/zmusic/metadata.xml index 792418d7d727..41f65465365e 100644 --- a/media-libs/zmusic/metadata.xml +++ b/media-libs/zmusic/metadata.xml @@ -10,7 +10,7 @@ Enable support for MPEG audio playback via media-sound/mpg123 - https://github.com/coelckers/ZMusic/issues - coelckers/ZMusic + https://github.com/ZDoom/ZMusic/issues + ZDoom/ZMusic diff --git a/media-libs/zmusic/zmusic-1.1.4.ebuild b/media-libs/zmusic/zmusic-1.1.4.ebuild index e89de1347992..d90c69a031f8 100644 --- a/media-libs/zmusic/zmusic-1.1.4.ebuild +++ b/media-libs/zmusic/zmusic-1.1.4.ebuild @@ -7,8 +7,8 @@ inherit cmake MY_PN="ZMusic" DESCRIPTION="GZDoom's music system as a standalone library" -HOMEPAGE="https://github.com/coelckers/ZMusic; -SRC_URI="https://github.com/coelckers/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/ZDoom/ZMusic; +SRC_URI="https://github.com/ZDoom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-libs/zmusic/, media-libs/zmusic/files/
commit: b98f8c4440e4f2042dcf1b477b6a8eb87e0b4688 Author: Sam James gentoo org> AuthorDate: Sat Feb 4 20:31:25 2023 + Commit: Sam James gentoo org> CommitDate: Sat Feb 4 20:33:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98f8c44 media-libs/zmusic: fix build w/ gcc 13 Closes: https://bugs.gentoo.org/892814 Signed-off-by: Sam James gentoo.org> media-libs/zmusic/files/zmusic-1.1.4-gcc-13.patch | 166 ++ media-libs/zmusic/zmusic-1.1.4.ebuild | 6 +- 2 files changed, 171 insertions(+), 1 deletion(-) diff --git a/media-libs/zmusic/files/zmusic-1.1.4-gcc-13.patch b/media-libs/zmusic/files/zmusic-1.1.4-gcc-13.patch new file mode 100644 index ..54d1fd2939f8 --- /dev/null +++ b/media-libs/zmusic/files/zmusic-1.1.4-gcc-13.patch @@ -0,0 +1,166 @@ +https://github.com/ZDoom/ZMusic/pull/45 + +From 9a72e0f09558d5b047fa7f2a6ee59e10a959333b Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 4 Feb 2023 20:16:24 + +Subject: [PATCH] Add missing standard library includes (fix build with GCC 13) + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so etc is no longer transitively included. + +See https://www.gnu.org/software/gcc/gcc-13/porting_to.html. + +Bug: https://bugs.gentoo.org/892814 +--- a/source/mididevices/music_adlmidi_mididevice.cpp b/source/mididevices/music_adlmidi_mididevice.cpp +@@ -34,6 +34,7 @@ + + // HEADER FILES + ++#include + #include + + #include "zmusic/zmusic_internal.h" +--- a/source/mididevices/music_fluidsynth_mididevice.cpp b/source/mididevices/music_fluidsynth_mididevice.cpp +@@ -35,6 +35,7 @@ + // HEADER FILES + + #include ++#include + #include + #include + #include "zmusic/zmusic_internal.h" +--- a/source/mididevices/music_opl_mididevice.cpp b/source/mididevices/music_opl_mididevice.cpp +@@ -35,6 +35,7 @@ + + // HEADER FILES + ++#include + #include "zmusic/zmusic_internal.h" + #include "mididevice.h" + #include "zmusic/mus2midi.h" +@@ -333,4 +334,4 @@ MIDIDevice* CreateOplMIDIDevice(const char* Args) + { + throw std::runtime_error("OPL device not supported in this configuration"); + } +-#endif +\ No newline at end of file ++#endif +--- a/source/mididevices/music_opnmidi_mididevice.cpp b/source/mididevices/music_opnmidi_mididevice.cpp +@@ -34,6 +34,7 @@ + + // HEADER FILES + ++#include + #include "mididevice.h" + #include "zmusic/zmusic_internal.h" + +--- a/source/mididevices/music_timidity_mididevice.cpp b/source/mididevices/music_timidity_mididevice.cpp +@@ -34,6 +34,7 @@ + + // HEADER FILES + ++#include + #include + #include "mididevice.h" + #include "zmusic/zmusic_internal.h" +--- a/source/mididevices/music_timiditypp_mididevice.cpp b/source/mididevices/music_timiditypp_mididevice.cpp +@@ -32,6 +32,7 @@ + ** + */ + ++#include + #include "mididevice.h" + #include "zmusic/zmusic_internal.h" + +@@ -239,4 +240,4 @@ MIDIDevice* CreateTimidityPPMIDIDevice(const char* Args, int samplerate) + { + throw std::runtime_error("Timidity++ device not supported in this configuration"); + } +-#endif +\ No newline at end of file ++#endif +--- a/source/mididevices/music_wavewriter_mididevice.cpp b/source/mididevices/music_wavewriter_mididevice.cpp +@@ -38,6 +38,7 @@ + #include "mididevice.h" + #include "zmusic/m_swap.h" + #include "fileio.h" ++#include + #include + + // MACROS -- +--- a/source/mididevices/music_wildmidi_mididevice.cpp b/source/mididevices/music_wildmidi_mididevice.cpp +@@ -34,6 +34,7 @@ + + // HEADER FILES + ++#include + #include "mididevice.h" + #include "zmusic/zmusic_internal.h" + +@@ -278,4 +279,4 @@ MIDIDevice* CreateWildMIDIDevice(const char* Args, int samplerate) + { + throw std::runtime_error("WildMidi device not supported in this configuration"); + } +-#endif +\ No newline at end of file ++#endif +--- a/source/musicformats/music_midi.cpp b/source/musicformats/music_midi.cpp +@@ -34,8 +34,9 @@ + + // HEADER FILES + +-#include + #include ++#include ++#include + #include + #include "zmusic/zmusic_internal.h" + #include "zmusic/musinfo.h" +--- a/source/streamsources/music_gme.cpp b/source/streamsources/music_gme.cpp +@@ -38,9 +38,11 @@ + //#define GME_DLL + + #include ++#include ++#include ++ + #include "streamsource.h" + #include +-#include + #include "fileio.h" + + // MACROS
[gentoo-commits] repo/gentoo:master commit in: media-libs/zmusic/
commit: f6097c5fa040a9d5bfbae9fb093ada9b62fd11b7 Author: matoro users noreply github com> AuthorDate: Mon Sep 19 01:08:59 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon Sep 19 06:42:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6097c5f media-libs/zmusic: Keyword 1.1.4 arm64, #849866 Signed-off-by: matoro users.noreply.github.com> Signed-off-by: Michał Górny gentoo.org> media-libs/zmusic/zmusic-1.1.4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/zmusic/zmusic-1.1.4.ebuild b/media-libs/zmusic/zmusic-1.1.4.ebuild index 221e294349f7..50793486bf21 100644 --- a/media-libs/zmusic/zmusic-1.1.4.ebuild +++ b/media-libs/zmusic/zmusic-1.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/coelckers/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="alsa fluidsynth mpg123 +sndfile" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-libs/zmusic/
commit: 2edfbd4c176ab0198f601a41c5b06f80a1f27823 Author: James Le Cuirot gentoo org> AuthorDate: Tue Nov 3 22:32:18 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Nov 3 22:33:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2edfbd4c media-libs/zmusic: Drop old 1.1.2 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: James Le Cuirot gentoo.org> media-libs/zmusic/Manifest| 1 - media-libs/zmusic/zmusic-1.1.2.ebuild | 51 --- 2 files changed, 52 deletions(-) diff --git a/media-libs/zmusic/Manifest b/media-libs/zmusic/Manifest index 207edb31e31..74721512a6d 100644 --- a/media-libs/zmusic/Manifest +++ b/media-libs/zmusic/Manifest @@ -1,2 +1 @@ -DIST zmusic-1.1.2.tar.gz 1528782 BLAKE2B 0d6896b6aaa290fbc88ac9da3e0a3a34265d93e906ef9aa5039e96a1e39c626f843667c04601bfbfd055e53c30bc843ce3d127e89e14ea56b0112a355ed1ee75 SHA512 97fbedd08b7d0ae84c10b87c615e166b0f14a50173df5081baaa9656d2ce161d413c4568e3985122befe30f36dce4fbad049bf5df3cccb3f2a5147a7bd0d2886 DIST zmusic-1.1.4.tar.gz 1809045 BLAKE2B aae64fa8b10b44d79ce4738527e613e65c65a8e367dc998f966938ccc10b9689a58decb702c1ca943ed3371092b69ed91dbe4645b707626ac525d29d750334d5 SHA512 5188fb095897769514c4a4698fabb5640e7ca86fe0665d4bfe6649a940b00ac02d87decda626be8a848ba6db0a468cc985d74d0fda2d3da8657fee079e0bde73 diff --git a/media-libs/zmusic/zmusic-1.1.2.ebuild b/media-libs/zmusic/zmusic-1.1.2.ebuild deleted file mode 100644 index 95bb2cf5c6f..000 --- a/media-libs/zmusic/zmusic-1.1.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -MY_PN="ZMusic" -DESCRIPTION="GZDoom's music system as a standalone library" -HOMEPAGE="https://github.com/coelckers/ZMusic; -SRC_URI="https://github.com/coelckers/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="alsa fluidsynth mpg123 sndfile" - -DEPEND=" - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - fluidsynth? ( media-sound/fluidsynth:= ) - mpg123? ( media-sound/mpg123 ) - sndfile? ( media-libs/libsndfile )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - rm -rf licenses || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DFORCE_INTERNAL_ZLIB=OFF - -DFORCE_INTERNAL_GME=ON - -DDYN_FLUIDSYNTH=OFF - -DDYN_SNDFILE=OFF - -DDYN_MPG123=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)" - -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)" - -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)" - -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)" - -DBUILD_SHARED_LIBS=ON - ) - cmake_src_configure -} - -src_install() { - cmake_src_install -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/zmusic/
commit: fb351619780cd717b03567145b5f94afc7f966ce Author: William Breathitt Gray gmail com> AuthorDate: Sat Oct 31 14:51:13 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Nov 1 22:01:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb351619 media-libs/zmusic: version bump to 1.1.4 Closes: https://bugs.gentoo.org/740752 Closes: https://bugs.gentoo.org/752033 Signed-off-by: William Breathitt Gray gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18091 Signed-off-by: James Le Cuirot gentoo.org> media-libs/zmusic/Manifest| 1 + media-libs/zmusic/zmusic-1.1.4.ebuild | 51 +++ 2 files changed, 52 insertions(+) diff --git a/media-libs/zmusic/Manifest b/media-libs/zmusic/Manifest index b9b106f7302..207edb31e31 100644 --- a/media-libs/zmusic/Manifest +++ b/media-libs/zmusic/Manifest @@ -1 +1,2 @@ DIST zmusic-1.1.2.tar.gz 1528782 BLAKE2B 0d6896b6aaa290fbc88ac9da3e0a3a34265d93e906ef9aa5039e96a1e39c626f843667c04601bfbfd055e53c30bc843ce3d127e89e14ea56b0112a355ed1ee75 SHA512 97fbedd08b7d0ae84c10b87c615e166b0f14a50173df5081baaa9656d2ce161d413c4568e3985122befe30f36dce4fbad049bf5df3cccb3f2a5147a7bd0d2886 +DIST zmusic-1.1.4.tar.gz 1809045 BLAKE2B aae64fa8b10b44d79ce4738527e613e65c65a8e367dc998f966938ccc10b9689a58decb702c1ca943ed3371092b69ed91dbe4645b707626ac525d29d750334d5 SHA512 5188fb095897769514c4a4698fabb5640e7ca86fe0665d4bfe6649a940b00ac02d87decda626be8a848ba6db0a468cc985d74d0fda2d3da8657fee079e0bde73 diff --git a/media-libs/zmusic/zmusic-1.1.4.ebuild b/media-libs/zmusic/zmusic-1.1.4.ebuild new file mode 100644 index 000..221e294349f --- /dev/null +++ b/media-libs/zmusic/zmusic-1.1.4.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +MY_PN="ZMusic" +DESCRIPTION="GZDoom's music system as a standalone library" +HOMEPAGE="https://github.com/coelckers/ZMusic; +SRC_URI="https://github.com/coelckers/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="alsa fluidsynth mpg123 +sndfile" + +DEPEND=" + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + fluidsynth? ( media-sound/fluidsynth:= ) + mpg123? ( media-sound/mpg123 ) + sndfile? ( media-libs/libsndfile )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + rm -rf licenses || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DFORCE_INTERNAL_ZLIB=OFF + -DFORCE_INTERNAL_GME=ON + -DDYN_FLUIDSYNTH=OFF + -DDYN_SNDFILE=OFF + -DDYN_MPG123=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)" + -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)" + -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)" + -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)" + -DBUILD_SHARED_LIBS=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/zmusic/
commit: 9dfd9952d8179b482ce41fd18135823a2a022aa2 Author: Sam James gentoo org> AuthorDate: Sat Sep 5 23:43:00 2020 + Commit: Sam James gentoo org> CommitDate: Sat Sep 5 23:44:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dfd9952 media-libs/zmusic: Keyword 1.1.2 arm, #740422 Signed-off-by: Sam James gentoo.org> media-libs/zmusic/zmusic-1.1.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/zmusic/zmusic-1.1.2.ebuild b/media-libs/zmusic/zmusic-1.1.2.ebuild index dbcf8b76178..95bb2cf5c6f 100644 --- a/media-libs/zmusic/zmusic-1.1.2.ebuild +++ b/media-libs/zmusic/zmusic-1.1.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/coelckers/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="alsa fluidsynth mpg123 sndfile" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-libs/zmusic/
commit: 29cf71b138094bba89e9f78a61987f3e5255151f Author: William Breathitt Gray gmail com> AuthorDate: Wed Jun 17 18:22:56 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Wed Sep 2 21:33:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29cf71b1 media-libs/zmusic: New package Bug: https://bugs.gentoo.org/727448 Signed-off-by: William Breathitt Gray gmail.com> Signed-off-by: James Le Cuirot gentoo.org> media-libs/zmusic/Manifest| 1 + media-libs/zmusic/metadata.xml| 16 +++ media-libs/zmusic/zmusic-1.1.2.ebuild | 51 +++ 3 files changed, 68 insertions(+) diff --git a/media-libs/zmusic/Manifest b/media-libs/zmusic/Manifest new file mode 100644 index 000..b9b106f7302 --- /dev/null +++ b/media-libs/zmusic/Manifest @@ -0,0 +1 @@ +DIST zmusic-1.1.2.tar.gz 1528782 BLAKE2B 0d6896b6aaa290fbc88ac9da3e0a3a34265d93e906ef9aa5039e96a1e39c626f843667c04601bfbfd055e53c30bc843ce3d127e89e14ea56b0112a355ed1ee75 SHA512 97fbedd08b7d0ae84c10b87c615e166b0f14a50173df5081baaa9656d2ce161d413c4568e3985122befe30f36dce4fbad049bf5df3cccb3f2a5147a7bd0d2886 diff --git a/media-libs/zmusic/metadata.xml b/media-libs/zmusic/metadata.xml new file mode 100644 index 000..32e30ae67be --- /dev/null +++ b/media-libs/zmusic/metadata.xml @@ -0,0 +1,16 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + ga...@gentoo.org + Gentoo Games Project + + + Enable support for MIDI via media-sound/fluidsynth + Enable support for MPEG audio playback via media-sound/mpg123 + + + https://github.com/coelckers/ZMusic/issues + coelckers/ZMusic + + diff --git a/media-libs/zmusic/zmusic-1.1.2.ebuild b/media-libs/zmusic/zmusic-1.1.2.ebuild new file mode 100644 index 000..dbcf8b76178 --- /dev/null +++ b/media-libs/zmusic/zmusic-1.1.2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +MY_PN="ZMusic" +DESCRIPTION="GZDoom's music system as a standalone library" +HOMEPAGE="https://github.com/coelckers/ZMusic; +SRC_URI="https://github.com/coelckers/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa fluidsynth mpg123 sndfile" + +DEPEND=" + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + fluidsynth? ( media-sound/fluidsynth:= ) + mpg123? ( media-sound/mpg123 ) + sndfile? ( media-libs/libsndfile )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + rm -rf licenses || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DFORCE_INTERNAL_ZLIB=OFF + -DFORCE_INTERNAL_GME=ON + -DDYN_FLUIDSYNTH=OFF + -DDYN_SNDFILE=OFF + -DDYN_MPG123=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)" + -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)" + -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)" + -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)" + -DBUILD_SHARED_LIBS=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install +}