From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- games-fps/prboom-plus/Manifest | 7 +-- ...plus-2.5.1.7.82-Add-CMake-install-targets.patch | 59 -------------------- ...stall-rules-for-prboom-plus-documentation.patch | 63 --------------------- ...Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch | 29 ++++++++++ .../prboom-plus/prboom-plus-2.5.1.7.82.ebuild | 65 ---------------------- games-fps/prboom-plus/prboom-plus-2.6.ebuild | 63 +++++++++++++++++++++ 6 files changed, 95 insertions(+), 191 deletions(-) delete mode 100644 games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch delete mode 100644 games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch create mode 100644 games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch delete mode 100644 games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild create mode 100644 games-fps/prboom-plus/prboom-plus-2.6.ebuild (limited to 'games-fps/prboom-plus') 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 -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} $ - ) - 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 -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 +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.5.1.7.82.ebuild deleted file mode 100644 index 5736a368a569..000000000000 --- a/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2019-2020 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" - -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" -KEYWORDS="~amd64 ~x86" -IUSE="dumb fluidsynth mad net +opengl +pcre portmidi sdl2-image +sdl2-mixer server vorbis zlib" -REQUIRED_USE="server? ( net )" - -DEPEND=" - media-libs/libsdl2[opengl?,joystick,sound,video] - dumb? ( media-libs/dumb:= ) - fluidsynth? ( media-sound/fluidsynth:= ) - mad? ( media-libs/libmad ) - net? ( media-libs/sdl2-net ) - pcre? ( dev-libs/libpcre:3 ) - portmidi? ( media-libs/portmidi ) - sdl2-image? ( media-libs/sdl2-image ) - sdl2-mixer? ( media-libs/sdl2-mixer[midi] ) - vorbis? ( media-libs/libvorbis ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-master/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 - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_GL="$(usex opengl)" - -DWITH_IMAGE="$(usex sdl2-image)" - -DWITH_MIXER="$(usex sdl2-mixer)" - -DWITH_NET="$(usex net)" - -DWITH_PCRE="$(usex pcre)" - -DWITH_ZLIB="$(usex zlib)" - -DWITH_MAD="$(usex mad)" - -DWITH_FLUIDSYNTH="$(usex fluidsynth)" - -DWITH_DUMB="$(usex dumb)" - -DWITH_VORBISFILE="$(usex vorbis)" - -DWITH_PORTMIDI="$(usex portmidi)" - -DDOOMWADDIR="${EPREFIX}/usr/share/doom" - -DWAD_INSTALL_PATH="${EPREFIX}/usr/share/doom" - -DBUILD_SERVER="$(usex server)" - ) - cmake_src_configure -} - -src_install() { - doicon -s scalable ICONS/${PN}.svg - domenu ICONS/${PN}.desktop - cmake_src_install -} diff --git a/games-fps/prboom-plus/prboom-plus-2.6.ebuild b/games-fps/prboom-plus/prboom-plus-2.6.ebuild new file mode 100644 index 000000000000..dcd77904bd3f --- /dev/null +++ b/games-fps/prboom-plus/prboom-plus-2.6.ebuild @@ -0,0 +1,63 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop xdg + +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}_${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" +KEYWORDS="~amd64 ~x86" +IUSE="dumb fluidsynth mad net +opengl +pcre portmidi sdl2-image +sdl2-mixer server vorbis zlib" +REQUIRED_USE="server? ( net )" + +DEPEND=" + media-libs/libsdl2[opengl?,joystick,sound,video] + dumb? ( media-libs/dumb:= ) + fluidsynth? ( media-sound/fluidsynth:= ) + mad? ( media-libs/libmad ) + net? ( media-libs/sdl2-net ) + pcre? ( dev-libs/libpcre:3 ) + portmidi? ( media-libs/portmidi ) + sdl2-image? ( media-libs/sdl2-image ) + sdl2-mixer? ( media-libs/sdl2-mixer[midi] ) + vorbis? ( media-libs/libvorbis ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${P}um/prboom2" + +src_prepare() { + eapply -p2 "${FILESDIR}/${P}-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch" + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_GL="$(usex opengl)" + -DWITH_IMAGE="$(usex sdl2-image)" + -DWITH_MIXER="$(usex sdl2-mixer)" + -DWITH_NET="$(usex net)" + -DWITH_PCRE="$(usex pcre)" + -DWITH_ZLIB="$(usex zlib)" + -DWITH_MAD="$(usex mad)" + -DWITH_FLUIDSYNTH="$(usex fluidsynth)" + -DWITH_DUMB="$(usex dumb)" + -DWITH_VORBISFILE="$(usex vorbis)" + -DWITH_PORTMIDI="$(usex portmidi)" + -DDOOMWADDIR="${EPREFIX}/usr/share/doom" + -DWAD_DATA_PATH="${EPREFIX}/usr/share/doom" + -DBUILD_SERVER="$(usex server)" + ) + cmake_src_configure +} + +src_install() { + doicon -s scalable ICONS/${PN}.svg + domenu ICONS/${PN}.desktop + cmake_src_install +} -- cgit v1.2.3