diff options
Diffstat (limited to 'games-fps')
22 files changed, 412 insertions, 154 deletions
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild index bdccbe5b8c9d..3f20abbff21c 100644 --- a/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild +++ b/games-fps/duke3d-data/duke3d-data-1.0-r5.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 @@ -14,7 +14,7 @@ MY_P_GOG="${MY_PN_GOG}_${MY_PV_GOG}" inherit cdrom DESCRIPTION="Duke Nukem 3D (Atomic Edition) data files" -HOMEPAGE="http://www.3drealms.com/" +HOMEPAGE="https://www.3drealms.com/" SRC_URI=" demo? ( "ftp://ftp.3drealms.com/share/${MY_P_DEMO}.zip" ) gog? ( "${MY_P_GOG}.sh" ) diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest index a8203f4a22d7..1e62c1c2e31f 100644 --- a/games-fps/eduke32/Manifest +++ b/games-fps/eduke32/Manifest @@ -5,4 +5,4 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833 -DIST eduke32_src_20230123-10167-1a90b9883.tar.xz 17453612 BLAKE2B 763624f23ccafb340decd879d9906fdf59403f303bb6dd628ca41fae1217cd07cb3b61115101098ce6f897b16ed0783147e7d3c8138af586f23e90b7ea4a920f SHA512 beae1c9a34656530bb031eea9847339af0e28ff9dba029d2ae3539bd726c17f74b3b4929d6fa46c04b1966f985b97dcfd5a5da253d2ecc89d2b50d9ecefacea6 +DIST eduke32_src_20231007-10494-17844a2f6.tar.xz 19190776 BLAKE2B 87652f3705efb66d7777427307de0fa91e3b4bc221e75bb16d8cecdeb91e1f9f26addbc2c49dcc703bc4589f747854c4978cbd53ac4fc954d2e0eb8e45218472 SHA512 4f3cea4e84630a8ec9c125d7b3b0cba12da8d4b6879a757165a59a7fa7bcda32dd16a471560859f7ea5951d8e475fe5d1414bdc3eec05ec765f79fed405a8a9d diff --git a/games-fps/eduke32/eduke32-20230123.10167.ebuild b/games-fps/eduke32/eduke32-20231007.10494.ebuild index 20194e48fa48..49426ee30c6d 100644 --- a/games-fps/eduke32/eduke32-20230123.10167.ebuild +++ b/games-fps/eduke32/eduke32-20231007.10494.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit desktop toolchain-funcs xdg-utils -EGIT_COMMIT="1a90b9883" +EGIT_COMMIT="17844a2f6" MY_BUILD="$(ver_cut 2)" MY_DATE="$(ver_cut 1)" MY_PV_HRP="5.4" @@ -77,9 +77,9 @@ BDEPEND=" PDEPEND="duke3d? ( games-fps/duke3d-data )" PATCHES=( - "${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch" "${FILESDIR}/${PN}-20200505.8904-gcc10.patch" "${FILESDIR}/${PN}-20220204.9957-log-to-tmpdir.patch" + "${FILESDIR}/${PN}-20230926.10459-search-duke3d-path.patch" ) src_unpack() { @@ -139,7 +139,7 @@ src_compile() { SDL_TARGET=2 SIMPLE_MENU=0 STRIP="" - TANDALONE=0 + STANDALONE=0 STARTUP_WINDOW=$(usex gtk 1 0) USE_OPENGL=$(usex opengl 1 0) USE_LIBVPX=$(usex vpx 1 0) diff --git a/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch b/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch deleted file mode 100644 index c35af40c749e..000000000000 --- a/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/source/duke3d/src/common.cpp 2018-04-12 23:03:47.000000000 +0200 -+++ b/source/duke3d/src/common.cpp 2018-05-11 00:04:36.590712915 +0200 -@@ -794,6 +794,8 @@ - - addsearchpath("/usr/share/games/jfduke3d"); - addsearchpath("/usr/local/share/games/jfduke3d"); -+ addsearchpath("/usr/share/games/duke3d"); -+ addsearchpath("/usr/share/duke3d"); - addsearchpath("/usr/share/games/eduke32"); - addsearchpath("/usr/local/share/games/eduke32"); - #elif defined EDUKE32_OSX diff --git a/games-fps/eduke32/files/eduke32-20230926.10459-search-duke3d-path.patch b/games-fps/eduke32/files/eduke32-20230926.10459-search-duke3d-path.patch new file mode 100644 index 000000000000..0bb66794b401 --- /dev/null +++ b/games-fps/eduke32/files/eduke32-20230926.10459-search-duke3d-path.patch @@ -0,0 +1,11 @@ +--- a/source/duke3d/src/common.cpp ++++ b/source/duke3d/src/common.cpp +@@ -642,6 +642,8 @@ + + addsearchpath("/usr/share/games/jfduke3d"); + addsearchpath("/usr/local/share/games/jfduke3d"); ++ addsearchpath("/usr/share/games/duke3d"); ++ addsearchpath("/usr/share/duke3d"); + addsearchpath("/usr/share/games/" APPBASENAME); + addsearchpath("/usr/local/share/games/" APPBASENAME); + addsearchpath("/app/extensions/extra"); diff --git a/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild b/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild index d4d62ccdf6fe..986939eacade 100644 --- a/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild +++ b/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit wrapper MY_FULL_PV=1.9.3 MY_PN="${PN/-bin/}" DESCRIPTION="Quakeworld client with mqwcl functionality and many more features" -HOMEPAGE="http://ezquake.sf.net/" +HOMEPAGE="https://ezquake.sourceforge.net/" SRC_URI=" amd64? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_64.${MY_FULL_PV}.tar.gz mirror://sourceforge/${MY_PN}/${MY_PN}_linux64_${PV}.tar.gz ) diff --git a/games-fps/freedm-data/files/freedm-data-0.12.1-Python-PIL-10.0.0-support.patch b/games-fps/freedm-data/files/freedm-data-0.12.1-Python-PIL-10.0.0-support.patch new file mode 100644 index 000000000000..9cc65812de85 --- /dev/null +++ b/games-fps/freedm-data/files/freedm-data-0.12.1-Python-PIL-10.0.0-support.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/909540 +https://github.com/freedoom/freedoom/issues/1015 +https://github.com/freedoom/freedoom/pull/1027 + +From d64ddc6ea90406e21b4b93f5a1e7f99abfaac0d9 Mon Sep 17 00:00:00 2001 +From: Steven Elliott <selliott512@gmail.com> +Date: Sun, 16 Jul 2023 14:52:04 -0400 +Subject: [PATCH] create_caption: Python PIL 10.0.0 support (#1027) + +To support Python PIL 10.0.0 this change uses newer API textbbox() when +available, and older API textsize() when not. +--- + graphics/text/create_caption | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/graphics/text/create_caption b/graphics/text/create_caption +index 7ddbd8d66..22bc0507d 100755 +--- a/graphics/text/create_caption ++++ b/graphics/text/create_caption +@@ -18,8 +18,21 @@ background_image.load() + background_image = background_image.convert("RGBA") + image = Image.new("RGBA", background_image.size, (0, 0, 0, 0)) + draw = ImageDraw.Draw(image) +-txt1_size = draw.textsize(txt1, font=font) +-txt2_size = draw.textsize(txt2, font=font) ++ ++# Getting the text size is tricky since for newer PIL, such as 10.0.0, only ++# textbbox() is supported, but for older PIL, such 7.2.0, only textsize() ++# is supported. The solution is to default to the newer API, but fallback to ++# the older one when it is not available. ++try: ++ # This newer API returns a four item tuple. The "xy" kwarg is returned in ++ # the first two items, and last two items is the size needed, but with "xy" ++ # added, so passing "(0, 0)" returns the size needed. ++ txt1_size = draw.textbbox(xy=(0, 0), text=txt1, font=font)[2:] ++ txt2_size = draw.textbbox(xy=(0, 0), text=txt2, font=font)[2:] ++except: ++ # This older API simply returns the size needed. ++ txt1_size = draw.textsize(txt1, font=font) ++ txt2_size = draw.textsize(txt2, font=font) + + draw.text( + (5, int(image.height - txt1_size[1] - 5)), diff --git a/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild b/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild index 354720400a4a..29b53f429e6a 100644 --- a/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild +++ b/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild @@ -20,6 +20,10 @@ BDEPEND=" app-text/asciidoc games-util/deutex[png]" +PATCHES=( + "${FILESDIR}"/${PN}-0.12.1-Python-PIL-10.0.0-support.patch +) + S="${WORKDIR}/freedoom-${PV}" DOOMWADPATH=share/doom diff --git a/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch b/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch new file mode 100644 index 000000000000..333bff6d2598 --- /dev/null +++ b/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/909548 +https://github.com/freedoom/freedoom/issues/1015 +https://github.com/freedoom/freedoom/pull/1027 + +From d64ddc6ea90406e21b4b93f5a1e7f99abfaac0d9 Mon Sep 17 00:00:00 2001 +From: Steven Elliott <selliott512@gmail.com> +Date: Sun, 16 Jul 2023 14:52:04 -0400 +Subject: [PATCH] create_caption: Python PIL 10.0.0 support (#1027) + +To support Python PIL 10.0.0 this change uses newer API textbbox() when +available, and older API textsize() when not. +--- + graphics/text/create_caption | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/graphics/text/create_caption b/graphics/text/create_caption +index 7ddbd8d66..22bc0507d 100755 +--- a/graphics/text/create_caption ++++ b/graphics/text/create_caption +@@ -18,8 +18,21 @@ background_image.load() + background_image = background_image.convert("RGBA") + image = Image.new("RGBA", background_image.size, (0, 0, 0, 0)) + draw = ImageDraw.Draw(image) +-txt1_size = draw.textsize(txt1, font=font) +-txt2_size = draw.textsize(txt2, font=font) ++ ++# Getting the text size is tricky since for newer PIL, such as 10.0.0, only ++# textbbox() is supported, but for older PIL, such 7.2.0, only textsize() ++# is supported. The solution is to default to the newer API, but fallback to ++# the older one when it is not available. ++try: ++ # This newer API returns a four item tuple. The "xy" kwarg is returned in ++ # the first two items, and last two items is the size needed, but with "xy" ++ # added, so passing "(0, 0)" returns the size needed. ++ txt1_size = draw.textbbox(xy=(0, 0), text=txt1, font=font)[2:] ++ txt2_size = draw.textbbox(xy=(0, 0), text=txt2, font=font)[2:] ++except: ++ # This older API simply returns the size needed. ++ txt1_size = draw.textsize(txt1, font=font) ++ txt2_size = draw.textsize(txt2, font=font) + + draw.text( + (5, int(image.height - txt1_size[1] - 5)), diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild index 62bcb30b42a9..f50e3558ffb1 100644 --- a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild +++ b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild @@ -20,6 +20,10 @@ BDEPEND=" app-text/asciidoc games-util/deutex[png]" +PATCHES=( + "${FILESDIR}"/${PN}-0.12.1-Python-PIL-10.0.0-support.patch +) + S="${WORKDIR}/freedoom-${PV}" DOOMWADPATH=share/doom 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.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.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/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..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 @@ -30,6 +30,8 @@ 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() { 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 -} diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild new file mode 100644 index 000000000000..e904e35f9cd1 --- /dev/null +++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/quakeforge/quakeforge.git" +else + MY_COMMIT="e799a7ae45b0ab2ad7b642953277db8ccf256cf8" + SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_COMMIT}" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines" +HOMEPAGE="http://www.quakeforge.net/" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="alsa +client debug doc flac jack ncurses oss png sdl vorbis vulkan wildmidi zlib" + +RDEPEND=" + client? ( + media-libs/libsamplerate + net-misc/curl + virtual/opengl + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + alsa? ( media-libs/alsa-lib ) + flac? ( media-libs/flac:= ) + jack? ( virtual/jack ) + sdl? ( media-libs/libsdl[sound] ) + vorbis? ( media-libs/libvorbis ) + vulkan? ( media-libs/vulkan-loader ) + wildmidi? ( media-sound/wildmidi ) + ) + ncurses? ( sys-libs/ncurses:= ) + png? ( media-libs/libpng:= ) + zlib? ( sys-libs/zlib:= )" +DEPEND=" + ${RDEPEND} + client? ( + x11-base/xorg-proto + vulkan? ( dev-util/vulkan-headers ) + )" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + doc? ( + app-doc/doxygen[dot] + >=media-gfx/fig2dev-3.2.9-r1 + )" + +PATCHES=( + "${FILESDIR}"/${P}-skipped-tests.patch +) + +src_prepare() { + default + + echo ${PV} > .tarball-version || die + eautoreconf +} + +src_configure() { + filter-lto #858755 + unset LEX YACC #902997,884287 + + qf_client() { + echo $(usex client $(use_enable ${1}) --disable-${1}) + } + + local econfargs=( + $(qf_client alsa) + $(qf_client flac) + $(qf_client jack) + $(qf_client oss) + $(qf_client sdl) + $(qf_client vorbis) + $(qf_client vulkan) + $(qf_client wildmidi) + $(use_enable client sound) + $(use_enable client vidmode) + $(use_enable debug) + $(use_enable ncurses curses) + $(use_enable png) + $(use_enable zlib) + $(use_with client x) + --disable-Werror + --disable-dga + --enable-xdg + # non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio) + --with-clients=$(usev client x11) + --with-cpp="$(tc-getCPP) -x c %u %d %s -o %o %i" # see config.d/qfcc.m4 + --with-global-cfg="${EPREFIX}"/etc/quakeforge.conf + --with-sharepath="${EPREFIX}"/usr/share/quake1 + ) + + econf "${econfargs[@]}" +} + +src_compile() { + default + + use doc && emake doc +} + +src_install() { + use doc && local HTML_DOCS=( doxygen/html/. ) + + emake -j1 DESTDIR="${D}" install + einstalldocs + + find "${ED}" -name '*.la' -delete || die + + local DISABLE_AUTOFORMATTING="yes" + local DOC_CONTENTS=\ +"Before you can play (using nq-x11 or qw-client-x11), you must ensure +that ${PN} can find your Quake pak0.pak (and optionally pak1.pak) +at one of these locations with lowercase filenames: + - '~/.local/share/${PN}/id1/pak0.pak' + - '${EPREFIX}/usr/share/quake1/id1/pak0.pak' + +You can add them yourself or use either of: + - games-fps/quake1-data: install from a Quake CD-ROM + - games-fps/quake1-demodata: pak0.pak only (limited demo) + +Key binds notes: + Defaults ('imt_mod' table) expect you to set key binds manually in: + - '~/.local/share/${PN}/id1/autoexec.cfg' (or '${EPREFIX}/usr/share/quake1/id1') + For the in-game bind menu to be usable ('imt_0' table), bring up the + console with backtick \`, and run 'imt imt_0' (only needed once). + A mouse-grab bind ('toggle in_grab') and using freelook is recommended. + +Audio/Video notes: + Can add settings in: + - '~/.config/${PN}/${PN}.conf' (or '${EPREFIX}/etc/${PN}.conf') + Examples: + - set vid_width 800 + - set vid_height 600 + - set snd_output sdl (or alsa, jack, oss -- sdl can do pulseaudio) + - setrom vid_render gl (or vulkan, sw for software rendering)" + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then + elog "Migration may be needed for ${PN}'s home paths, now using:" + elog " ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf" + elog " ~/.${PN}/ -> ~/.local/share/${PN}/" + elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)." + fi + + if use vulkan; then + ewarn "You've enabled the new vulkan support that is still experimental and yet" + ewarn "used by default. If have issues, can use '+setrom vid_render gl' command" + ewarn "line option to revert to GL." + fi +} diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild index 9c6f72e80f93..df728f289149 100644 --- a/games-fps/quakeforge/quakeforge-9999.ebuild +++ b/games-fps/quakeforge/quakeforge-9999.ebuild @@ -55,7 +55,7 @@ BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen[dot] - media-gfx/transfig + >=media-gfx/fig2dev-3.2.9-r1 )" src_prepare() { diff --git a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild index 07743ada8ed5..bf55e42b5ace 100644 --- a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild +++ b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="Adds stencil shadows and per pixel lights to quake" -HOMEPAGE="http://tenebrae.sourceforge.net/" +HOMEPAGE="https://tenebrae.sourceforge.net/" SRC_URI="mirror://sourceforge/tenebrae/tenebraedata.zip mirror://gentoo/${P}.tbz2" S="${WORKDIR}" diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild index b0041846f317..28b623b2193d 100644 --- a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild +++ b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.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 @@ -68,7 +68,7 @@ src_configure() { src_compile() { # Workaround for used zlib macro, which got renamed in Gentoo # wrt bug #449510 - append-cppflags "-DOF=_Z_OF" + has_version "<sys-libs/zlib-1.3" && append-cppflags "-DOF=_Z_OF" local myemakeargs=( ARCH=$(usex amd64 "x86_64" "i686" ) diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest index 1e1cdbcaa3e9..0416a5788373 100644 --- a/games-fps/xonotic/Manifest +++ b/games-fps/xonotic/Manifest @@ -1 +1 @@ -DIST xonotic-0.8.5.zip 1228561792 BLAKE2B 3f1391ff6522c8f6b7b4f717aecd6ffe852142d70e7cffff9cb5a602a69142c59850636cc1450aade5ae39088354170b819f696427ba8829bf7c375029f2430a SHA512 4ffc4b73eeb5f580d178a98419d5b44cbff0c56e356a62baa729b5b7a6c3d43b2b425b123428c9b1bf3f4718eaf61bcf5d62914521cc061c7563a253440c807e +DIST xonotic-0.8.6.zip 1238439495 BLAKE2B f9a9823a2ef8a1a8790c92fe898599938ff39fe9a32bb1f3595a4b451237f7fca29385feeaf8164216713a2cbe2db4d78cadeee91bb08093dae4a7ad1588e4d4 SHA512 cb39879e96f19abb2877588c2d50c5d3e64dd68153bec3dd1bebedf4d765e506afa419c28381d7005aed664cb1a042571c132b5b319e4308cab67745d996c2a6 diff --git a/games-fps/xonotic/xonotic-0.8.5.ebuild b/games-fps/xonotic/xonotic-0.8.6.ebuild index de5cb5d5a726..9848e246cedb 100644 --- a/games-fps/xonotic/xonotic-0.8.5.ebuild +++ b/games-fps/xonotic/xonotic-0.8.6.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 @@ -60,13 +60,15 @@ src_prepare() { src_compile() { tc-export CC + # do not pass in array to keep the makefile.inc's += flags + local -x CPUOPTIMIZATIONS=${CFLAGS} + local emakeargs=( -C source/darkplaces DEFAULT_SNDAPI=$(usex alsa ALSA OSS) DP_FS_BASEDIR="${EPREFIX}"/usr/share/${PN} DP_LINK_ODE=$(usex ode shared no) STRIP=: - CPUOPTIMIZATIONS="${CFLAGS}" GENTOO_LDFLAGS="${LDFLAGS}" ) |