gentoo auto-resync : 04:02:2023 - 21:14:48

3 files changed, 173 insertions, 2 deletions

diff --git a/media-libs/zmusic/Manifest b/media-libs/zmusic/Manifest
index 897910c876be..f83b7a769ad1 100644
--- a/media-libs/zmusic/Manifest
+++ b/media-libs/zmusic/Manifest
@@ -1,3 +1,4 @@
+AUX zmusic-1.1.4-gcc-13.patch 4687 BLAKE2B 357cc66bb9a639f3e3507484aba5cc179b4a20f09a7cfbdd1d9e4be0bc77daa47ed7653ac3d7f08817879744bd516b87cd01fbc50251e8e374d205cf239a89d8 SHA512 433b7309a3528f6cf8f82f853dde936507bf3477f1278eb8cfd4228a02203611c150af8e08e7231ac60b4844ecafe9149d0a532154a876f7d3d8afc6a752889a
 DIST zmusic-1.1.4.tar.gz 1809045 BLAKE2B aae64fa8b10b44d79ce4738527e613e65c65a8e367dc998f966938ccc10b9689a58decb702c1ca943ed3371092b69ed91dbe4645b707626ac525d29d750334d5 SHA512 5188fb095897769514c4a4698fabb5640e7ca86fe0665d4bfe6649a940b00ac02d87decda626be8a848ba6db0a468cc985d74d0fda2d3da8657fee079e0bde73
-EBUILD zmusic-1.1.4.ebuild 1225 BLAKE2B 302540c33b8ba4c372677919f1ae18f8f641d88d5004bed481c2c2d1a7b1ca6297e28c441ac2f421d7dd7bd313d0e43506305b04764f69ce71fd53d3e0261f21 SHA512 cc5249588edcfce24ac1a05ee93ac9f8bdeb029a73c35c967392506d311d9400a23e39e9b4981c7e8e2dcfca18ad5460629ac676a726518cc6582c1e7a81f214
+EBUILD zmusic-1.1.4.ebuild 1278 BLAKE2B 37eb4793086d9b2610bbcb241c758c8c085edb7232927115c7f4889e9588d8fc41df2d7a362aeba56df72a303dbcb9b0fdf7b13c765315b156538e3500a8d11e SHA512 253cbd273d850c25bc12a3e36bb5b8cb0bd8bf6521fe982e2c8f98e66f9b180f35996c54fdfa11fc4fb631d47f087698b82b224c3d696bb46f2c059ed9bcc33d
 MISC metadata.xml 611 BLAKE2B fe5c6b3bebe74ed6cd5b49555411921d8a49ecdb4cfe39c57155f7e8c46874a620c0fec395ee27832f890b34d146352396b5d08c103eed98214a4e7f59200f2e SHA512 68eef13abbf14c3744bc9f15136f2c8435540392de89cbd196cced5c35a0dd39f9b85e3c1a83e21340197e6240961e949ddfee8d698990e36aa3593ee87e3bd9
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 000000000000..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 <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/zmusic-1.1.4.ebuild b/media-libs/zmusic/zmusic-1.1.4.ebuild
index 50793486bf21..e89de1347992 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-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,10 @@ 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