* [gentoo-commits] repo/gentoo:master commit in: games-fps/eduke32/files/, games-fps/eduke32/
@ 2019-04-22 22:00 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2019-04-22 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 765c9019087891ab1663c2b4f4845b7f4c078c51
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sat Apr 20 13:19:17 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 22:00:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765c9019
games-fps/eduke32: bump to version 20190419.7615
Closes: https://bugs.gentoo.org/683894
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/11757
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-fps/eduke32/Manifest | 1 +
games-fps/eduke32/eduke32-20190419.7615.ebuild | 247 +++++++++++++++++++++
.../eduke32-20190419.7615-wad2map-buildfix.patch | 19 ++
3 files changed, 267 insertions(+)
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 03decaa5f79..bcfad3bdf93 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -6,3 +6,4 @@ DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997
DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
DIST eduke32_src_20190406-7490.tar.xz 14740360 BLAKE2B c7285e74b857a36d5bcddded9ae56f65be9d3a45146c21d5171f56538ba35ebfdc0b96f2eab84dbaf7179a1a336e5cd8cc2cfdd25f3524998382fc9e505142a4 SHA512 b43cd3bc4a26ef14ebb8db5b4ed0520544afff34970fadb459b0413eef9937e7ec70e32a51b92438f23d036806d436a429cf34ac61ec3353411f5491d6cbab45
+DIST eduke32_src_20190419-7615.tar.xz 14740500 BLAKE2B 462a93789c0c096f85f889769ca3bf642c33cd997e1b2cfb821060aa2dbd0040b0dbd910d33da09e2be8b6610d62fbb06fed2dd62aeaa619fa23c17b6a538feb SHA512 ca496c0f6478cb246e0746de1ecf171e46762d65fdb6906c8174f610b8f52362d84c48e0f4095fe00a41e4c73cbb7298ec3446d4bc0be68ed0f9a52a768183fe
diff --git a/games-fps/eduke32/eduke32-20190419.7615.ebuild b/games-fps/eduke32/eduke32-20190419.7615.ebuild
new file mode 100644
index 00000000000..d70f5ef8c30
--- /dev/null
+++ b/games-fps/eduke32/eduke32-20190419.7615.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg-utils
+
+MY_BUILD="$(ver_cut 2)"
+MY_DATE="$(ver_cut 1)"
+
+MY_PV_HRP="5.4"
+MY_PV_OFFENSIVE_XXX="1.33"
+MY_PV_OPL="2.01"
+MY_PV_PSX="1.11"
+MY_PV_SC55="4.02"
+MY_PV_VOXELS="1.21"
+
+DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
+HOMEPAGE="http://www.eduke32.com/"
+SRC_URI="
+ http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
+ http://www.eduke32.com/images/eduke32_classic.png
+ hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
+ offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
+ opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
+ psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
+ sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
+ voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
+"
+
+LICENSE="BUILDLIC GPL-2 HRP"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
+REQUIRED_USE="
+ cdinstall? ( !demo )
+ demo? ( !cdinstall )
+ hrp? ( ^^ ( demo cdinstall )
+ !voxels )
+ offensive? ( ^^ ( demo cdinstall ) )
+ opl? ( ^^ ( demo cdinstall )
+ !sc-55 )
+ psx? ( ^^ ( demo cdinstall ) )
+ sc-55? ( ^^ ( demo cdinstall )
+ !opl )
+ voxels? ( !hrp )
+ vpx? ( opengl )
+"
+
+S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
+
+MY_DEPEND_RDEPEND="
+ media-libs/libsdl2[joystick,opengl?,sound,video]
+ media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?]
+ sys-libs/zlib:=
+ flac? ( media-libs/flac )
+ gtk? ( x11-libs/gtk+:2 )
+ opengl? ( virtual/glu
+ virtual/opengl )
+ png? ( media-libs/libpng:0= )
+ timidity? ( media-sound/timidity-freepats )
+ vpx? ( media-libs/libvpx:= )
+ vorbis? ( media-libs/libogg
+ media-libs/libvorbis )
+ xmp? ( media-libs/exempi:= )
+"
+
+RDEPEND="
+ ${MY_DEPEND_RDEPEND}
+ cdinstall? ( games-fps/duke3d-data )
+ demo? ( games-fps/duke3d-demodata )
+"
+
+DEPEND="
+ ${MY_DEPEND_RDEPEND}
+ app-arch/unzip
+ x86? ( dev-lang/nasm )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-wad2map-buildfix.patch"
+ "${FILESDIR}/log-to-tmpdir.patch"
+ "${FILESDIR}/search-duke3d-path.patch"
+)
+
+src_unpack() {
+ # Extract only the eduke32 archive
+ unpack ${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
+
+ # Unpack only the documentation
+ if use hrp; then
+ unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
+ fi
+ if use offensive; then
+ unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
+ fi
+ if use opl; then
+ unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
+ mv readme.txt opl_readme.txt || die
+ fi
+ if use sc-55; then
+ unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
+ fi
+ if use voxels; then
+ unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
+ fi
+}
+
+src_compile() {
+ local myemakeopts=(
+ ALLOCACHE_AS_MALLOC=0
+ AS=$(tc-getAS)
+ CC=$(tc-getCC)
+ CXX=$(tc-getCXX)
+ CLANG=0
+ CPLUSPLUS=1
+ CUSTOMOPT=""
+ DEBUGANYWAY=0
+ F_JUMP_TABLES=""
+ FORCEDEBUG=0
+ HAVE_FLAC=$(usex flac 1 0)
+ HAVE_GTK2=$(usex gtk 1 0)
+ HAVE_VORBIS=$(usex vorbis 1 0)
+ HAVE_XMP=$(usex xmp 1 0)
+ LINKED_GTK=$(usex gtk 1 0)
+ LTO=1
+ LUNATIC=0
+ KRANDDEBUG=0
+ MEMMAP=0
+ MIXERTYPE=SDL
+ NETCODE=$(usex server 1 0)
+ NOASM=0
+ OPTLEVEL=0
+ OPTOPT=""
+ PACKAGE_REPOSITORY=1
+ POLYMER=$(usex opengl 1 0)
+ PRETTY_OUTPUT=0
+ PROFILER=0
+ RELEASE=1
+ RENDERTYPE=SDL
+ SDL_TARGET=2
+ SIMPLE_MENU=0
+ STRIP=""
+ TANDALONE=0
+ STARTUP_WINDOW=$(usex gtk 1 0)
+ USE_OPENGL=$(usex opengl 1 0)
+ USE_LIBVPX=$(usex vpx 1 0)
+ USE_LIBPNG=$(usex png 1 0)
+ USE_LUAJIT_2_1=0
+ WITHOUT_GTK=$(usex gtk 0 1)
+ )
+
+ emake "${myemakeopts[@]}"
+
+ if use tools; then
+ emake utils "${myemakeopts[@]}"
+ fi
+}
+
+src_test() {
+ # There are no tests
+ # Instead it tries to build a test game, which does not compile
+ :;
+}
+
+src_install() {
+ dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
+
+ if use tools; then
+ local tools=(
+ arttool
+ bsuite
+ cacheinfo
+ generateicon
+ givedepth
+ ivfrate
+ kextract
+ kgroup
+ kmd2tool
+ makesdlkeytrans
+ map2stl
+ md2tool
+ mkpalette
+ transpal
+ unpackssi
+ wad2art
+ wad2map
+ )
+
+ dobin "${tools[@]}"
+ fi
+
+ keepdir /usr/share/games/eduke32
+ insinto /usr/share/games/eduke32
+ if use hrp; then
+ doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
+ fi
+ if use offensive; then
+ doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
+ fi
+ if use opl; then
+ doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
+ fi
+ if use psx; then
+ doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
+ fi
+ if use sc-55; then
+ doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
+ fi
+ if use sdk; then
+ doins -r package/sdk
+ fi
+ if use voxels; then
+ doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
+ fi
+
+ newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
+
+ make_desktop_entry eduke32-bin EDuke32 eduke32 Game
+ make_desktop_entry mapster32 Mapster32 eduke32 Game
+
+ local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt source/duke3d/src/lunatic/doc/*.txt )
+ if use hrp; then
+ DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
+ fi
+ if use offensive; then
+ DOCS+=( "${WORKDIR}"/xxx_readme.txt )
+ fi
+ if use opl; then
+ DOCS+=( "${WORKDIR}"/opl_readme.txt )
+ fi
+ if use sc-55; then
+ DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
+ fi
+ if use voxels; then
+ DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
+ fi
+ einstalldocs
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch b/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
new file mode 100644
index 00000000000..611f7a9d1ee
--- /dev/null
+++ b/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
@@ -0,0 +1,19 @@
+--- a/source/tools/src/wad2map.cpp 2019-04-08 08:29:24.000000000 +0200
++++ b/source/tools/src/wad2map.cpp 2019-04-20 15:07:38.684542190 +0200
+@@ -7,6 +7,7 @@
+
+ #include "compat.h"
+ #include "pragmas.h"
++#include "vfs.h"
+
+ #define MAXWADS 4096
+ #define MAXPOINTS 8192
+@@ -313,7 +314,7 @@
+ Bprintf("Could not find %s\n",scriptname);
+ exit(0);
+ }
+- filpos = 0; fileng = filelength(filhandle);
++ filpos = 0; fileng = buildvfs_length(filhandle);
+ while (readline() != 0)
+ {
+ i = 0; j = 0; lasti = 0;
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/eduke32/files/, games-fps/eduke32/
@ 2020-05-23 13:57 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2020-05-23 13:57 UTC (permalink / raw
To: gentoo-commits
commit: 1bebd3227ed82df26c9c8979cfc4de5d177c8ec5
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 13:57:20 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat May 23 13:57:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bebd322
games-fps/eduke32: fix compilation with gcc-10
Closes: https://bugs.gentoo.org/724626
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-fps/eduke32/eduke32-20200505.8904.ebuild | 1 +
games-fps/eduke32/files/eduke32-20200505.8904-gcc10.patch | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/games-fps/eduke32/eduke32-20200505.8904.ebuild b/games-fps/eduke32/eduke32-20200505.8904.ebuild
index c0662991c69..c493f5f8a35 100644
--- a/games-fps/eduke32/eduke32-20200505.8904.ebuild
+++ b/games-fps/eduke32/eduke32-20200505.8904.ebuild
@@ -88,6 +88,7 @@ PATCHES=(
"${FILESDIR}/${PN}-20190419.7615-wad2map-buildfix.patch"
"${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
+ "${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
)
src_unpack() {
diff --git a/games-fps/eduke32/files/eduke32-20200505.8904-gcc10.patch b/games-fps/eduke32/files/eduke32-20200505.8904-gcc10.patch
new file mode 100644
index 00000000000..2795e999c8e
--- /dev/null
+++ b/games-fps/eduke32/files/eduke32-20200505.8904-gcc10.patch
@@ -0,0 +1,13 @@
+This patch fixes compilation with GCC-10.
+
+diff -dru a/source/audiolib/include/music.h b/source/audiolib/include/music.h
+--- a/source/audiolib/include/music.h
++++ b/source/audiolib/include/music.h
+@@ -38,6 +38,7 @@
+
+ #ifdef __linux__
+ #include <vector>
++#include <string>
+
+ typedef struct
+ {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/eduke32/files/, games-fps/eduke32/
@ 2020-08-09 20:00 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2020-08-09 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 894010aea0472636a15f66a38a84dc58c9ef4ca2
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 19:35:07 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 20:00:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894010ae
games-fps/eduke32: drop old version
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-fps/eduke32/Manifest | 1 -
games-fps/eduke32/eduke32-20200505.8904.ebuild | 227 ---------------------
.../eduke32-20190419.7615-wad2map-buildfix.patch | 19 --
3 files changed, 247 deletions(-)
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index d6f7b5e5323..717c7f433f8 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -5,5 +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_20200505-8904-0b0e9923c.tar.xz 16569468 BLAKE2B 557a4547e13ff422dacf0885f8ddff8b62bb658bc63c2b70564b5f40cabaf55abd30103a28af474391cd3662641768bcec5f3338f882f82fc657cfa24a566436 SHA512 6b86b1fd16c0175c7dea1816e8d2b4f92f6d5a26c9f68bbbd5cf5ed7821524ef72ef646bc931d4d82773a33438f0de7a33b84429719e485f8cf05cd8ab92cb6b
DIST eduke32_src_20200808-9208-16a4d06be.tar.xz 19787360 BLAKE2B 3344a660fd5dec951e27e74a0680ba506692991c96438af53901bd5c090ca4c14be90db37ad4cc454c7f0dc2b7628a9bb9abce4e55c4dd9713a1fe90af28c53d SHA512 0b88ed5a0c3a5134aaabe9c30eb2d9a2a17c4833388788c4e1d3bf6bc76aa0edb3b6189c503f614894d480d25a27d498df11fb13ea64c465253a9b564c43b78c
diff --git a/games-fps/eduke32/eduke32-20200505.8904.ebuild b/games-fps/eduke32/eduke32-20200505.8904.ebuild
deleted file mode 100644
index c493f5f8a35..00000000000
--- a/games-fps/eduke32/eduke32-20200505.8904.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs xdg-utils
-
-EGIT_COMMIT="0b0e9923c"
-MY_BUILD="$(ver_cut 2)"
-MY_DATE="$(ver_cut 1)"
-MY_PV_HRP="5.4"
-MY_PV_OFFENSIVE_XXX="1.33"
-MY_PV_OPL="2.01"
-MY_PV_PSX="1.11"
-MY_PV_SC55="4.02"
-MY_PV_VOXELS="1.21"
-
-DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
-HOMEPAGE="http://www.eduke32.com/"
-SRC_URI="
- https://dukeworld.com/eduke32/synthesis/latest/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
- https://www.eduke32.com/images/eduke32_classic.png
- hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
- offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
- opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
- psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
- sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
- voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
-"
-
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
-REQUIRED_USE="
- cdinstall? ( !demo )
- demo? ( !cdinstall )
- hrp? ( ^^ ( demo cdinstall )
- !voxels )
- offensive? ( ^^ ( demo cdinstall ) )
- opl? ( ^^ ( demo cdinstall )
- !sc-55 )
- psx? ( ^^ ( demo cdinstall ) )
- sc-55? ( ^^ ( demo cdinstall )
- !opl )
- voxels? ( !hrp )
- vpx? ( opengl )
-"
-
-# There are no tests,
-# instead it tries to build a test game, which does not compile
-RESTRICT="bindist test"
-
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
-
-RDEPEND="
- media-libs/libsdl2[joystick,opengl?,sound,video]
- media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?]
- sys-libs/zlib
- flac? ( media-libs/flac )
- gtk? ( x11-libs/gtk+:2 )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- png? ( media-libs/libpng:0= )
- vpx? ( media-libs/libvpx:= )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- xmp? ( media-libs/exempi:2= )
-"
-
-DEPEND="
- ${RDEPEND}
- cdinstall? ( games-fps/duke3d-data )
- demo? ( games-fps/duke3d-demodata )
- timidity? ( media-sound/timidity++ )
-"
-
-BDEPEND="
- app-arch/unzip
- x86? ( dev-lang/nasm )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20190419.7615-wad2map-buildfix.patch"
- "${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
- "${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
- "${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
-)
-
-src_unpack() {
- # Extract only the eduke32 archive
- unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-
- # Unpack only the documentation
- if use hrp; then
- unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
- fi
- if use offensive; then
- unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
- fi
- if use opl; then
- unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
- mv readme.txt opl_readme.txt || die
- fi
- if use sc-55; then
- unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
- fi
- if use voxels; then
- unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
- fi
-}
-
-src_compile() {
- local myemakeopts=(
- ALLOCACHE_AS_MALLOC=0
- AS=$(tc-getAS)
- CC=$(tc-getCC)
- CXX=$(tc-getCXX)
- CLANG=0
- CPLUSPLUS=1
- CUSTOMOPT=""
- DEBUGANYWAY=0
- F_JUMP_TABLES=""
- FORCEDEBUG=0
- HAVE_FLAC=$(usex flac 1 0)
- HAVE_GTK2=$(usex gtk 1 0)
- HAVE_VORBIS=$(usex vorbis 1 0)
- HAVE_XMP=$(usex xmp 1 0)
- LINKED_GTK=$(usex gtk 1 0)
- LTO=1
- LUNATIC=0
- KRANDDEBUG=0
- MEMMAP=0
- MIXERTYPE=SDL
- NETCODE=$(usex server 1 0)
- NOASM=0
- OPTLEVEL=0
- OPTOPT=""
- PACKAGE_REPOSITORY=1
- POLYMER=$(usex opengl 1 0)
- PRETTY_OUTPUT=0
- PROFILER=0
- RELEASE=1
- RENDERTYPE=SDL
- SDL_TARGET=2
- SIMPLE_MENU=0
- STRIP=""
- TANDALONE=0
- STARTUP_WINDOW=$(usex gtk 1 0)
- USE_OPENGL=$(usex opengl 1 0)
- USE_LIBVPX=$(usex vpx 1 0)
- USE_LIBPNG=$(usex png 1 0)
- USE_LUAJIT_2_1=0
- WITHOUT_GTK=$(usex gtk 0 1)
- )
-
- emake "${myemakeopts[@]}"
-
- if use tools; then
- emake utils "${myemakeopts[@]}"
- fi
-}
-
-src_install() {
- dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
-
- if use tools; then
- local tools=(
- arttool
- bsuite
- cacheinfo
- generateicon
- givedepth
- ivfrate
- kextract
- kgroup
- kmd2tool
- makesdlkeytrans
- map2stl
- md2tool
- mkpalette
- transpal
- unpackssi
- wad2art
- wad2map
- )
-
- dobin "${tools[@]}"
- fi
-
- keepdir /usr/share/games/eduke32
- insinto /usr/share/games/eduke32
-
- use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
- use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
- use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
- use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
- use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
- use sdk && doins -r package/sdk
- use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
-
- newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
-
- make_desktop_entry eduke32-bin EDuke32 eduke32 Game
- make_desktop_entry mapster32 Mapster32 eduke32 Game
-
- local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt source/duke3d/src/lunatic/doc/*.txt )
- use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
- use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
- use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
- use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
- use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch b/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
deleted file mode 100644
index 611f7a9d1ee..00000000000
--- a/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/source/tools/src/wad2map.cpp 2019-04-08 08:29:24.000000000 +0200
-+++ b/source/tools/src/wad2map.cpp 2019-04-20 15:07:38.684542190 +0200
-@@ -7,6 +7,7 @@
-
- #include "compat.h"
- #include "pragmas.h"
-+#include "vfs.h"
-
- #define MAXWADS 4096
- #define MAXPOINTS 8192
-@@ -313,7 +314,7 @@
- Bprintf("Could not find %s\n",scriptname);
- exit(0);
- }
-- filpos = 0; fileng = filelength(filhandle);
-+ filpos = 0; fileng = buildvfs_length(filhandle);
- while (readline() != 0)
- {
- i = 0; j = 0; lasti = 0;
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/eduke32/files/, games-fps/eduke32/
@ 2020-11-16 23:06 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2020-11-16 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 4888ef21474c75ca7570e356be326a66ee09f853
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 23:04:19 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 23:05:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4888ef21
games-fps/eduke32: bump to version 20200907.9257
This release also adds support for
playing Shadow Warrior (Classic) data files.
It is run via EDuke32's VoidSW launcher.
Closes: https://bugs.gentoo.org/754951
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-fps/eduke32/Manifest | 1 +
games-fps/eduke32/eduke32-20200907.9257.ebuild | 230 +++++++++++++++++++++++++
games-fps/eduke32/files/voidsw-bin | 12 ++
games-fps/eduke32/metadata.xml | 1 +
4 files changed, 244 insertions(+)
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index b42e2650c41..3e7735030c3 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -6,3 +6,4 @@ DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997
DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
DIST eduke32_src_20200829-9253-156963ddc.tar.xz 19786792 BLAKE2B beff97aa7fa6e0db841abddfba6287034b501c6c727239157e986ded0993edf5bfbb891138d95e54a181b1f769b4a36a0406cceb531fed4a5b2c9cdd63dd59e9 SHA512 f69ad01c958cc180e75e4f6c231106634f57257b3d8fd14db5b5079721633df4dde8b72c93397fa75c2782735eb5baf0e00708b2fc5d8781e36c6cda9b949f4d
+DIST eduke32_src_20200907-9257-93f62bbad.tar.xz 19787388 BLAKE2B 932bb679ac83320c56284371967e3f18e9d44b2635c743443a2e73511bd62557fb478c035136fc63276b3ada97736c18d05ed809772266d5b16dfdcaf03104d6 SHA512 43b5fd11382cdbc589a32c5f8f2ef36abcd0a41ba0251d4edf1c45466ad2ff875bc237c304b5a6668a44d01fb8f465a761f9e654b306762fa086b40f8bd75284
diff --git a/games-fps/eduke32/eduke32-20200907.9257.ebuild b/games-fps/eduke32/eduke32-20200907.9257.ebuild
new file mode 100644
index 00000000000..b3342d7aa9c
--- /dev/null
+++ b/games-fps/eduke32/eduke32-20200907.9257.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg-utils
+
+EGIT_COMMIT="93f62bbad"
+MY_BUILD="$(ver_cut 2)"
+MY_DATE="$(ver_cut 1)"
+MY_PV_HRP="5.4"
+MY_PV_OFFENSIVE_XXX="1.33"
+MY_PV_OPL="2.01"
+MY_PV_PSX="1.11"
+MY_PV_SC55="4.02"
+MY_PV_VOXELS="1.21"
+
+DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
+HOMEPAGE="http://www.eduke32.com/"
+SRC_URI="
+ https://dukeworld.com/eduke32/synthesis/latest/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
+ https://www.eduke32.com/images/eduke32_classic.png
+ hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
+ offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
+ opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
+ psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
+ sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
+ voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
+"
+
+LICENSE="BUILDLIC GPL-2 HRP"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cdinstall demo fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw vorbis voxels vpx xmp"
+REQUIRED_USE="
+ cdinstall? ( !demo )
+ demo? ( !cdinstall )
+ hrp? ( ^^ ( demo cdinstall )
+ !voxels )
+ offensive? ( ^^ ( demo cdinstall ) )
+ opl? ( ^^ ( demo cdinstall )
+ !sc-55 )
+ psx? ( ^^ ( demo cdinstall ) )
+ sc-55? ( ^^ ( demo cdinstall )
+ !opl )
+ voxels? ( !hrp )
+ vpx? ( opengl )
+"
+
+# There are no tests,
+# instead it tries to build a test game, which does not compile
+RESTRICT="bindist test"
+
+S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
+
+RDEPEND="
+ media-libs/flac
+ media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
+ media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis?]
+ sys-libs/zlib
+ gtk? ( x11-libs/gtk+:2 )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ png? ( media-libs/libpng:0= )
+ vpx? ( media-libs/libvpx:= )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ xmp? ( media-libs/exempi:2= )
+"
+
+DEPEND="
+ ${RDEPEND}
+ timidity? ( media-sound/timidity++ )
+"
+
+BDEPEND="
+ app-arch/unzip
+ x86? ( dev-lang/nasm )
+"
+
+PDEPEND="
+ cdinstall? ( games-fps/duke3d-data )
+ demo? ( games-fps/duke3d-demodata )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
+ "${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
+ "${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
+)
+
+src_unpack() {
+ # Extract only the eduke32 archive
+ unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
+
+ # Unpack only the documentation
+ if use hrp; then
+ unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
+ fi
+ if use offensive; then
+ unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
+ fi
+ if use opl; then
+ unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
+ mv readme.txt opl_readme.txt || die
+ fi
+ if use sc-55; then
+ unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
+ fi
+ if use voxels; then
+ unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
+ fi
+}
+
+src_compile() {
+ local myemakeopts=(
+ ALLOCACHE_AS_MALLOC=0
+ AS=$(tc-getAS)
+ CC=$(tc-getCC)
+ CXX=$(tc-getCXX)
+ CLANG=0
+ CPLUSPLUS=1
+ CUSTOMOPT=""
+ DEBUGANYWAY=0
+ F_JUMP_TABLES=""
+ FORCEDEBUG=0
+ HAVE_FLAC=1
+ HAVE_GTK2=$(usex gtk 1 0)
+ HAVE_VORBIS=$(usex vorbis 1 0)
+ HAVE_XMP=$(usex xmp 1 0)
+ LINKED_GTK=$(usex gtk 1 0)
+ LTO=1
+ LUNATIC=0
+ KRANDDEBUG=0
+ MEMMAP=0
+ MIXERTYPE=SDL
+ NETCODE=$(usex server 1 0)
+ NOASM=0
+ OPTLEVEL=0
+ OPTOPT=""
+ PACKAGE_REPOSITORY=1
+ POLYMER=$(usex opengl 1 0)
+ PRETTY_OUTPUT=0
+ PROFILER=0
+ RELEASE=1
+ RENDERTYPE=SDL
+ SDL_TARGET=2
+ SIMPLE_MENU=0
+ STRIP=""
+ TANDALONE=0
+ STARTUP_WINDOW=$(usex gtk 1 0)
+ USE_OPENGL=$(usex opengl 1 0)
+ USE_LIBVPX=$(usex vpx 1 0)
+ USE_LIBPNG=$(usex png 1 0)
+ USE_LUAJIT_2_1=0
+ WITHOUT_GTK=$(usex gtk 0 1)
+ )
+
+ emake "${myemakeopts[@]}"
+
+ use tools && emake utils "${myemakeopts[@]}"
+ use voidsw && emake sw "${myemakeopts[@]}"
+}
+
+src_install() {
+ dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
+ use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
+
+ if use tools; then
+ local tools=(
+ arttool
+ bsuite
+ cacheinfo
+ generateicon
+ givedepth
+ ivfrate
+ kextract
+ kgroup
+ kmd2tool
+ makesdlkeytrans
+ map2stl
+ md2tool
+ mkpalette
+ transpal
+ unpackssi
+ wad2art
+ wad2map
+ )
+
+ dobin "${tools[@]}"
+ fi
+
+ keepdir /usr/share/games/eduke32
+ insinto /usr/share/games/eduke32
+
+ use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
+ use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
+ use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
+ use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
+ use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
+ use sdk && doins -r package/sdk
+ use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
+
+ newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
+
+ make_desktop_entry eduke32-bin EDuke32 eduke32 Game
+ make_desktop_entry mapster32 Mapster32 eduke32 Game
+ use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
+
+ local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
+ use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
+ use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
+ use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
+ use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
+ use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/games-fps/eduke32/files/voidsw-bin b/games-fps/eduke32/files/voidsw-bin
new file mode 100644
index 00000000000..5d572204848
--- /dev/null
+++ b/games-fps/eduke32/files/voidsw-bin
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Get all installed zip files
+zips=$(ls /usr/share/games/eduke32/*.zip)
+
+# Create opts for voidsw
+for zip in ${zips[@]}; do
+ opts+="-g ${zip} "
+done
+
+# Switch to /tmp, for writing there the log file and run voidsw with set opts
+cd /tmp && voidsw ${opts}
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 0ce346f0721..225b31ad73f 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -25,6 +25,7 @@
<flag name="server">Enable support for multiplayer.</flag>
<flag name="sdk">Install the SDK files.</flag>
<flag name="tools">Install the support tools for mapster32.</flag>
+ <flag name="voidsw">Enable support for Shadow Warrior (Classic) through VoidSW.</flag>
<flag name="voxels">Install the Duke Nukem 3D Voxels Pack.</flag>
<flag name="vpx">Enable support for <pkg>media-libs/libvpx</pkg>.</flag>
<flag name="xmp">Enable support for <pkg>media-libs/exempi</pkg>.</flag>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/eduke32/files/, games-fps/eduke32/
@ 2022-02-11 14:44 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2022-02-11 14:44 UTC (permalink / raw
To: gentoo-commits
commit: 84f5330502d84aed65712c86814a3053ab6c558e
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 14:43:19 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 14:43:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f53305
games-fps/eduke32: fix compilation
Closes: https://bugs.gentoo.org/833101
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-fps/eduke32/eduke32-20220204.9957.ebuild | 3 ++-
.../eduke32/files/eduke32-20220204.9957-log-to-tmpdir.patch | 11 +++++++++++
.../files/eduke32-20220204.9957-osd-setparameters.patch | 11 +++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/games-fps/eduke32/eduke32-20220204.9957.ebuild b/games-fps/eduke32/eduke32-20220204.9957.ebuild
index c177f758e1a0..ed27b1dc402c 100644
--- a/games-fps/eduke32/eduke32-20220204.9957.ebuild
+++ b/games-fps/eduke32/eduke32-20220204.9957.ebuild
@@ -77,9 +77,10 @@ BDEPEND="
PDEPEND="duke3d? ( games-fps/duke3d-data )"
PATCHES=(
- "${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
"${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
+ "${FILESDIR}/${PN}-20220204.9957-log-to-tmpdir.patch"
+ "${FILESDIR}/${PN}-20220204.9957-osd-setparameters.patch"
)
src_unpack() {
diff --git a/games-fps/eduke32/files/eduke32-20220204.9957-log-to-tmpdir.patch b/games-fps/eduke32/files/eduke32-20220204.9957-log-to-tmpdir.patch
new file mode 100644
index 000000000000..5296f0ac71a9
--- /dev/null
+++ b/games-fps/eduke32/files/eduke32-20220204.9957-log-to-tmpdir.patch
@@ -0,0 +1,11 @@
+--- a/source/sw/src/game.cpp
++++ b/source/sw/src/game.cpp
+@@ -3467,7 +3467,7 @@
+ }
+ else
+ #endif
+- OSD_SetLogFile(APPBASENAME ".log");
++ OSD_SetLogFile("/tmp/" APPBASENAME ".log");
+
+ wm_setapptitle(APPNAME);
+
diff --git a/games-fps/eduke32/files/eduke32-20220204.9957-osd-setparameters.patch b/games-fps/eduke32/files/eduke32-20220204.9957-osd-setparameters.patch
new file mode 100644
index 000000000000..b302ac94afa6
--- /dev/null
+++ b/games-fps/eduke32/files/eduke32-20220204.9957-osd-setparameters.patch
@@ -0,0 +1,11 @@
+--- a/source/sw/src/jnstub.cpp
++++ b/source/sw/src/jnstub.cpp
+@@ -731,7 +731,7 @@
+ //LogUserTime(TRUE); // Send true because user is logging
+ // in.
+
+- OSD_SetParameters(0, 0, 0, 4, 2, 4, "^14", "^14", 0);
++ OSD_SetParameters(0, 0, 0, 4, 2, 4, "^14", "^14", "^14", 0);
+
+ SW_ExtInit();
+
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/eduke32/files/, games-fps/eduke32/
@ 2022-06-25 14:35 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2022-06-25 14:35 UTC (permalink / raw
To: gentoo-commits
commit: 5e1abeee9a3e514311cb7d04e8f68688c054f68b
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 14:27:54 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 14:34:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1abeee
games-fps/eduke32: drop 20211202.9831, 20220204.9957
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-fps/eduke32/Manifest | 2 -
games-fps/eduke32/eduke32-20211202.9831.ebuild | 218 --------------------
games-fps/eduke32/eduke32-20220204.9957.ebuild | 219 ---------------------
.../eduke32-20190820.8043-log-to-tmpdir.patch | 11 --
.../eduke32-20220204.9957-osd-setparameters.patch | 11 --
5 files changed, 461 deletions(-)
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index ba3d986cf11c..eb88cc015b64 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -5,6 +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_20211202-9831-a7ab79e69.tar.xz 19902936 BLAKE2B 9626a23599f0f187ace392abb47212908b991e3970043fa22382b2396f5617f3004e38117d39c4b191c857a5cd2662b5eefb6102390fd88c67fa47631e3cac5c SHA512 ab1cfe3fbbaa65d4e7ad2d9d7d39b8970a8ce4d9531f348770f62edee5d85438d9a382e618c88c637f23e5b5792c905f30fcbb56202ec56a9284e25697dd9b72
-DIST eduke32_src_20220204-9957-6df591a07.tar.xz 20207948 BLAKE2B 2c907520c2ea6545000ca7daaf197cab745b46c14ccd2d199a2d2587a398fbff34b705a985dd898c6f28363daffa75d854efadfa38af15a77173cf762035dc02 SHA512 ca70bb49e8470a2af54857d743418933c98b3af245b3488b840aefb234ba08dc6ff288f9a44594b7e7c612dd9318523cfda5a86c737668c0f6de9eea84e8996f
DIST eduke32_src_20220422-10033-3927367ba.tar.xz 20777836 BLAKE2B 7c62a831c8daa5ba2f30e4dd80261aad87cb808eca28d0036f116c537de4d14b3fc2ca6fd325379aca21e7a2a6ab01dccce16907e108d932d5d62e3e0228aca5 SHA512 aac039500e9babc85d50d616868abff145ea145b3f53e9512c905acc084e9a193a7e0bbbd18c9976ad8ad306deccf6e23a66686edb06970b4b943a31938f0229
diff --git a/games-fps/eduke32/eduke32-20211202.9831.ebuild b/games-fps/eduke32/eduke32-20211202.9831.ebuild
deleted file mode 100644
index 5381e50eb485..000000000000
--- a/games-fps/eduke32/eduke32-20211202.9831.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs xdg-utils
-
-EGIT_COMMIT="a7ab79e69"
-MY_BUILD="$(ver_cut 2)"
-MY_DATE="$(ver_cut 1)"
-MY_PV_HRP="5.4"
-MY_PV_OFFENSIVE_XXX="1.33"
-MY_PV_OPL="2.01"
-MY_PV_PSX="1.11"
-MY_PV_SC55="4.02"
-MY_PV_VOXELS="1.21"
-
-DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
-HOMEPAGE="http://www.eduke32.com/"
-SRC_URI="
- http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
- https://www.eduke32.com/images/eduke32_classic.png
- hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
- offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
- opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
- psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
- sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
- voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
-"
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
-
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp"
-REQUIRED_USE="
- hrp? ( duke3d !voxels )
- offensive? ( duke3d )
- opl? ( duke3d !sc-55 )
- psx? ( duke3d )
- sc-55? ( duke3d !opl )
- voxels? ( !hrp )
- vpx? ( opengl )
-"
-
-# There are no tests,
-# instead it tries to build a test game, which does not compile
-RESTRICT="bindist test"
-
-RDEPEND="
- media-libs/flac
- media-libs/libogg
- media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
- media-libs/libvorbis
- media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis]
- sys-libs/zlib
- gtk? ( x11-libs/gtk+:2 )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- png? ( media-libs/libpng:0= )
- vpx? ( media-libs/libvpx:= )
- xmp? ( media-libs/exempi:2= )
-"
-
-DEPEND="
- ${RDEPEND}
- timidity? ( media-sound/timidity++ )
-"
-
-BDEPEND="
- app-arch/unzip
- x86? ( dev-lang/nasm )
-"
-
-PDEPEND="duke3d? ( games-fps/duke3d-data )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
- "${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
- "${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
-)
-
-src_unpack() {
- # Extract only the eduke32 archive
- unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-
- # Unpack only the documentation
- if use hrp; then
- unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
- fi
- if use offensive; then
- unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
- fi
- if use opl; then
- unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
- mv readme.txt opl_readme.txt || die
- fi
- if use sc-55; then
- unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
- fi
- if use voxels; then
- unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
- fi
-}
-
-src_compile() {
- local myemakeopts=(
- ALLOCACHE_AS_MALLOC=0
- AS="$(tc-getAS)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- CLANG=0
- CPLUSPLUS=1
- CUSTOMOPT=""
- DEBUGANYWAY=0
- F_JUMP_TABLES=""
- FORCEDEBUG=0
- HAVE_FLAC=1
- HAVE_GTK2=$(usex gtk 1 0)
- HAVE_XMP=$(usex xmp 1 0)
- LINKED_GTK=$(usex gtk 1 0)
- LTO=1
- LUNATIC=0
- KRANDDEBUG=0
- MEMMAP=0
- MIXERTYPE=SDL
- NETCODE=$(usex server 1 0)
- NOASM=0
- OPTLEVEL=0
- OPTOPT=""
- PACKAGE_REPOSITORY=1
- POLYMER=$(usex opengl 1 0)
- PRETTY_OUTPUT=0
- PROFILER=0
- RELEASE=1
- RENDERTYPE=SDL
- SDL_TARGET=2
- SIMPLE_MENU=0
- STRIP=""
- TANDALONE=0
- STARTUP_WINDOW=$(usex gtk 1 0)
- USE_OPENGL=$(usex opengl 1 0)
- USE_LIBVPX=$(usex vpx 1 0)
- USE_LIBPNG=$(usex png 1 0)
- USE_LUAJIT_2_1=0
- WITHOUT_GTK=$(usex gtk 0 1)
- )
-
- emake "${myemakeopts[@]}"
-
- use tools && emake utils "${myemakeopts[@]}"
- use voidsw && emake sw "${myemakeopts[@]}"
-}
-
-src_install() {
- dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
- use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
-
- if use tools; then
- local tools=(
- arttool
- bsuite
- cacheinfo
- generateicon
- givedepth
- ivfrate
- kextract
- kgroup
- kmd2tool
- makesdlkeytrans
- map2stl
- md2tool
- mkpalette
- transpal
- unpackssi
- wad2art
- wad2map
- )
-
- dobin "${tools[@]}"
- fi
-
- keepdir /usr/share/games/eduke32
- insinto /usr/share/games/eduke32
-
- use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
- use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
- use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
- use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
- use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
- use sdk && doins -r package/sdk
- use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
-
- newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
-
- make_desktop_entry eduke32-bin EDuke32 eduke32 Game
- make_desktop_entry mapster32 Mapster32 eduke32 Game
- use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
-
- local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
- use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
- use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
- use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
- use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
- use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/games-fps/eduke32/eduke32-20220204.9957.ebuild b/games-fps/eduke32/eduke32-20220204.9957.ebuild
deleted file mode 100644
index 065285a52412..000000000000
--- a/games-fps/eduke32/eduke32-20220204.9957.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop toolchain-funcs xdg-utils
-
-EGIT_COMMIT="6df591a07"
-MY_BUILD="$(ver_cut 2)"
-MY_DATE="$(ver_cut 1)"
-MY_PV_HRP="5.4"
-MY_PV_OFFENSIVE_XXX="1.33"
-MY_PV_OPL="2.01"
-MY_PV_PSX="1.11"
-MY_PV_SC55="4.02"
-MY_PV_VOXELS="1.21"
-
-DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
-HOMEPAGE="http://www.eduke32.com/"
-SRC_URI="
- http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
- https://www.eduke32.com/images/eduke32_classic.png
- hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
- offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
- opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
- psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
- sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
- voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
-"
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
-
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp"
-REQUIRED_USE="
- hrp? ( duke3d !voxels )
- offensive? ( duke3d )
- opl? ( duke3d !sc-55 )
- psx? ( duke3d )
- sc-55? ( duke3d !opl )
- voxels? ( !hrp )
- vpx? ( opengl )
-"
-
-# There are no tests,
-# instead it tries to build a test game, which does not compile
-RESTRICT="bindist test"
-
-RDEPEND="
- media-libs/flac
- media-libs/libogg
- media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
- media-libs/libvorbis
- media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis]
- sys-libs/zlib
- gtk? ( x11-libs/gtk+:2 )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- png? ( media-libs/libpng:0= )
- vpx? ( media-libs/libvpx:= )
- xmp? ( media-libs/exempi:2= )
-"
-
-DEPEND="
- ${RDEPEND}
- timidity? ( media-sound/timidity++ )
-"
-
-BDEPEND="
- app-arch/unzip
- x86? ( dev-lang/nasm )
-"
-
-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}-20220204.9957-osd-setparameters.patch"
-)
-
-src_unpack() {
- # Extract only the eduke32 archive
- unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-
- # Unpack only the documentation
- if use hrp; then
- unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
- fi
- if use offensive; then
- unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
- fi
- if use opl; then
- unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
- mv readme.txt opl_readme.txt || die
- fi
- if use sc-55; then
- unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
- fi
- if use voxels; then
- unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
- fi
-}
-
-src_compile() {
- local myemakeopts=(
- ALLOCACHE_AS_MALLOC=0
- AS="$(tc-getAS)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- CLANG=0
- CPLUSPLUS=1
- CUSTOMOPT=""
- DEBUGANYWAY=0
- F_JUMP_TABLES=""
- FORCEDEBUG=0
- HAVE_FLAC=1
- HAVE_GTK2=$(usex gtk 1 0)
- HAVE_XMP=$(usex xmp 1 0)
- LINKED_GTK=$(usex gtk 1 0)
- LTO=1
- LUNATIC=0
- KRANDDEBUG=0
- MEMMAP=0
- MIXERTYPE=SDL
- NETCODE=$(usex server 1 0)
- NOASM=0
- OPTLEVEL=0
- OPTOPT=""
- PACKAGE_REPOSITORY=1
- POLYMER=$(usex opengl 1 0)
- PRETTY_OUTPUT=0
- PROFILER=0
- RELEASE=1
- RENDERTYPE=SDL
- SDL_TARGET=2
- SIMPLE_MENU=0
- STRIP=""
- TANDALONE=0
- STARTUP_WINDOW=$(usex gtk 1 0)
- USE_OPENGL=$(usex opengl 1 0)
- USE_LIBVPX=$(usex vpx 1 0)
- USE_LIBPNG=$(usex png 1 0)
- USE_LUAJIT_2_1=0
- WITHOUT_GTK=$(usex gtk 0 1)
- )
-
- emake "${myemakeopts[@]}"
-
- use tools && emake utils "${myemakeopts[@]}"
- use voidsw && emake sw "${myemakeopts[@]}"
-}
-
-src_install() {
- dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
- use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
-
- if use tools; then
- local tools=(
- arttool
- bsuite
- cacheinfo
- generateicon
- givedepth
- ivfrate
- kextract
- kgroup
- kmd2tool
- makesdlkeytrans
- map2stl
- md2tool
- mkpalette
- transpal
- unpackssi
- wad2art
- wad2map
- )
-
- dobin "${tools[@]}"
- fi
-
- keepdir /usr/share/games/eduke32
- insinto /usr/share/games/eduke32
-
- use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
- use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
- use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
- use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
- use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
- use sdk && doins -r package/sdk
- use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
-
- newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
-
- make_desktop_entry eduke32-bin EDuke32 eduke32 Game
- make_desktop_entry mapster32 Mapster32 eduke32 Game
- use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
-
- local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
- use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
- use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
- use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
- use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
- use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/games-fps/eduke32/files/eduke32-20190820.8043-log-to-tmpdir.patch b/games-fps/eduke32/files/eduke32-20190820.8043-log-to-tmpdir.patch
deleted file mode 100644
index 24cec1b00af1..000000000000
--- a/games-fps/eduke32/files/eduke32-20190820.8043-log-to-tmpdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/duke3d/src/game.cpp 2018-05-08 19:32:19.000000000 +0200
-+++ b/source/duke3d/src/game.cpp 2018-05-10 23:46:21.540213019 +0200
-@@ -6234,7 +6234,7 @@
- }
- else
- #endif
-- OSD_SetLogFile(APPBASENAME ".log");
-+ OSD_SetLogFile("/tmp/" APPBASENAME ".log");
-
- OSD_SetFunctions(GAME_drawosdchar,
- GAME_drawosdstr,
diff --git a/games-fps/eduke32/files/eduke32-20220204.9957-osd-setparameters.patch b/games-fps/eduke32/files/eduke32-20220204.9957-osd-setparameters.patch
deleted file mode 100644
index b302ac94afa6..000000000000
--- a/games-fps/eduke32/files/eduke32-20220204.9957-osd-setparameters.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/sw/src/jnstub.cpp
-+++ b/source/sw/src/jnstub.cpp
-@@ -731,7 +731,7 @@
- //LogUserTime(TRUE); // Send true because user is logging
- // in.
-
-- OSD_SetParameters(0, 0, 0, 4, 2, 4, "^14", "^14", 0);
-+ OSD_SetParameters(0, 0, 0, 4, 2, 4, "^14", "^14", "^14", 0);
-
- SW_ExtInit();
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/eduke32/files/, games-fps/eduke32/
@ 2023-10-03 0:13 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2023-10-03 0:13 UTC (permalink / raw
To: gentoo-commits
commit: bba1c8a8c402298a48bf67e9eb76ba61c951915f
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 3 00:12:55 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Oct 3 00:13:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba1c8a8
games-fps/eduke32: fix patch
Bug: https://bugs.gentoo.org/913354
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-fps/eduke32/eduke32-20230926.10459.ebuild | 2 +-
.../files/eduke32-20190820.8043-search-duke3d-path.patch | 11 -----------
.../files/eduke32-20230926.10459-search-duke3d-path.patch | 11 +++++++++++
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/games-fps/eduke32/eduke32-20230926.10459.ebuild b/games-fps/eduke32/eduke32-20230926.10459.ebuild
index 388719401c0c..4f27ffafa2d1 100644
--- a/games-fps/eduke32/eduke32-20230926.10459.ebuild
+++ b/games-fps/eduke32/eduke32-20230926.10459.ebuild
@@ -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() {
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");
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-10-03 0:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-16 23:06 [gentoo-commits] repo/gentoo:master commit in: games-fps/eduke32/files/, games-fps/eduke32/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2023-10-03 0:13 Conrad Kostecki
2022-06-25 14:35 Conrad Kostecki
2022-02-11 14:44 Conrad Kostecki
2020-08-09 20:00 Conrad Kostecki
2020-05-23 13:57 Conrad Kostecki
2019-04-22 22:00 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox