gentoo auto-resync : 20:06:2023 - 01:14:49

6 files changed, 17 insertions, 129 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 51179f5d0a59..735fb32fe836 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index e873761a855e..c9c92c6ae92b 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,7 +1,5 @@
+AUX gzdoom-4.10.0-gcc-13.patch 497 BLAKE2B 400f439c3ae4e956e205357051edeb23732db9a8d43e72e8dd6f38900869f3f10d720bec6b0077f8e7a9567d7f8bd6c5204d405302802cde6bb41ecf3e36804c SHA512 22e11299121fd0f74e5b5e09c1530e3e158f50fb49402715a92397b3fdcb7d9944ce41f30efbbe8b98c57939c067f4689b7e96ddacf17d0da72059829d5f5e29
 AUX gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch 1209 BLAKE2B b3cf80ab4d6328dbcb14ceb9514883ed58b8086dab02182f4cf8964140095dd8d6ac0503c68a4c7442c0f9cc92b4bb6b3e084eee026be52842413e15118a13be SHA512 a08c29fe6b867dbbe60035c99c31d1bce73c1ff37ca2c15f659e060b77366f6fcdc11d2319dee3331d9874115e92566b9c0a6364604869f3815fbb0ee7179ef6
-AUX gzdoom-4.8.2-fix-gzdoom-pk3.patch 1090 BLAKE2B 99ee14ec703d7d2be8c4659364e6e24f0866a94ca080184d0b38d1f5498bf73bb42ffacaddeeb21d14af4dadbfaf433abd3fd6190ef5fa4fd46708d0c93713eb SHA512 f8ef4f25d305e627503dbbb0a50138277fc0141ae9aef2f26fcc72c891a47cf3f20017c5ce55a29b180629bcba26fd1b767fbc4c1f833ed12d50ee44e06242c9
 DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586 SHA512 fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
-DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5 SHA512 5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42
-EBUILD gzdoom-4.10.0.ebuild 2281 BLAKE2B 2b4617eccff0f43244ba81490b82bc2546aa5c533053cab58b116954f1717914766a638330276df33009a3e3c3f4545a215c7032b7fa8597cbeb102edc6878c0 SHA512 b1a9424832039003b6cb11b2f5301ffde7058010bb2ed5da572f8ae9e1b5a561a2ac7491a42a3ee2d8a8f5bb5387bd84495e6bf6d177716cd132a3da4ec80372
-EBUILD gzdoom-4.8.2-r1.ebuild 2282 BLAKE2B 46e60d4534dfca6cb927c0b9574d61356427fc3e678d01d32d91df53abfa6ea5c3d5d8953c14240903fec831a0a3fd8430a16a1175a68a467efe6dbc219649cd SHA512 a39bc49288394a7b2a6841950621d0272843722f9c9f6cd2bb50f4417d04ffb660062018351afb518345d659451ee4f1d070f51e8c0c358572435899e0ae3a48
+EBUILD gzdoom-4.10.0.ebuild 2314 BLAKE2B 59e23ec80bd842c2fafede5ca9fe5f9aa4ff8b232a24e907ceb540026245f0207d7ad7995020909112b4c54996415a28b8330b23147dec56fc15a010eda76bc4 SHA512 99492f1fe0a17b3371ceb4a8e1a89669b9171be8ab05e9b400dff318d083c91a46052a208bcf01f770349ce74fded03045b26072cc33ab45e24e0c14fd3476c8
 MISC metadata.xml 880 BLAKE2B 2567e34ed2a970d0d8ca70590dc6e6440b09f9949f2283c9b028a4245265db826d8ecc27710226738cf418a64aeaa0776b2909c377db3f06efa6dabd2d624fff SHA512 037a5f1e53ffc75178d895e0c232ce62181785155875e3eee0f814273ece452baaead182185d3dd6f5cea4ddb110a17072b796559c964694a46bd52ec0290822
diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch
new file mode 100644
index 000000000000..d34cb749e7f5
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/907087
+
+diff --git a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
+index fd44722..7189d0e 100644
+--- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
++++ b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
+@@ -20,6 +20,8 @@
+ // THE SOFTWARE.
+ //
+
++#include <cstdio>
++
+ #ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H
+ #define AMD_VULKAN_MEMORY_ALLOCATOR_H
diff --git a/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch b/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch
deleted file mode 100644
index 6070d47566e0..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b132d2c3fe7f9074e1c08dbab77fc1270e8736fb Mon Sep 17 00:00:00 2001
-From: Omar Polo <op@omarpolo.com>
-Date: Mon, 11 Jul 2022 11:52:43 +0200
-Subject: [PATCH] fix gzdoom.pk3 not found error
-
-Move the initialization before BaseFileSearch is called, otherwise
-GameConfig is used not initialized and it doesn't find the gzdoom.pk3
-file.
-
-GameConfig used uninitalized was spotted by @LoneFox78.
----
- src/d_main.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/d_main.cpp b/src/d_main.cpp
-index b64142c07fe..005f8cf8cd5 100644
---- a/src/d_main.cpp
-+++ b/src/d_main.cpp
-@@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void)
- 	
- 	std::set_new_handler(NewFailure);
- 	const char *batchout = Args->CheckValue("-errorlog");
-+
-+	D_DoomInit();
- 	
- 	// [RH] Make sure zdoom.pk3 is always loaded,
- 	// as it contains magic stuff we need.
-@@ -3568,8 +3570,6 @@ static int D_DoomMain_Internal (void)
- 
- 	if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, GetVersionString());
- 
--	D_DoomInit();
--
- 	extern void D_ConfirmSendStats();
- 	D_ConfirmSendStats();
- 
diff --git a/games-fps/gzdoom/gzdoom-4.10.0.ebuild b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
index a9545cb61896..16c223070e34 100644
--- a/games-fps/gzdoom/gzdoom-4.10.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
@@ -30,6 +30,7 @@ S="${WORKDIR}/${PN}-g${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
+	"${FILESDIR}"/${P}-gcc-13.patch
 )
 
 src_prepare() {
diff --git a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild b/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
deleted file mode 100644
index e8ae3900cb9f..000000000000
--- a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg flag-o-matic
-
-DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
-HOMEPAGE="https://zdoom.org"
-SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/libjpeg-turbo:0=
-	media-libs/libsdl2[gles2?,opengl,vulkan?]
-	media-libs/libvpx:=
-	media-libs/openal
-	media-libs/zmusic
-	sys-libs/zlib
-	gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
-	"${FILESDIR}"/${P}-fix-gzdoom-pk3.patch
-)
-
-src_prepare() {
-	rm -rf docs/licenses || die
-	rm -rf libraries/{bzip2,jpeg,zlib} || die
-	if ! use non-free ; then
-		rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/858749
-	filter-lto
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-		-DDYN_OPENAL=OFF
-		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL=OFF
-		-DHAVE_VULKAN="$(usex vulkan)"
-		-DHAVE_GLES2="$(usex gles2)"
-		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex non-free)"
-	)
-
-	use debug || append-cppflags -DNDEBUG
-	use telemetry || append-cppflags -DNO_SEND_STATS
-
-	cmake_src_configure
-}
-
-src_install() {
-	newicon src/posix/zdoom.xpm "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-	cmake_src_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use non-free ; then
-		ewarn
-		ewarn "GZDoom installed without non-free components."
-		ewarn "Note: The non-free game_support.pk3 file is needed to play"
-		ewarn "      games natively supported by GZDoom."
-		ewarn "A list of games natively supported by GZDoom is available"
-		ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
-		ewarn
-	fi
-}