summaryrefslogtreecommitdiff
path: root/games-fps
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-03 10:28:17 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-03 10:28:17 +0000
commitd99093fb4bb5652015c06274d64083daa2439e4f (patch)
treecf61513204d97974179580065e85df5c8009087c /games-fps
parent463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
gentoo resync : 03.03.2021
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/Manifest.gzbin10868 -> 10866 bytes
-rw-r--r--games-fps/eduke32/Manifest4
-rw-r--r--games-fps/eduke32/eduke32-20210221.9314.ebuild (renamed from games-fps/eduke32/eduke32-20210127.9308.ebuild)4
-rw-r--r--games-fps/prboom-plus/Manifest7
-rw-r--r--games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch59
-rw-r--r--games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch63
-rw-r--r--games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch29
-rw-r--r--games-fps/prboom-plus/prboom-plus-2.6.ebuild (renamed from games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild)12
8 files changed, 41 insertions, 137 deletions
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 460e85772316..2151c422fe56 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
Binary files differ
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index c61f683a8e8d..411f80dd0230 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -10,6 +10,6 @@ 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_20210127-9308-421b54a8a.tar.xz 19944696 BLAKE2B 196ff6f81e5b87de3c5111c192c1c27c37afca786341eb03c8f704639291e182f2e14a7dd042c92a19fc6b0b5d8639356974a609bade614c4c33f42e04c1f017 SHA512 99299dded2874df996ef00e458ea644a769b46969d296ed5596838978d8835d12d6123445dfa3fd3a6a9e9eefc447fe4af8d2a9c36c000a76a515681bbded636
-EBUILD eduke32-20210127.9308.ebuild 5752 BLAKE2B c175876464d8bc54fd15f83dc21a3b7bb92a797429373c653ce76447119bb0dadebf0c11466637eb507f6c4ee8d5b5b3a0864d830daa8f2c1826b513717daf9a SHA512 ba4c95168883606ae3109807c92524106e75de93c04d65bc043c9edbb85d8bb346a17c6e09355fe8d7858bac570b36c5bcf7ee674b0569f54cc8e760f4b2aae3
+DIST eduke32_src_20210221-9314-a2d4c2794.tar.xz 19940764 BLAKE2B 9ea44f30cfa1737cf9e6cbd4db79530b3fc1dc109cc7ab9229dd19415e8a035992846d75e59460ae798c1d308de24510ff0eae4b149d8f8a3c4ace32e4010776 SHA512 a40902dd54a92cb333c61cd2e3a88f4760ea38ba0125f7770c4a0a9145d7c1be10e3df310d0dc20565e97fe3deb61678fb7ea79b918c7fafe0b9692b30e64047
+EBUILD eduke32-20210221.9314.ebuild 5752 BLAKE2B d9ce32221eca10151e1aeb16193c2b9e34502806f39768d6414cf608f6f6d6d9deb9dc0f9f4028a976cd434982c44922bbadbe26b5617627404797b2e555afbd SHA512 1d172a77f0f55aa4d8a98830be93cfeed75cae42f355809a0eeb47edacaebeec0fbf4b6e3b05b282508701dfcbd50cca497fe3b6ed16025c2cb78fc40eacef5e
MISC metadata.xml 1695 BLAKE2B 0d309ad2873afa0f103b2f37a585f0a80aed38fc360cac2e15bf7bbde421b30193bbcfa068339f2105ddf1bc02155fb3e803ce0d555a7659f88c6248dfeba62f SHA512 252924650afd01827d4cd39d6a7b43eb4fb8616f629e89a9b8ee9828de68f1586c63e458623e31f7e954320e50b081279edf88b0da935daaa5154d8a7d901597
diff --git a/games-fps/eduke32/eduke32-20210127.9308.ebuild b/games-fps/eduke32/eduke32-20210221.9314.ebuild
index 7ae2cbd8524c..1cf5593bfd6a 100644
--- a/games-fps/eduke32/eduke32-20210127.9308.ebuild
+++ b/games-fps/eduke32/eduke32-20210221.9314.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit desktop toolchain-funcs xdg-utils
-EGIT_COMMIT="421b54a8a"
+EGIT_COMMIT="a2d4c2794"
MY_BUILD="$(ver_cut 2)"
MY_DATE="$(ver_cut 1)"
MY_PV_HRP="5.4"
@@ -75,7 +75,7 @@ BDEPEND="
x86? ( dev-lang/nasm )
"
-PDEDEND="duke3d? ( games-fps/duke3d-data )"
+PDEPEND="duke3d? ( games-fps/duke3d-data )"
PATCHES=(
"${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 3dfeaf5fb157..b4033515b033 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1,5 +1,4 @@
-AUX prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch 2501 BLAKE2B 66496503315613582a99c89bcf53afcc96fd4749a352dcf285461d3a528d34523e2fbb83134b42ce8391749c29b5d68e0adc5acd2344bdc79ea3716135c806cb SHA512 e18e732c53207a6658f24d17ca68feb4b78930c83e5b55f370d4a63f05d190301a81a5f11a3dc9df9bcdcd73fd803713a8fd37e9529e7399b3d0974e1dcc2055
-AUX prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch 1799 BLAKE2B 45f55771db27a741d50b7fce2027000e2b2227cdc9cfdda574c1eda7afa98b1af9a1d792428e145507c5e4bcdeda4aba97b7030b88259dc6a7584c9f03cc8dd3 SHA512 744c15e5164ecca8d622fae408f6bcff0e50bc07c57733b0bab9e8a447da18b9403095ca813c1158b345f118ceaf62d6e2f6db28b7177cd8dacc6bb3e61dc7fa
-DIST prboom-plus-2.5.1.7.82.tar.gz 1541604 BLAKE2B 7c10754aa5f85879b63a3778d87e8e2fcd21fcd5092f96a31dc087e878ca080b9ce48d2e7d8f5cac9aa05c8a69cf5f6e9661a5b581de7afe21d59a18af2e57e9 SHA512 55f0ec4edcbac80174aadc63f1f77f3b868a6d1e8efc309ed6f71898d486a3c31d18e08130c9b4a6afd63185003bfd11e6b5940b550071f60168b3c716845f0f
-EBUILD prboom-plus-2.5.1.7.82.ebuild 1987 BLAKE2B 365193abb83471e9ce41f714defbd36c638c50aeec9995cc692f68ac9ad027ec0022091497eb830c7f3993e357548879aed72f81fb6330f32f8c42e51adf6de7 SHA512 c3f398a6dc7a5390d86e8a5781f93b1bf7fefcb2a81d87ea6e60ae0bb3676043e82f90332b658b5da73642413e30af82999337129315252ed1d59bcae493d548
+AUX prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch 1141 BLAKE2B 0fbb9af4874c3bcdec3ae822e7b1f213d68ece3381ad80a75ea0fc5f5f8b5b872fa07def7729e38c5a74b32fdf4bc33d748cc6a3f29beea58eff9a08b9508647 SHA512 4da358bca4d8034649842c7b96c22a087e18c5c8263a7e74e5c9d7225102f14dd071223dd0ba8c3f75bf9c57abd9fc475017299a435fae6dfa07b86fdd7ef741
+DIST prboom-plus-2.6.tar.gz 1526732 BLAKE2B 00c0eeb0dfb5a99a427c986e557b6616e69be3b98373582c3aa54585136e3a16b67c0176faec59ebc011112bc8764da78b34215ae4c00b490f12820b26704e45 SHA512 c2f8c6895683ee22d729ad2c9dc10bd821e5bdb55d75b88b4c6db25b8f3604370d18285677660c82761912a159b0c1068a6fcf1c8333e20d849fa1087a74800f
+EBUILD prboom-plus-2.6.ebuild 1845 BLAKE2B eb9a95fbee8274dd371c5dc5e402d3356f4ceeec6c7d1eef997ef5a2ab93c9fbf8191dde475d4a8bc7bb9993f99cd85444d4f03c2e8f8b644fce834b5eca378f SHA512 fd3592ba16a0ee0af7e686f893533e7bbe4900d641c383dc951cf77f25b4d6f22080b824dcad098ae04c22de41878fdc29a54c7f20492bfcb92c0cc43bbb1675
MISC metadata.xml 1897 BLAKE2B 11935d4ca429c123e759fbe7e32ab94a8f8783fdba95d0c65bbd2780f8f86110007c897f0530407647e5aed1603bf962a171234298676779b1e32042aa4c8258 SHA512 e5d67ba4b226cf843fb473bc08727c4431382a8fede6c43f4699b702bff0dd6747306a3abf205d2fd00f11bd421493cf2c8967726bfcb5c18314ee6fd35d1417
diff --git a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
deleted file mode 100644
index b506fdd6aacc..000000000000
--- a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From b123022530997df901abbfc7f8dab2846e7d1d7a Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Sat, 6 Jun 2020 13:39:46 -0400
-Subject: [PATCH] Add CMake install targets
-
-Fixes: https://github.com/coelckers/prboom-plus/issues/70
----
- prboom2/CMakeLists.txt | 2 +-
- prboom2/data/CMakeLists.txt | 2 ++
- prboom2/src/CMakeLists.txt | 3 +++
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
-index 4aba6b94..932182b6 100644
---- a/prboom2/CMakeLists.txt
-+++ b/prboom2/CMakeLists.txt
-@@ -150,7 +150,7 @@ check_symbol_exists(SDL_JoystickGetAxis "SDL.h" HAVE_SDL_JOYSTICKGETAXIS)
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_PREV})
- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_PREV})
-
--set(DOOMWADDIR "${CMAKE_INSTALL_PREFIX}/share/games/doom" CACHE PATH "Path to install prboom.wad and look for other WAD files")
-+set(DOOMWADDIR "${CMAKE_INSTALL_PREFIX}/share/games/doom" CACHE PATH "Path to look for WAD files")
-
- option(SIMPLECHECKS "Enable checks which only impose significant overhead if a posible error is detected" ON)
- option(ZONEIDCHECK "Enable id checks on zone blocks, to detect corrupted and illegally freed blocks" ON)
-diff --git a/prboom2/data/CMakeLists.txt b/prboom2/data/CMakeLists.txt
-index b855e9e5..33e1d873 100644
---- a/prboom2/data/CMakeLists.txt
-+++ b/prboom2/data/CMakeLists.txt
-@@ -362,3 +362,5 @@ add_custom_command(
- DEPENDS rdatawad ${WAD_SRC}
- )
- add_custom_target(prboomwad DEPENDS ${WAD_DATA_PATH})
-+set(WAD_INSTALL_PATH ${DOOMWADDIR} CACHE PATH "Path to install prboom.wad")
-+install(FILES ${WAD_DATA_PATH} DESTINATION ${WAD_INSTALL_PATH} COMPONENT "PrBoom-Plus internal WAD")
-diff --git a/prboom2/src/CMakeLists.txt b/prboom2/src/CMakeLists.txt
-index b5a0f6bd..89505603 100644
---- a/prboom2/src/CMakeLists.txt
-+++ b/prboom2/src/CMakeLists.txt
-@@ -340,6 +340,8 @@ function(AddGameExecutable TARGET SOURCES)
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${WAD_DATA_PATH} $<TARGET_FILE_DIR:prboom-plus>
- )
- endif()
-+
-+ install(TARGETS ${TARGET} COMPONENT "Game executable")
- endfunction()
-
- AddGameExecutable(prboom-plus "${PRBOOM_PLUS_SOURCES}")
-@@ -426,6 +428,7 @@ if(BUILD_SERVER AND SDL2_NET_FOUND)
- RUNTIME_OUTPUT_DIRECTORY ${PRBOOM_OUTPUT_PATH}
- )
- ApplySDL2NetOptions(prboom-plus-game-server)
-+ install(TARGETS prboom-plus-game-server COMPONENT "Game server executable")
- endif()
-
-
---
-2.26.2
-
diff --git a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
deleted file mode 100644
index dee4306a4378..000000000000
--- a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 3be21f1964d1446962adc15acf1e5d993708780f Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Tue, 11 Aug 2020 20:25:46 -0400
-Subject: [PATCH] Add install rules for prboom-plus documentation
-
----
- prboom2/CMakeLists.txt | 3 +++
- prboom2/doc/CMakeLists.txt | 24 ++++++++++++++++++++++++
- 2 files changed, 27 insertions(+)
- create mode 100644 prboom2/doc/CMakeLists.txt
-
-diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
-index ec1885a5..52d91e19 100644
---- a/prboom2/CMakeLists.txt
-+++ b/prboom2/CMakeLists.txt
-@@ -9,6 +9,8 @@ include(TargetArch)
- include(TestBigEndian)
- TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
-
-+include(GNUInstallDirs)
-+
- # Automated dependencies discovery, mostly needed for MSVC
- target_architecture(TARGET_ARCH)
- if(${TARGET_ARCH} MATCHES "i386")
-@@ -184,4 +186,5 @@ set(WAD_DATA prboom-plus.wad)
- set(WAD_DATA_PATH "${PRBOOM_OUTPUT_PATH}/${WAD_DATA}")
-
- add_subdirectory(data)
-+add_subdirectory(doc)
- add_subdirectory(src)
-diff --git a/prboom2/doc/CMakeLists.txt b/prboom2/doc/CMakeLists.txt
-new file mode 100644
-index 00000000..9f9b96c8
---- /dev/null
-+++ b/prboom2/doc/CMakeLists.txt
-@@ -0,0 +1,24 @@
-+set(DOC_FILES
-+ boom.txt
-+ DeePBSPV4specs.txt
-+ MBFFAQ.txt
-+ MBF.txt
-+ prboom-plus-history.html
-+ prboom-plus-history.txt
-+ prboom-plus-usage.txt
-+ README.command-line
-+ README.compat
-+ README.demos
-+ umapinfo.txt
-+)
-+set(MAN5_FILES
-+ prboom-plus.cfg.5
-+)
-+set(MAN6_FILES
-+ prboom-plus.6
-+ prboom-plus-game-server.6
-+)
-+
-+install(FILES ${DOC_FILES} TYPE DOC COMPONENT "Documentation")
-+install(FILES ${MAN5_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man5" COMPONENT "Manpages")
-+install(FILES ${MAN6_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT "Manpages")
---
-2.28.0
-
diff --git a/games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch b/games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch
new file mode 100644
index 000000000000..8f07606acd3c
--- /dev/null
+++ b/games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch
@@ -0,0 +1,29 @@
+From 9f56505b7c41337cab3a6ce3f882cf8df6bf29a9 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Mon, 22 Feb 2021 18:27:24 +0900
+Subject: [PATCH] Set CMAKE_INSTALL_DOCDIR as a cache entry
+
+CMAKE_INSTALL_DOCDIR is being unconditionally set which prevents users
+from supplying their own docdir preference. This changes the behavior to
+set CMAKE_INSTALL_DOCDIR as a cache entry so that users can override the
+default install location if they so wish.
+---
+ prboom2/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index 9c2c1fde..3110d7f3 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -38,7 +38,7 @@ set(PACKAGE_TARNAME "prboom-plus")
+ set(PACKAGE_VERSION "${PROJECT_VERSION}um")
+ set(PACKAGE_HOMEPAGE "${PROJECT_HOMEPAGE_URL}")
+ set(PACKAGE_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
+-set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_TARNAME}")
++set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_TARNAME}" CACHE PATH "")
+
+ include(CheckSymbolExists)
+
+--
+2.30.1
+
diff --git a/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild b/games-fps/prboom-plus/prboom-plus-2.6.ebuild
index 5736a368a569..dcd77904bd3f 100644
--- a/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild
+++ b/games-fps/prboom-plus/prboom-plus-2.6.ebuild
@@ -1,14 +1,13 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake desktop xdg
-MY_PV=$(ver_rs 4 "um+git")
DESCRIPTION="An enhanced clone of the classic first-person shooter Doom"
HOMEPAGE="https://github.com/coelckers/prboom-plus/"
-SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${MY_PV}.orig.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${PV}um.orig.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+ GPL-3+ BSD BSD-2 BSD-with-disclosure CC-BY-3.0 CC0-1.0 LGPL-2.1+ MIT public-domain"
SLOT="0"
@@ -30,11 +29,10 @@ DEPEND="
zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-master/prboom2"
+S="${WORKDIR}/${P}um/prboom2"
src_prepare() {
- eapply -p2 "${FILESDIR}"/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
- eapply -p2 "${FILESDIR}"/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
+ eapply -p2 "${FILESDIR}/${P}-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch"
cmake_src_prepare
}
@@ -52,7 +50,7 @@ src_configure() {
-DWITH_VORBISFILE="$(usex vorbis)"
-DWITH_PORTMIDI="$(usex portmidi)"
-DDOOMWADDIR="${EPREFIX}/usr/share/doom"
- -DWAD_INSTALL_PATH="${EPREFIX}/usr/share/doom"
+ -DWAD_DATA_PATH="${EPREFIX}/usr/share/doom"
-DBUILD_SERVER="$(usex server)"
)
cmake_src_configure
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 10:56:44 +0000