[gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/, games-fps/prboom-plus/files/
commit: 6062d5d5a197fdfdffa9559bcc671ce70af67db5
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Dec 28 15:05:07 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Dec 28 17:00:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6062d5d5
games-fps/prboom-plus: drop 2.6
Signed-off-by: Ionen Wolkens gentoo.org>
games-fps/prboom-plus/Manifest | 1 -
...Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch | 29 --
games-fps/prboom-plus/prboom-plus-2.6.ebuild | 63 --
3 files changed, 93 deletions(-)
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index fc0ddfcd9b98..11f61226eb91 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1,2 +1 @@
DIST prboom-plus-2.6.1.tar.gz 1555792 BLAKE2B
accb919039b966952340a18b3a37b9c2401a20c1f9562829ba531bf4dafc5e876d7d1212e9ba58886c7469a86b3170c48973cbd8af8ab03d1f2d685813c39607
SHA512
6ae628a453930d4fe3901d186a7c450276d023db6b38e678463f52d463a697819cea1022510030f7405bee8244c3dec04d00741fee8de839775e6e0965f0df39
-DIST prboom-plus-2.6.tar.gz 1526732 BLAKE2B
00c0eeb0dfb5a99a427c986e557b6616e69be3b98373582c3aa54585136e3a16b67c0176faec59ebc02bc8764da78b34215ae4c00b490f12820b26704e45
SHA512
c2f8c6895683ee22d729ad2c9dc10bd821e5bdb55d75b88b4c6db25b8f3604370d18285677660c82761912a159b0c1068a6fcf1c8333e20d849fa1087a74800f
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
deleted file mode 100644
index 8f07606acd3c..
---
a/games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.6.ebuild
b/games-fps/prboom-plus/prboom-plus-2.6.ebuild
deleted file mode 100644
index dcd77904bd3f..
--- a/games-fps/prboom-plus/prboom-plus-2.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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
[gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/, games-fps/prboom-plus/files/
commit: c22715614a24c3347d7161a221b943976b7d8c07
Author: William Breathitt Gray gmail com>
AuthorDate: Tue Aug 17 22:42:43 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Aug 27 09:30:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2271561
games-fps/prboom-plus: Bump to version 2.6.1
Closes: https://bugs.gentoo.org/808797
Signed-off-by: William Breathitt Gray gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22046
Signed-off-by: Ionen Wolkens gentoo.org>
games-fps/prboom-plus/Manifest | 1 +
...ard-OpenGL-call-in-D_Display-with-GL_DOOM.patch | 28 +
games-fps/prboom-plus/prboom-plus-2.6.1.ebuild | 66 ++
3 files changed, 95 insertions(+)
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index e2d5bed539e..fc0ddfcd9b9 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1 +1,2 @@
+DIST prboom-plus-2.6.1.tar.gz 1555792 BLAKE2B
accb919039b966952340a18b3a37b9c2401a20c1f9562829ba531bf4dafc5e876d7d1212e9ba58886c7469a86b3170c48973cbd8af8ab03d1f2d685813c39607
SHA512
6ae628a453930d4fe3901d186a7c450276d023db6b38e678463f52d463a697819cea1022510030f7405bee8244c3dec04d00741fee8de839775e6e0965f0df39
DIST prboom-plus-2.6.tar.gz 1526732 BLAKE2B
00c0eeb0dfb5a99a427c986e557b6616e69be3b98373582c3aa54585136e3a16b67c0176faec59ebc02bc8764da78b34215ae4c00b490f12820b26704e45
SHA512
c2f8c6895683ee22d729ad2c9dc10bd821e5bdb55d75b88b4c6db25b8f3604370d18285677660c82761912a159b0c1068a6fcf1c8333e20d849fa1087a74800f
diff --git
a/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch
b/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch
new file mode 100644
index 000..78a0285703f
--- /dev/null
+++
b/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch
@@ -0,0 +1,28 @@
+From eca393ffd3c05279150a29e104953c0234a59736 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray
+Date: Fri, 27 Aug 2021 12:06:45 +0900
+Subject: [PATCH] Guard OpenGL call in D_Display() with GL_DOOM
+
+Fixes: https://github.com/coelckers/prboom-plus/issues/382
+---
+ prboom2/src/d_main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/prboom2/src/d_main.c b/prboom2/src/d_main.c
+index 16a9efc2..4fe97465 100644
+--- a/prboom2/src/d_main.c
b/prboom2/src/d_main.c
+@@ -395,8 +395,10 @@ void D_Display (fixed_t frac)
+ R_DrawViewBorder();
+ HU_Drawer();
+
++#ifdef GL_DOOM
+ if (V_GetMode() == VID_MODEGL)
+ gld_ProcessExtraAlpha();
++#endif
+ }
+
+ isborderstate = isborder;
+--
+2.33.0
+
diff --git a/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild
b/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild
new file mode 100644
index 000..4dbc0b9a487
--- /dev/null
+++ b/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild
@@ -0,0 +1,66 @@
+# 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="alsa 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]
+ alsa? ( media-libs/alsa-lib:= )
+ 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}-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.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)"
+ -DWITH_ALSA="$(usex alsa)"
+
[gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/, games-fps/prboom-plus/files/
commit: 58d081c9ba60c9fa96740d5ff04e9d4ff2bc79e0
Author: William Breathitt Gray gmail com>
AuthorDate: Wed Aug 12 01:07:50 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Aug 17 21:38:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d081c9
games-fps/prboom-plus: Install documentation files
Closes: https://bugs.gentoo.org/736713
Signed-off-by: William Breathitt Gray gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17096
Signed-off-by: James Le Cuirot gentoo.org>
...stall-rules-for-prboom-plus-documentation.patch | 63 ++
.../prboom-plus/prboom-plus-2.5.1.7.82.ebuild | 1 +
2 files changed, 64 insertions(+)
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
new file mode 100644
index 000..dee4306a437
--- /dev/null
+++
b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
@@ -0,0 +1,63 @@
+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 ..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/prboom-plus-2.5.1.7.82.ebuild
b/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild
index ec37137ed26..5736a368a56 100644
--- 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
@@ -34,6 +34,7 @@ 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
}
