media-libs/zmusic: drop 1.1.4

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 0 insertions, 228 deletions

diff --git a/media-libs/zmusic/Manifest b/media-libs/zmusic/Manifest
index 2961c070d4f3..d7a6b3476eea 100644
--- a/media-libs/zmusic/Manifest
+++ b/media-libs/zmusic/Manifest
@@ -1,2 +1 @@
 DIST zmusic-1.1.14.tar.gz 2525238 BLAKE2B 6e3270f014170a52774ce30ccb19847f44efc7ed36a0a7cba7024dee5e703d9cd7072d03ea9b404ad43df5b88902907a96b7dceb6c914fdc6ae09f7b44e5a20a SHA512 165e227177d5bbbd1226099f0607c2147eacd26e2b619508994efb63d718709838b5df32ac851bb933058351757979d9bc0d477b4efb87a5c8d528d60c0d954f
-DIST zmusic-1.1.4.tar.gz 1809045 BLAKE2B aae64fa8b10b44d79ce4738527e613e65c65a8e367dc998f966938ccc10b9689a58decb702c1ca943ed3371092b69ed91dbe4645b707626ac525d29d750334d5 SHA512 5188fb095897769514c4a4698fabb5640e7ca86fe0665d4bfe6649a940b00ac02d87decda626be8a848ba6db0a468cc985d74d0fda2d3da8657fee079e0bde73
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
deleted file mode 100644
index 54d1fd2939f8..000000000000
--- a/media-libs/zmusic/files/zmusic-1.1.4-gcc-13.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-https://github.com/ZDoom/ZMusic/pull/45
-
-From 9a72e0f09558d5b047fa7f2a6ee59e10a959333b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 4 Feb 2023 20:16:24 +0000
-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 <cstdint> 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 <stdexcept>
- #include <stdlib.h>
- 
- #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 <mutex>
-+#include <stdexcept>
- #include <stdio.h>
- #include <stdlib.h>
- #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 <stdexcept>
- #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 <stdexcept>
- #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 <stdexcept>
- #include <stdlib.h>
- #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 <stdexcept>
- #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 <stdexcept>
- #include <errno.h>
- 
- // MACROS ------------------------------------------------------------------
---- a/source/mididevices/music_wildmidi_mididevice.cpp
-+++ b/source/mididevices/music_wildmidi_mididevice.cpp
-@@ -34,6 +34,7 @@
- 
- // HEADER FILES ------------------------------------------------------------
- 
-+#include <stdexcept>
- #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 <string>
- #include <algorithm>
-+#include <stdexcept>
-+#include <string>
- #include <assert.h>
- #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 <algorithm>
-+#include <mutex>
-+#include <stdexcept>
-+
- #include "streamsource.h"
- #include <gme/gme.h>
--#include <mutex>
- #include "fileio.h"
- 
- // MACROS ------------------------------------------------------------------
---- a/source/streamsources/music_opl.cpp
-+++ b/source/streamsources/music_opl.cpp
-@@ -35,6 +35,8 @@
- 
- #ifdef HAVE_OPL
- 
-+#include <stdexcept>
-+
- #include "streamsource.h"
- #include "oplsynth/opl.h"
- #include "oplsynth/opl_mus_player.h"
---- a/source/zmusic/fileio.h
-+++ b/source/zmusic/fileio.h
-@@ -25,6 +25,7 @@
- #pragma once
- #include <stdio.h>
- #include <string.h>
-+#include <cstdint>
- #include <vector>
- #include <string>
- 
--- 
-2.39.1
-
diff --git a/media-libs/zmusic/metadata.xml b/media-libs/zmusic/metadata.xml
index 41f65465365e..d5f7126544d8 100644
--- a/media-libs/zmusic/metadata.xml
+++ b/media-libs/zmusic/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="fluidsynth">Enable support for MIDI via <pkg>media-sound/fluidsynth</pkg></flag>
 		<flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
 	</use>
 	<upstream>
diff --git a/media-libs/zmusic/zmusic-1.1.4.ebuild b/media-libs/zmusic/zmusic-1.1.4.ebuild
deleted file mode 100644
index 4b2775a4fc4f..000000000000
--- a/media-libs/zmusic/zmusic-1.1.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-gcc-13.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=(
-		-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
-}