summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2019-10-24 21:36:30 +0100
committerJames Le Cuirot <chewi@gentoo.org>2019-10-24 21:36:30 +0100
commit3faf4a588314618d2747164741de1918205ffbf3 (patch)
treef130db20f372c09169ab6f555a69513712140a3c
parentapp-portage/mirrorselect: 2.2.6-r1 revbump for bug 698470 (diff)
downloadgentoo-3faf4a588314618d2747164741de1918205ffbf3.tar.gz
gentoo-3faf4a588314618d2747164741de1918205ffbf3.tar.bz2
gentoo-3faf4a588314618d2747164741de1918205ffbf3.zip
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@gentoo.org>
-rw-r--r--games-fps/gzdoom/Manifest2
-rw-r--r--games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch15
-rw-r--r--games-fps/gzdoom/gzdoom-4.2.3.ebuild (renamed from games-fps/gzdoom/gzdoom-4.2.1.ebuild)5
3 files changed, 11 insertions, 11 deletions
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index bcb0430e5174..418008134928 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 c74d08a24a47..5a8460e64199 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
index baca2173701c..e59ca4147566 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() {