public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2019-09-05 20:20 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2019-09-05 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     657a8f058b0cf5ee648ea8376ed7c73bbae83c45
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sat Aug 31 11:25:49 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 20:20:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657a8f05

games-fps/gzdoom: Drop old

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest                          |  1 -
 .../gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch    | 28 ----------
 .../files/gzdoom-4.1.3-install_soundfonts.patch    | 34 ------------
 games-fps/gzdoom/gzdoom-4.1.3.ebuild               | 62 ----------------------
 4 files changed, 125 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index d7ccd5b9e28..1a1880d9565 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
-DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64 SHA512 16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac
 DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803 SHA512 07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d

diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch
deleted file mode 100644
index 1ae12a832b4..00000000000
--- a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2018-10-16 14:29:56.900427855 +0200
-
-Make the build work with fluidsynth 2.x.
-
----
- src/sound/mididevices/music_fluidsynth_mididevice.cpp |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-===================================================================
---- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-+++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD
- #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f
- #define FLUID_CHORUS_DEFAULT_SPEED 0.3f
- #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f
--#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
- 
- #endif
- 
-+#ifndef FLUID_CHORUS_DEFAULT_TYPE
-+#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
-+#endif
-+
- // TYPES -------------------------------------------------------------------
- 
- // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------

diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch
deleted file mode 100644
index 1fe0b99d9a8..00000000000
--- a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Thu, 13 Jun 2019 18:01:08 +0900
-Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
-
-The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
-installation directory.
----
- src/CMakeLists.txt | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0bb16f39e..4ff15062d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD
- 	${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $<TARGET_FILE_DIR:zdoom>/fm_banks/gs-by-papiezak-and-sneakernets.wopn
- )
- 
-+if( WIN32 )
-+	set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
-+else()
-+	set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
-+endif()
-+install(FILES "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_banks"
-+		DESTINATION ${INSTALL_SOUNDFONT_PATH}
-+		COMPONENT "Soundfont resources")
-+
- if( CMAKE_COMPILER_IS_GNUCXX )
- 	# GCC misoptimizes this file
- 	set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" )
--- 
-2.21.0
-

diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
deleted file mode 100644
index 242bd4e9287..00000000000
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop xdg
-
-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="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk gtk2 openmp"
-
-DEPEND="
-	media-libs/libsdl2[opengl]
-	media-libs/libsndfile
-	media-libs/openal
-	media-sound/fluidsynth:=
-	media-sound/mpg123
-	sys-libs/zlib
-	virtual/jpeg:0
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-PATCHES=(
-	"${FILESDIR}/${P}-fluidsynth2.patch"
-	"${FILESDIR}/${P}-install_soundfonts.patch"
-)
-
-src_prepare() {
-	rm -rf docs/licenses || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-		-DDYN_FLUIDSYNTH=OFF
-		-DDYN_OPENAL=OFF
-		-DDYN_SNDFILE=OFF
-		-DDYN_MPG123=OFF
-		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL=OFF
-		-DNO_OPENMP="$(usex !openmp)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	newicon src/posix/zdoom.xpm "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-	cmake-utils_src_install
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2019-09-19 22:10 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2019-09-19 22:10 UTC (permalink / raw
  To: gentoo-commits

commit:     2b3f989d1c050c6d792283a958138dd12d93ef73
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 22:10:10 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 22:10:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b3f989d

games-fps/gzdoom: Drop old 4.2.0

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest                          |  1 -
 ...-4.2.0-Introduce-the-BUILD_NONFREE-option.patch | 36 ----------
 .../gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch    | 28 --------
 .../files/gzdoom-4.2.0-install_soundfonts.patch    | 34 ----------
 games-fps/gzdoom/gzdoom-4.2.0.ebuild               | 79 ----------------------
 5 files changed, 178 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 6ea2bde6cef..bcb0430e517 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
-DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803 SHA512 07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d
 DIST gzdoom-4.2.1.tar.gz 13660636 BLAKE2B f1399014441d1556cc16e8d89b8c321a0591996fbcf8ad85a99403faef3b4663636b2bc4543982f2fc9ebdba777e88e4685985390d2e798eb01c0cea683305f6 SHA512 37a21bf101442cbe36574666dfb92b28eeee6b4dc982d43a8d5c95255e1f49e2451740b54e100b59120cef67f68f6eb07f687155bbab712854ce7ddc7c0b6c4a

diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
deleted file mode 100644
index c74d08a24a4..00000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Sat, 31 Aug 2019 21:23:23 +0900
-Subject: [PATCH] Introduce the BUILD_NONFREE option
-
-This allow users to disable building nonfree components (brightmaps.pk3
-and game_support.pk3) if they so desire.
----
- CMakeLists.txt | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7860358ef..23d317f42 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -404,10 +404,15 @@ add_subdirectory( libraries/lzma )
- add_subdirectory( tools )
- add_subdirectory( libraries/dumb )
- add_subdirectory( libraries/gdtoa )
-+
- add_subdirectory( wadsrc )
--add_subdirectory( wadsrc_bm )
- add_subdirectory( wadsrc_lights )
--add_subdirectory( wadsrc_extra )
-+option (BUILD_NONFREE "Build nonfree components" ON)
-+if( BUILD_NONFREE )
-+	add_subdirectory( wadsrc_bm )
-+	add_subdirectory( wadsrc_extra )
-+endif()
-+
- add_subdirectory( src )
- 
- if( NOT CMAKE_CROSSCOMPILING )
--- 
-2.23.0
-

diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
deleted file mode 100644
index 1ae12a832b4..00000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2018-10-16 14:29:56.900427855 +0200
-
-Make the build work with fluidsynth 2.x.
-
----
- src/sound/mididevices/music_fluidsynth_mididevice.cpp |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-===================================================================
---- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-+++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD
- #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f
- #define FLUID_CHORUS_DEFAULT_SPEED 0.3f
- #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f
--#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
- 
- #endif
- 
-+#ifndef FLUID_CHORUS_DEFAULT_TYPE
-+#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
-+#endif
-+
- // TYPES -------------------------------------------------------------------
- 
- // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------

diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch
deleted file mode 100644
index 1fe0b99d9a8..00000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Thu, 13 Jun 2019 18:01:08 +0900
-Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
-
-The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
-installation directory.
----
- src/CMakeLists.txt | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0bb16f39e..4ff15062d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD
- 	${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $<TARGET_FILE_DIR:zdoom>/fm_banks/gs-by-papiezak-and-sneakernets.wopn
- )
- 
-+if( WIN32 )
-+	set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
-+else()
-+	set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
-+endif()
-+install(FILES "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_banks"
-+		DESTINATION ${INSTALL_SOUNDFONT_PATH}
-+		COMPONENT "Soundfont resources")
-+
- if( CMAKE_COMPILER_IS_GNUCXX )
- 	# GCC misoptimizes this file
- 	set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" )
--- 
-2.21.0
-

diff --git a/games-fps/gzdoom/gzdoom-4.2.0.ebuild b/games-fps/gzdoom/gzdoom-4.2.0.ebuild
deleted file mode 100644
index 578941b1a1d..00000000000
--- a/games-fps/gzdoom/gzdoom-4.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop xdg
-
-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="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT
-	nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk gtk2 +nonfree openmp"
-
-DEPEND="
-	media-libs/libsdl2[opengl]
-	media-libs/libsndfile
-	media-libs/openal
-	media-sound/fluidsynth:=
-	media-sound/mpg123
-	sys-libs/zlib
-	virtual/jpeg:0
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-PATCHES=(
-	"${FILESDIR}/${P}-fluidsynth2.patch"
-	"${FILESDIR}/${P}-install_soundfonts.patch"
-	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-	rm -rf docs/licenses || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-		-DDYN_FLUIDSYNTH=OFF
-		-DDYN_OPENAL=OFF
-		-DDYN_SNDFILE=OFF
-		-DDYN_MPG123=OFF
-		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL=OFF
-		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex nonfree)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	newicon src/posix/zdoom.xpm "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use nonfree ; then
-		elog
-		elog "GZDoom installed without nonfree components."
-		elog "Note: The nonfree game_support.pk3 file is needed to play"
-		elog "      games natively supported by GZDoom."
-		elog "A list of games natively supported by GZDoom may be found"
-		elog "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
-		elog
-	fi
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2019-10-24 20:37 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2019-10-24 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     3faf4a588314618d2747164741de1918205ffbf3
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 24 20:36:30 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 24 20:36:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3faf4a58

games-fps/gzdoom: Version bump to 4.2.3

The shm_open issue with libasmjit has gone away, at least temporarily,
because upstream have reverted to an older version that doesn't use
librt.

Closes: https://bugs.gentoo.org/695192
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest                                 |  2 +-
 .../gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch | 15 +++++++--------
 .../gzdoom/{gzdoom-4.2.1.ebuild => gzdoom-4.2.3.ebuild}   |  5 +++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index bcb0430e517..41800813492 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1 @@
-DIST gzdoom-4.2.1.tar.gz 13660636 BLAKE2B f1399014441d1556cc16e8d89b8c321a0591996fbcf8ad85a99403faef3b4663636b2bc4543982f2fc9ebdba777e88e4685985390d2e798eb01c0cea683305f6 SHA512 37a21bf101442cbe36574666dfb92b28eeee6b4dc982d43a8d5c95255e1f49e2451740b54e100b59120cef67f68f6eb07f687155bbab712854ce7ddc7c0b6c4a
+DIST gzdoom-4.2.3.tar.gz 13682309 BLAKE2B 33bc9b2c3a28b9b692bd2b28ba45dce95274f78eb42b18c17e48b546b5b5f0c19fe09fd9c36fbb27bae4b1235dd8f0bddde0e67e46d07ea3bca776e6768e697a SHA512 d73b643f2ec6dbf7daa5048ba2db0f18968fb054ca9585dd07f18d20707efbe8e41cc3d8b4520d793d9d32ff34e1a6c74b2eaf84d0192d02263b907f5b3bbbc6

diff --git a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
index c74d08a24a4..5a8460e6419 100644
--- a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
+++ b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
@@ -9,14 +9,13 @@ and game_support.pk3) if they so desire.
  CMakeLists.txt | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7860358ef..23d317f42 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -404,10 +404,15 @@ add_subdirectory( libraries/lzma )
- add_subdirectory( tools )
- add_subdirectory( libraries/dumb )
- add_subdirectory( libraries/gdtoa )
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2019-10-20 15:16:08.000000000 +0100
++++ b/CMakeLists.txt	2019-10-24 21:27:58.104006569 +0100
+@@ -444,10 +444,15 @@
+ add_subdirectory( libraries/wildmidi )
+ add_subdirectory( libraries/oplsynth )
+ add_subdirectory( libraries/zmusic )
 +
  add_subdirectory( wadsrc )
 -add_subdirectory( wadsrc_bm )

diff --git a/games-fps/gzdoom/gzdoom-4.2.1.ebuild b/games-fps/gzdoom/gzdoom-4.2.3.ebuild
similarity index 94%
rename from games-fps/gzdoom/gzdoom-4.2.1.ebuild
rename to games-fps/gzdoom/gzdoom-4.2.3.ebuild
index baca2173701..e59ca414756 100644
--- a/games-fps/gzdoom/gzdoom-4.2.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.2.3.ebuild
@@ -30,9 +30,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
+
 PATCHES=(
-	"${FILESDIR}/${P}-install_soundfonts.patch"
-	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
+	"${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
+	"${FILESDIR}/${PN}-4.2.1-Introduce-the-BUILD_NONFREE-option.patch"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2020-09-02 21:41 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2020-09-02 21:41 UTC (permalink / raw
  To: gentoo-commits

commit:     a5d01020198a3aca269e0cc5666db8da0727be0c
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Wed Jun 17 18:50:17 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 21:33:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d01020

games-fps/gzdoom: Version bump to 4.4.2

Closes: https://bugs.gentoo.org/727448
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16301
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest                          |  1 +
 ...-STATIC-for-internal-GZDoom-SPIRV-library.patch | 30 ++++++++
 ...-4.4.2-Introduce-the-BUILD_NONFREE-option.patch | 35 ++++++++++
 games-fps/gzdoom/gzdoom-4.4.2.ebuild               | 81 ++++++++++++++++++++++
 4 files changed, 147 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index c7de0cf9fa7..dbfc90a7a34 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea SHA512 ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1
+DIST gzdoom-4.4.2.tar.gz 12613806 BLAKE2B 7c2f6b490abd8bd23068af7df9ebf111bb09cc7af979d7bf285e744f8cb23c69f360b8cb274ebd354f5885aabeb53c744075696ff8fd5710dd15f07f70b4395b SHA512 cf3fb4588555ef98a1c224ca07e3ab0ee00a39ad6abb4fa7e31ce7ce013f146aa2be6c8303badd7a86b21da2a689cbd1d234c46739f84ee5293745a1189226ba

diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
new file mode 100644
index 00000000000..779268ca6d7
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
@@ -0,0 +1,30 @@
+From c904b7521657e55843bae34f1f958d689538b13b Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Wed, 17 Jun 2020 15:17:49 -0400
+Subject: [PATCH] Force STATIC for internal GZDoom SPIRV library
+
+This makes sure the internal version of this library bundled with the
+GZDoom source code is used. This prevents the system from building
+GZDoom for dynamic linking with an incompatible external library (see
+commit 6fafa297bfe0f82696d898d66e39c50f4f5eef16 and
+<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>).
+---
+ libraries/glslang/spirv/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/glslang/spirv/CMakeLists.txt b/libraries/glslang/spirv/CMakeLists.txt
+index 453ac16b5..d39a6e300 100644
+--- a/libraries/glslang/spirv/CMakeLists.txt
++++ b/libraries/glslang/spirv/CMakeLists.txt
+@@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS
+     SPVRemapper.h
+     doc.h)
+ 
+-add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
++add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
+ set_property(TARGET SPIRV PROPERTY FOLDER glslang)
+ set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_include_directories(SPIRV PUBLIC
+-- 
+2.26.2
+

diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch
new file mode 100644
index 00000000000..d7ece785e25
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch
@@ -0,0 +1,35 @@
+From decf1df37a22c87da78230941209c110f7763f4b Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Sat, 31 Aug 2019 21:23:23 +0900
+Subject: [PATCH] Introduce the BUILD_NONFREE option
+
+This allow users to disable building nonfree components (brightmaps.pk3
+and game_support.pk3) if they so desire.
+---
+ CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4e59452..c2f49b2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -393,10 +393,14 @@ add_subdirectory( libraries/lzma )
+ add_subdirectory( tools )
+ add_subdirectory( libraries/gdtoa )
+ add_subdirectory( wadsrc )
+-add_subdirectory( wadsrc_bm )
+ add_subdirectory( wadsrc_lights )
+-add_subdirectory( wadsrc_extra )
+ add_subdirectory( src )
++option (BUILD_NONFREE "Build nonfree components" ON)
++if( BUILD_NONFREE )
++       add_subdirectory( wadsrc_bm )
++       add_subdirectory( wadsrc_extra )
++endif()
++
+ 
+ if( NOT CMAKE_CROSSCOMPILING )
+ 	export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
+-- 
+2.26.2
+

diff --git a/games-fps/gzdoom/gzdoom-4.4.2.ebuild b/games-fps/gzdoom/gzdoom-4.4.2.ebuild
new file mode 100644
index 00000000000..5c345dd665b
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.4.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+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 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gtk2 +non-free openmp"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/libsdl2[opengl]
+	media-libs/openal
+	media-libs/zmusic
+	sys-libs/zlib
+	virtual/jpeg:0
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
+	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
+	"${FILESDIR}/${P}-Force-STATIC-for-internal-GZDoom-SPIRV-library.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 || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-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
+		-DNO_OPENMP="$(usex !openmp)"
+		-DBUILD_NONFREE="$(usex non-free)"
+	)
+	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
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2021-10-23  7:39 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2021-10-23  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     df34395764ddccaa2fe8454d739802be4aa3c0c4
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sat Oct 23 01:38:14 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 07:34:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df343957

games-fps/gzdoom: Version bump to 4.7.1

Closes: https://bugs.gentoo.org/815274
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest                          |  1 +
 ...-4.7.1-Introduce-the-BUILD_NONFREE-option.patch | 36 ++++++++++
 games-fps/gzdoom/gzdoom-4.7.1.ebuild               | 82 ++++++++++++++++++++++
 3 files changed, 119 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 830e1f26f61..0cb8608c746 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,3 +1,4 @@
 DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764 SHA512 cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
 DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb SHA512 539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
+DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e SHA512 040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/files/gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
new file mode 100644
index 00000000000..9e012a25307
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
@@ -0,0 +1,36 @@
+From d164cfcde29980c23ece15f0be1b09dac5853843 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Sat, 31 Aug 2019 21:23:23 +0900
+Subject: [PATCH] Introduce the BUILD_NONFREE option
+
+This allow users to disable building nonfree components (brightmaps.pk3,
+game_support.pk3, and game_widescreen_gfx.pk3) if they so desire.
+---
+ CMakeLists.txt | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9013d8921..77bd703b1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -411,11 +411,14 @@ add_subdirectory( libraries/lzma )
+ add_subdirectory( tools )
+ add_subdirectory( libraries/gdtoa )
+ add_subdirectory( wadsrc )
+-add_subdirectory( wadsrc_bm )
+ add_subdirectory( wadsrc_lights )
+-add_subdirectory( wadsrc_extra )
+-add_subdirectory( wadsrc_widepix )
+ add_subdirectory( src )
++option (BUILD_NONFREE "Build nonfree components" ON)
++if( BUILD_NONFREE )
++       add_subdirectory( wadsrc_bm )
++       add_subdirectory( wadsrc_extra )
++       add_subdirectory( wadsrc_widepix )
++endif()
+ 
+ if( NOT CMAKE_CROSSCOMPILING )
+ 	export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
+-- 
+2.33.1
+

diff --git a/games-fps/gzdoom/gzdoom-4.7.1.ebuild b/games-fps/gzdoom/gzdoom-4.7.1.ebuild
new file mode 100644
index 00000000000..d0da35c22a2
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.7.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~arm ~x86"
+IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/libsdl2[gles2?,opengl,vulkan?]
+	media-libs/openal
+	media-libs/zmusic
+	sys-libs/zlib
+	virtual/jpeg:0
+	gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.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() {
+	local mycmakeargs=(
+		-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
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2021-12-28 17:10 Ionen Wolkens
  0 siblings, 0 replies; 11+ messages in thread
From: Ionen Wolkens @ 2021-12-28 17:10 UTC (permalink / raw
  To: gentoo-commits

commit:     9d448e9f319856efa39c33057917ec2b89075e24
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 15:06:03 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 17:00:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d448e9f

games-fps/gzdoom: drop 4.7.0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/gzdoom/Manifest                          |  2 -
 ...-4.5.0-Introduce-the-BUILD_NONFREE-option.patch | 36 ---------
 games-fps/gzdoom/gzdoom-4.7.0.ebuild               | 86 ----------------------
 3 files changed, 124 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 759883275350..9712094c2ea3 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,3 +1 @@
-DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb SHA512 539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
 DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e SHA512 040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
-DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
deleted file mode 100644
index 64a230dcd984..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9270c7bdb35d4dce2c270592011498a12a1bf6e7 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Sat, 31 Aug 2019 21:23:23 +0900
-Subject: [PATCH] Introduce the BUILD_NONFREE option
-
-This allow users to disable building nonfree components (brightmaps.pk3,
-game_support.pk3, and game_widescreen_gfx.pk3) if they so desire.
----
- CMakeLists.txt | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3763ec1f..d0c4720bd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -400,11 +400,14 @@ add_subdirectory( libraries/lzma )
- add_subdirectory( tools )
- add_subdirectory( libraries/gdtoa )
- add_subdirectory( wadsrc )
--add_subdirectory( wadsrc_bm )
- add_subdirectory( wadsrc_lights )
--add_subdirectory( wadsrc_extra )
--add_subdirectory( wadsrc_widescreen )
- add_subdirectory( src )
-+option (BUILD_NONFREE "Build nonfree components" ON)
-+if( BUILD_NONFREE )
-+       add_subdirectory( wadsrc_bm )
-+       add_subdirectory( wadsrc_extra )
-+       add_subdirectory( wadsrc_widescreen )
-+endif()
- 
- if( NOT CMAKE_CROSSCOMPILING )
- 	export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
--- 
-2.28.0
-

diff --git a/games-fps/gzdoom/gzdoom-4.7.0.ebuild b/games-fps/gzdoom/gzdoom-4.7.0.ebuild
deleted file mode 100644
index 52da570e32f4..000000000000
--- a/games-fps/gzdoom/gzdoom-4.7.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
-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
-	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.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 ~arm ~x86"
-IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/libsdl2[gles2?,opengl,vulkan?]
-	media-libs/openal
-	media-libs/zmusic
-	sys-libs/zlib
-	virtual/jpeg:0
-	gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.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_widescreen || die
-	else
-		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2022-07-06 22:46 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2022-07-06 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     6d678996b67e8cf3150d03fb17067754587f42d7
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 22:45:35 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 22:45:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d678996

games-fps/gzdoom: Version bump to 4.8.2

Upstream broke this for distros in 4.8.0. This still hasn't been properly fixed,
so we just have to revert the breaking commit in the meantime. OpenSUSE has
already done the same for a while.

Upstream has seemingly also dropped support for 32-bit platforms. OpenSUSE is
reverting the line that prevents the build for working, but I'm trying to find
out more from upstream before we take action.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest                          |   1 +
 ...rt-load-the-hex-font-as-early-as-possible.patch | 129 +++++++++++++++++++++
 games-fps/gzdoom/gzdoom-4.8.2.ebuild               |  85 ++++++++++++++
 3 files changed, 215 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 9712094c2ea3..3fad5682d972 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e SHA512 040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
+DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5 SHA512 5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42

diff --git a/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch b/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch
new file mode 100644
index 000000000000..58a2f7a2b2f4
--- /dev/null
+++ b/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch
@@ -0,0 +1,129 @@
+From 2d00bc6b9f25ae045eecba6e198eaceee9046647 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 6 Jul 2022 23:37:30 +0100
+Subject: [PATCH] Revert "- load the hex font as early as possible."
+
+This reverts commit 010f41a3aad3719b1e5d4d8ce157a5d9b0077b44.
+
+Bug: https://github.com/coelckers/gzdoom/issues/1615
+---
+ src/common/fonts/hexfont.cpp | 24 +++++++-----------------
+ src/d_main.cpp               | 17 +++++++----------
+ 2 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/src/common/fonts/hexfont.cpp b/src/common/fonts/hexfont.cpp
+index 8b50427f4..e2bdbff7a 100644
+--- a/src/common/fonts/hexfont.cpp
++++ b/src/common/fonts/hexfont.cpp
+@@ -58,12 +58,11 @@ struct HexDataSource
+ 	//
+ 	//==========================================================================
+ 
+-	void ParseDefinition(FResourceLump* font)
++	void ParseDefinition(int lumpnum)
+ 	{
+ 		FScanner sc;
+ 
+-		auto data = font->Lock();
+-		sc.OpenMem("newconsolefont.hex", (const char*)data, font->Size());
++		sc.OpenLumpNum(lumpnum);
+ 		sc.SetCMode(true);
+ 		glyphdata.Push(0);	// ensure that index 0 can be used as 'not present'.
+ 		while (sc.GetString())
+@@ -97,7 +96,6 @@ struct HexDataSource
+ 			lumb = i * 255 / 17;
+ 			SmallPal[i] = PalEntry(255, lumb, lumb, lumb);
+ 		}
+-		font->Unlock();
+ 	}
+ };
+ 
+@@ -402,7 +400,7 @@ public:
+ 
+ FFont *CreateHexLumpFont (const char *fontname, int lump)
+ {
+-	assert(hexdata.FirstChar != INT_MAX);
++	if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
+ 	return new FHexFont(fontname, lump);
+ }
+ 
+@@ -414,7 +412,7 @@ FFont *CreateHexLumpFont (const char *fontname, int lump)
+ 
+ FFont *CreateHexLumpFont2(const char *fontname, int lump)
+ {
+-	assert(hexdata.FirstChar != INT_MAX);
++	if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
+ 	return new FHexFont2(fontname, lump);
+ }
+ 
+@@ -426,7 +424,8 @@ FFont *CreateHexLumpFont2(const char *fontname, int lump)
+ 
+ uint8_t* GetHexChar(int codepoint)
+ {
+-	assert(hexdata.FirstChar != INT_MAX);
++	auto lump = fileSystem.CheckNumForFullName("newconsolefont.hex", 0);	// This is always loaded from gzdoom.pk3 to prevent overriding it with incomplete replacements.
++	if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
+ 
+ 	if (hexdata.glyphmap[codepoint] > 0)
+ 	{
+@@ -434,13 +433,4 @@ uint8_t* GetHexChar(int codepoint)
+ 		return &hexdata.glyphdata[offset];
+ 	}
+ 	return nullptr;
+-}
+-
+-void LoadHexFont(const char* filename)
+-{
+-	auto resf = FResourceFile::OpenResourceFile(filename);
+-	if (resf == nullptr) I_FatalError("Unable to open %s", filename);
+-	auto hexfont = resf->FindLump("newconsolefont.hex");
+-	if (hexfont == nullptr) I_FatalError("Unable to find newconsolefont.hex in %s", filename);
+-	hexdata.ParseDefinition(hexfont);
+-}
++}
+\ No newline at end of file
+diff --git a/src/d_main.cpp b/src/d_main.cpp
+index b64142c07..d61807012 100644
+--- a/src/d_main.cpp
++++ b/src/d_main.cpp
+@@ -175,7 +175,6 @@ void FreeSBarInfoScript();
+ void I_UpdateWindowTitle();
+ void S_ParseMusInfo();
+ void D_GrabCVarDefaults();
+-void LoadHexFont(const char* filename);
+ 
+ // PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+ 
+@@ -3535,15 +3534,6 @@ static int D_DoomMain_Internal (void)
+ 	std::set_new_handler(NewFailure);
+ 	const char *batchout = Args->CheckValue("-errorlog");
+ 	
+-	// [RH] Make sure zdoom.pk3 is always loaded,
+-	// as it contains magic stuff we need.
+-	wad = BaseFileSearch(BASEWAD, NULL, true, GameConfig);
+-	if (wad == NULL)
+-	{
+-		I_FatalError("Cannot find " BASEWAD);
+-	}
+-	LoadHexFont(wad);	// load hex font early so we have it during startup.
+-
+ 	C_InitConsole(80*8, 25*8, false);
+ 	I_DetectOS();
+ 
+@@ -3573,6 +3563,13 @@ static int D_DoomMain_Internal (void)
+ 	extern void D_ConfirmSendStats();
+ 	D_ConfirmSendStats();
+ 
++	// [RH] Make sure zdoom.pk3 is always loaded,
++	// as it contains magic stuff we need.
++	wad = BaseFileSearch (BASEWAD, NULL, true, GameConfig);
++	if (wad == NULL)
++	{
++		I_FatalError ("Cannot find " BASEWAD);
++	}
+ 	FString basewad = wad;
+ 
+ 	FString optionalwad = BaseFileSearch(OPTIONALWAD, NULL, true, GameConfig);
+-- 
+2.35.1
+

diff --git a/games-fps/gzdoom/gzdoom-4.8.2.ebuild b/games-fps/gzdoom/gzdoom-4.8.2.ebuild
new file mode 100644
index 000000000000..f697ad1bc5eb
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.8.2.ebuild
@@ -0,0 +1,85 @@
+# 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"
+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}"/0001-Revert-load-the-hex-font-as-early-as-possible.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() {
+	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
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2022-08-06 13:06 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2022-08-06 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     05de9a1d409e70f9075fefb93b6f21d705699ead
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 13:06:08 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 13:06:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05de9a1d

games-fps/gzdoom: Apply proper gzdoom.pk3 path issue fix

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 ...rt-load-the-hex-font-as-early-as-possible.patch | 129 ---------------------
 .../gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch |  36 ++++++
 ...{gzdoom-4.8.2.ebuild => gzdoom-4.8.2-r1.ebuild} |   2 +-
 3 files changed, 37 insertions(+), 130 deletions(-)

diff --git a/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch b/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch
deleted file mode 100644
index 58a2f7a2b2f4..000000000000
--- a/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 2d00bc6b9f25ae045eecba6e198eaceee9046647 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Wed, 6 Jul 2022 23:37:30 +0100
-Subject: [PATCH] Revert "- load the hex font as early as possible."
-
-This reverts commit 010f41a3aad3719b1e5d4d8ce157a5d9b0077b44.
-
-Bug: https://github.com/coelckers/gzdoom/issues/1615
----
- src/common/fonts/hexfont.cpp | 24 +++++++-----------------
- src/d_main.cpp               | 17 +++++++----------
- 2 files changed, 14 insertions(+), 27 deletions(-)
-
-diff --git a/src/common/fonts/hexfont.cpp b/src/common/fonts/hexfont.cpp
-index 8b50427f4..e2bdbff7a 100644
---- a/src/common/fonts/hexfont.cpp
-+++ b/src/common/fonts/hexfont.cpp
-@@ -58,12 +58,11 @@ struct HexDataSource
- 	//
- 	//==========================================================================
- 
--	void ParseDefinition(FResourceLump* font)
-+	void ParseDefinition(int lumpnum)
- 	{
- 		FScanner sc;
- 
--		auto data = font->Lock();
--		sc.OpenMem("newconsolefont.hex", (const char*)data, font->Size());
-+		sc.OpenLumpNum(lumpnum);
- 		sc.SetCMode(true);
- 		glyphdata.Push(0);	// ensure that index 0 can be used as 'not present'.
- 		while (sc.GetString())
-@@ -97,7 +96,6 @@ struct HexDataSource
- 			lumb = i * 255 / 17;
- 			SmallPal[i] = PalEntry(255, lumb, lumb, lumb);
- 		}
--		font->Unlock();
- 	}
- };
- 
-@@ -402,7 +400,7 @@ public:
- 
- FFont *CreateHexLumpFont (const char *fontname, int lump)
- {
--	assert(hexdata.FirstChar != INT_MAX);
-+	if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
- 	return new FHexFont(fontname, lump);
- }
- 
-@@ -414,7 +412,7 @@ FFont *CreateHexLumpFont (const char *fontname, int lump)
- 
- FFont *CreateHexLumpFont2(const char *fontname, int lump)
- {
--	assert(hexdata.FirstChar != INT_MAX);
-+	if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
- 	return new FHexFont2(fontname, lump);
- }
- 
-@@ -426,7 +424,8 @@ FFont *CreateHexLumpFont2(const char *fontname, int lump)
- 
- uint8_t* GetHexChar(int codepoint)
- {
--	assert(hexdata.FirstChar != INT_MAX);
-+	auto lump = fileSystem.CheckNumForFullName("newconsolefont.hex", 0);	// This is always loaded from gzdoom.pk3 to prevent overriding it with incomplete replacements.
-+	if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
- 
- 	if (hexdata.glyphmap[codepoint] > 0)
- 	{
-@@ -434,13 +433,4 @@ uint8_t* GetHexChar(int codepoint)
- 		return &hexdata.glyphdata[offset];
- 	}
- 	return nullptr;
--}
--
--void LoadHexFont(const char* filename)
--{
--	auto resf = FResourceFile::OpenResourceFile(filename);
--	if (resf == nullptr) I_FatalError("Unable to open %s", filename);
--	auto hexfont = resf->FindLump("newconsolefont.hex");
--	if (hexfont == nullptr) I_FatalError("Unable to find newconsolefont.hex in %s", filename);
--	hexdata.ParseDefinition(hexfont);
--}
-+}
-\ No newline at end of file
-diff --git a/src/d_main.cpp b/src/d_main.cpp
-index b64142c07..d61807012 100644
---- a/src/d_main.cpp
-+++ b/src/d_main.cpp
-@@ -175,7 +175,6 @@ void FreeSBarInfoScript();
- void I_UpdateWindowTitle();
- void S_ParseMusInfo();
- void D_GrabCVarDefaults();
--void LoadHexFont(const char* filename);
- 
- // PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
- 
-@@ -3535,15 +3534,6 @@ static int D_DoomMain_Internal (void)
- 	std::set_new_handler(NewFailure);
- 	const char *batchout = Args->CheckValue("-errorlog");
- 	
--	// [RH] Make sure zdoom.pk3 is always loaded,
--	// as it contains magic stuff we need.
--	wad = BaseFileSearch(BASEWAD, NULL, true, GameConfig);
--	if (wad == NULL)
--	{
--		I_FatalError("Cannot find " BASEWAD);
--	}
--	LoadHexFont(wad);	// load hex font early so we have it during startup.
--
- 	C_InitConsole(80*8, 25*8, false);
- 	I_DetectOS();
- 
-@@ -3573,6 +3563,13 @@ static int D_DoomMain_Internal (void)
- 	extern void D_ConfirmSendStats();
- 	D_ConfirmSendStats();
- 
-+	// [RH] Make sure zdoom.pk3 is always loaded,
-+	// as it contains magic stuff we need.
-+	wad = BaseFileSearch (BASEWAD, NULL, true, GameConfig);
-+	if (wad == NULL)
-+	{
-+		I_FatalError ("Cannot find " BASEWAD);
-+	}
- 	FString basewad = wad;
- 
- 	FString optionalwad = BaseFileSearch(OPTIONALWAD, NULL, true, GameConfig);
--- 
-2.35.1
-

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
new file mode 100644
index 000000000000..6070d47566e0
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch
@@ -0,0 +1,36 @@
+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.8.2.ebuild b/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
similarity index 96%
rename from games-fps/gzdoom/gzdoom-4.8.2.ebuild
rename to games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
index ab1b0da8c59c..03a5359074ef 100644
--- a/games-fps/gzdoom/gzdoom-4.8.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${PN}-g${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
-	"${FILESDIR}"/0001-Revert-load-the-hex-font-as-early-as-possible.patch
+	"${FILESDIR}"/${P}-fix-gzdoom-pk3.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2023-06-19 21:00 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2023-06-19 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     b86bff22fa2c93a74b6c39c47326760a1780e01a
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 20:53:31 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 20:59:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86bff22

games-fps/gzdoom: Drop old 4.8.2-r1

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest                          |  1 -
 .../gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch | 36 ---------
 games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild            | 89 ----------------------
 3 files changed, 126 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 66a88cc2bfa1..eeb05548f0af 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
 DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586 SHA512 fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
-DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5 SHA512 5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42

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.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
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2023-06-19 21:00 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2023-06-19 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a97fdf8a6d805af5f0116d24dcd0edcf0f459cee
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 20:59:06 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 20:59:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97fdf8a

games-fps/gzdoom: Patch to fix building with GCC 13

Thanks to Chris Lundgren.

Closes: https://bugs.gentoo.org/907087
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch | 14 ++++++++++++++
 games-fps/gzdoom/gzdoom-4.10.0.ebuild             |  1 +
 2 files changed, 15 insertions(+)

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/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() {


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/
@ 2023-08-07 15:05 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2023-08-07 15:05 UTC (permalink / raw
  To: gentoo-commits

commit:     afdcd6a6ce9c7dbe5e3a87bf6405363efb959c9e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  7 15:04:37 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug  7 15:05:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afdcd6a6

games-fps/gzdoom: Backport my local vs system headers fix

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch | 106 +++++++++++++++++++++
 games-fps/gzdoom/gzdoom-4.10.0.ebuild              |   3 +-
 2 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch
new file mode 100644
index 000000000000..3a3a153b5a6e
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch
@@ -0,0 +1,106 @@
+From b95dbaf914618cccaeaa95c650e02be669e477f8 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 1 Jul 2023 13:36:48 +0100
+Subject: [PATCH] Ensure local headers are used over system headers to avoid
+ breakage
+
+types.h was being picked up from webp rather than locally due to the
+`include_directories` call for GTK (and therefore its -I arguments)
+coming before the same call for the local sources. webp can be pulled in
+via GTK -> gdk-pixbuf -> tiff -> webp.
+
+This can be avoided by specifying `SYSTEM` or `BEFORE` as appropriate
+when calling `include_directories`. I have done both for good measure.
+---
+ src/CMakeLists.txt          | 18 ++++++++++--------
+ tools/zipdir/CMakeLists.txt |  2 +-
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index cf254ad6a..b4d06f9ce 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -97,7 +97,7 @@ else()
+ 				if( NOT DYN_GTK )
+ 					set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK3_LIBRARIES} )
+ 				endif()
+-				include_directories( ${GTK3_INCLUDE_DIRS} )
++				include_directories( SYSTEM ${GTK3_INCLUDE_DIRS} )
+ 				link_directories( ${GTK3_LIBRARY_DIRS} )
+ 			else()
+ 				pkg_check_modules( GTK2 gtk+-2.0 )
+@@ -105,7 +105,7 @@ else()
+ 					if( NOT DYN_GTK )
+ 						set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK2_LIBRARIES} )
+ 					endif()
+-					include_directories( ${GTK2_INCLUDE_DIRS} )
++					include_directories( SYSTEM ${GTK2_INCLUDE_DIRS} )
+ 					link_directories( ${GTK2_LIBRARY_DIRS} )
+ 				else()
+ 					set( NO_GTK ON )
+@@ -132,7 +132,7 @@ else()
+ 	# Non-Windows version also needs SDL except native OS X backend
+ 	if( NOT APPLE OR NOT OSX_COCOA_BACKEND )
+ 		find_package( SDL2 REQUIRED )
+-		include_directories( "${SDL2_INCLUDE_DIR}" )
++		include_directories( SYSTEM "${SDL2_INCLUDE_DIR}" )
+ 		set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${SDL2_LIBRARY}" )
+ 	endif()
+ 
+@@ -143,7 +143,7 @@ if( NOT NO_OPENAL )
+ 		find_package( OpenAL )
+ 		mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR)
+ 		if( OPENAL_INCLUDE_DIR )
+-			include_directories( ${OPENAL_INCLUDE_DIR} )
++			include_directories( SYSTEM ${OPENAL_INCLUDE_DIR} )
+ 			mark_as_advanced(CLEAR OPENAL_LIBRARY)
+ 			if( OPENAL_LIBRARY )
+ 				set( PROJECT_LIBRARIES ${OPENAL_LIBRARY} ${PROJECT_LIBRARIES} )
+@@ -373,17 +373,17 @@ endif()
+ 
+ if( VPX_FOUND )
+ 	add_definitions( "-DUSE_LIBVPX=1" )
+-	include_directories( "${VPX_INCLUDE_DIR}" )
++	include_directories( SYSTEM "${VPX_INCLUDE_DIR}" )
+ 	set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${VPX_LIBRARIES} )
+ else()
+ 	message( SEND_ERROR "Could not find libvpx" )
+ endif()
+ 
+-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
++include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
+ 
+ if( ${HAVE_VM_JIT} )
+ 	add_definitions( -DHAVE_VM_JIT )
+-	include_directories( "${ASMJIT_INCLUDE_DIR}" )
++	include_directories( SYSTEM "${ASMJIT_INCLUDE_DIR}" )
+ 	set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ASMJIT_LIBRARIES}")
+ endif()
+ 
+@@ -1243,7 +1243,9 @@ endif()
+ 
+ target_link_libraries( zdoom ${PROJECT_LIBRARIES} gdtoa lzma ${ZMUSIC_LIBRARIES} )
+ 
+-include_directories( .
++include_directories(
++	BEFORE
++	.
+ 	common/audio/sound
+ 	common/audio/music
+ 	common/2d
+diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt
+index 65eb2fb72..762d9027f 100644
+--- a/tools/zipdir/CMakeLists.txt
++++ b/tools/zipdir/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required( VERSION 3.1.0 )
+ 
+ if( NOT CMAKE_CROSSCOMPILING )
+-	include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
++	include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
+ 	add_executable( zipdir
+ 		zipdir.c )
+ 	target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma )
+-- 
+2.41.0
+

diff --git a/games-fps/gzdoom/gzdoom-4.10.0.ebuild b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
index 16c223070e34..605c7cdcf993 100644
--- a/games-fps/gzdoom/gzdoom-4.10.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.10.0.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=8
@@ -31,6 +31,7 @@ S="${WORKDIR}/${PN}-g${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
 	"${FILESDIR}"/${P}-gcc-13.patch
+	"${FILESDIR}"/${P}-headers.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-08-07 15:05 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-02 21:41 [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2023-08-07 15:05 James Le Cuirot
2023-06-19 21:00 James Le Cuirot
2023-06-19 21:00 James Le Cuirot
2022-08-06 13:06 James Le Cuirot
2022-07-06 22:46 James Le Cuirot
2021-12-28 17:10 Ionen Wolkens
2021-10-23  7:39 James Le Cuirot
2019-10-24 20:37 James Le Cuirot
2019-09-19 22:10 James Le Cuirot
2019-09-05 20:20 James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox