diff options
Diffstat (limited to 'games-fps')
108 files changed, 1019 insertions, 2303 deletions
diff --git a/games-fps/alephone-durandal/Manifest b/games-fps/alephone-durandal/Manifest index 8c577f82cfda..5d03c7d5ae56 100644 --- a/games-fps/alephone-durandal/Manifest +++ b/games-fps/alephone-durandal/Manifest @@ -1 +1 @@ -DIST Marathon2-20221126-Data.zip 29711060 BLAKE2B aa65a575a2b36a9b07cfc978042aa31485e2e02de7886fc7505ca430e7c8e67d1b2b9a77578777abe1042192f82bd7a40f2ab5e848d6a5d4a2e48ddd0b8f075d SHA512 18911eb415b66d6a698c56a6343eb319d9fd2baa34b408d26e0800f2028e0a5724556530beda8660b5f6b071e1544ad7ee59307888e6d021c7628c295e813147 +DIST Marathon2-20240822-Data.zip 28902408 BLAKE2B a0b2f0c565bd11b0f9360198f121d86ada6d76b2a49cce95a46285674135ec79ecaa267305804b167130603f791956c1aed03d653f1a0768301bdb5148b0e718 SHA512 65cedbc20b70f2ae6382e5dfa28cf1c108c4726b75d7c25fccae8e0d29a0cf60e8bdc8eca23fb4224131527e5be3dca732f4af22389ca61b2e531121969589db diff --git a/games-fps/alephone-durandal/alephone-durandal-20221126.ebuild b/games-fps/alephone-durandal/alephone-durandal-20240822.ebuild index ae8fcfa41812..2de0830a6d26 100644 --- a/games-fps/alephone-durandal/alephone-durandal-20221126.ebuild +++ b/games-fps/alephone-durandal/alephone-durandal-20240822.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/games-fps/alephone-durandal/metadata.xml b/games-fps/alephone-durandal/metadata.xml index 2a5f1108e681..d7b00a0d5f6d 100644 --- a/games-fps/alephone-durandal/metadata.xml +++ b/games-fps/alephone-durandal/metadata.xml @@ -1,12 +1,12 @@ <?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> </maintainer> <maintainer type="person"> - <email>Matt.Jolly@footclan.ninja</email> + <email>kangie@gentoo.org</email> <name>Matt Jolly</name> </maintainer> <upstream> diff --git a/games-fps/alephone-infinity/Manifest b/games-fps/alephone-infinity/Manifest index 9c29ddec2a66..468e85562091 100644 --- a/games-fps/alephone-infinity/Manifest +++ b/games-fps/alephone-infinity/Manifest @@ -1 +1 @@ -DIST MarathonInfinity-20221126-Data.zip 32204262 BLAKE2B 35292a53b9983411c4fd07f4c424950c8d2588132f75153ce88d6b97fbb43638985be3f254c7ce847a5eb63fbaf757a0b3914d23fd3025bd1f4d8a7f374691da SHA512 8e245618d0ed9ed3b7944360fa2db36f9cc255510c04c8d45f168a43ed398965ebc5551b604cc59b51b37cacbf41ac0e4aaced046704cb095dadd4e585d2763a +DIST MarathonInfinity-20240822-Data.zip 31852152 BLAKE2B 8360a413a9d813b315d7c012965fa54ad480a99dad4e44135d2e4fbab96fa92b604f9004a0a0456f86fbda070c28c7fb504ad2d7aa7347eeb53633b036320d75 SHA512 354dac31983d5ff516c8326fdb915411d06b27a6e3089c0ced9723d1604aacce2e1cb299e1c59cbea06180c388472a8757091582c232693ae7c219bd9bb774a9 diff --git a/games-fps/alephone-infinity/alephone-infinity-20221126.ebuild b/games-fps/alephone-infinity/alephone-infinity-20240822.ebuild index 4c0369226bad..05045fa23f0e 100644 --- a/games-fps/alephone-infinity/alephone-infinity-20221126.ebuild +++ b/games-fps/alephone-infinity/alephone-infinity-20240822.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/games-fps/alephone-infinity/metadata.xml b/games-fps/alephone-infinity/metadata.xml index 2a5f1108e681..d7b00a0d5f6d 100644 --- a/games-fps/alephone-infinity/metadata.xml +++ b/games-fps/alephone-infinity/metadata.xml @@ -1,12 +1,12 @@ <?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> </maintainer> <maintainer type="person"> - <email>Matt.Jolly@footclan.ninja</email> + <email>kangie@gentoo.org</email> <name>Matt Jolly</name> </maintainer> <upstream> diff --git a/games-fps/alephone-marathon/Manifest b/games-fps/alephone-marathon/Manifest index 3f12b7f3582d..6b10ce162178 100644 --- a/games-fps/alephone-marathon/Manifest +++ b/games-fps/alephone-marathon/Manifest @@ -1 +1 @@ -DIST Marathon-20221126-Data.zip 26473388 BLAKE2B 16e93da81942c77ff399364d16a9b554c9f13320f08604006dc991b0be24db69d2a6496c45053d2ebb66628f3f2024d09953cec565d6fbdf8d6380f593f47e3e SHA512 4fcf16fcf0a04ccb5ce1fc4dc0ef95a09ff9010f444438c830977490401d3ca01e10d1ffe429df804d3ed6683e8b8f5aed982ca5a3e3049a23b074c783fb7c61 +DIST Marathon-20240822-Data.zip 26408514 BLAKE2B 81459b2bd3718fc4b87d8da512da202912847673ee912467d7aee871bede0f5163cccdf0836f39968dd6c93cff443684491189281ad90b10ae9d0a77e45a8f24 SHA512 b834b181c9451d003c1e87844faf7c56e827e48475d66ac644f4387227ec40f5199758c3a517334c10ae3938f51ecf453d40cc99ff0a95614c5888a6b5cfb196 diff --git a/games-fps/alephone-marathon/alephone-marathon-20221126.ebuild b/games-fps/alephone-marathon/alephone-marathon-20240822.ebuild index 020967a4d7da..a1e8facfaa52 100644 --- a/games-fps/alephone-marathon/alephone-marathon-20221126.ebuild +++ b/games-fps/alephone-marathon/alephone-marathon-20240822.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/games-fps/alephone-marathon/metadata.xml b/games-fps/alephone-marathon/metadata.xml index 2a5f1108e681..d7b00a0d5f6d 100644 --- a/games-fps/alephone-marathon/metadata.xml +++ b/games-fps/alephone-marathon/metadata.xml @@ -1,12 +1,12 @@ <?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> </maintainer> <maintainer type="person"> - <email>Matt.Jolly@footclan.ninja</email> + <email>kangie@gentoo.org</email> <name>Matt Jolly</name> </maintainer> <upstream> diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest index 24554b54aee2..b0c649044f7d 100644 --- a/games-fps/alephone/Manifest +++ b/games-fps/alephone/Manifest @@ -1 +1 @@ -DIST release-20230119.tar.gz 6968352 BLAKE2B 06bc87b4c2bc6a311ee90f854f7c35fb4da2862c417b192a4364dbd38cac9c0c02c4439abf07e6bc7c2d68899fae4dd938464896039943f1fa6ae5a4a644260f SHA512 d1ede53c20a24b74f5525e2e8c09fdbbb05fa0262bbd8f6c1abe6c3698cdfd1dea2436487ec8f64c79a7e1f150367e40ea48838f8a42031b45c0b1498a0e77d1 +DIST alephone-20240822.tar.gz 9146694 BLAKE2B 236997765085c520b90399cffba04a5edeb54810e1d0b614ded183addf7520727b6750971cdc70215e211547514209b01c7e515c4e1e7296e18c99c1a79ff958 SHA512 e00dbc4cb84c40c666554114c47f3eff59ab6fbc101d45d20ae510d9cc2ef1d75300f2554f61396939d030d1fd5ff237b512c6e34ae779523b93e206368bec3d diff --git a/games-fps/alephone/alephone-20230119.ebuild b/games-fps/alephone/alephone-20240822.ebuild index 67bf15ff6d89..7219486b5808 100644 --- a/games-fps/alephone/alephone-20230119.ebuild +++ b/games-fps/alephone/alephone-20240822.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools optfeature prefix toolchain-funcs xdg +inherit autotools flag-o-matic optfeature prefix toolchain-funcs xdg DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon" HOMEPAGE="https://alephone.lhowon.org/" @@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/" EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine else - SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz" + SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-release-${PV}" KEYWORDS="~amd64" fi @@ -20,19 +20,15 @@ fi LICENSE="GPL-3+ BitstreamVera OFL-1.1" SLOT="0" -IUSE="alsa curl speex upnp" +IUSE="curl upnp" -# ffmpeg covers most audio/video use cases and the package doesn't configure -# with alternatives enabled (media-libs/smpeg) -# When resolved upstream, -# !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg ) -# with an appropriate REQUIRED_USE may be added. -# See https://github.com/Aleph-One-Marathon/alephone/issues/85 RDEPEND=" dev-libs/boost:= dev-libs/zziplib:= + media-libs/openal media-libs/libpng media-libs/libsdl2 + media-libs/libsndfile media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf @@ -40,12 +36,7 @@ RDEPEND=" sys-libs/zlib virtual/opengl virtual/glu - alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) - speex? ( - media-libs/speex - media-libs/speexdsp - ) upnp? ( net-libs/miniupnpc ) " @@ -57,26 +48,25 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( "${FILESDIR}/${P}-c99.patch" ) - src_prepare() { default eautoreconf } src_configure() { - econf \ - --enable-lua \ - --enable-opengl \ - --with-ffmpeg \ - --without-mad \ - --without-smpeg \ - --without-sndfile \ - --without-vorbis \ - $(use_with alsa) \ - $(use_with curl) \ - $(use_with speex) \ + # With LTO enabled enemies are not visible + # https://github.com/Aleph-One-Marathon/alephone/issues/518 + filter-lto + my_econf=( + --enable-opengl + --with-ffmpeg + --with-png + --with-sdl_image + --with-zzip + $(use_with curl) $(use_with upnp miniupnpc) + ) + econf "${my_econf[@]}" } src_compile() { diff --git a/games-fps/alephone/alephone-99999999.ebuild b/games-fps/alephone/alephone-99999999.ebuild index 15a4810f346c..7219486b5808 100644 --- a/games-fps/alephone/alephone-99999999.ebuild +++ b/games-fps/alephone/alephone-99999999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools optfeature prefix toolchain-funcs xdg +inherit autotools flag-o-matic optfeature prefix toolchain-funcs xdg DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon" HOMEPAGE="https://alephone.lhowon.org/" @@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/" EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine else - SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz" + SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-release-${PV}" KEYWORDS="~amd64" fi @@ -20,19 +20,15 @@ fi LICENSE="GPL-3+ BitstreamVera OFL-1.1" SLOT="0" -IUSE="alsa curl speex upnp" +IUSE="curl upnp" -# ffmpeg covers most audio/video use cases and the package doesn't configure -# with alternatives enabled (media-libs/smpeg) -# When resolved upstream, -# !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg ) -# with an appropriate REQUIRED_USE may be added. -# See https://github.com/Aleph-One-Marathon/alephone/issues/85 RDEPEND=" dev-libs/boost:= dev-libs/zziplib:= + media-libs/openal media-libs/libpng media-libs/libsdl2 + media-libs/libsndfile media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf @@ -40,12 +36,7 @@ RDEPEND=" sys-libs/zlib virtual/opengl virtual/glu - alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) - speex? ( - media-libs/speex - media-libs/speexdsp - ) upnp? ( net-libs/miniupnpc ) " @@ -63,18 +54,19 @@ src_prepare() { } src_configure() { - econf \ - --enable-lua \ - --enable-opengl \ - --with-ffmpeg \ - --without-mad \ - --without-smpeg \ - --without-sndfile \ - --without-vorbis \ - $(use_with alsa) \ - $(use_with curl) \ - $(use_with speex) \ + # With LTO enabled enemies are not visible + # https://github.com/Aleph-One-Marathon/alephone/issues/518 + filter-lto + my_econf=( + --enable-opengl + --with-ffmpeg + --with-png + --with-sdl_image + --with-zzip + $(use_with curl) $(use_with upnp miniupnpc) + ) + econf "${my_econf[@]}" } src_compile() { diff --git a/games-fps/alephone/files/alephone-20230119-c99.patch b/games-fps/alephone/files/alephone-20230119-c99.patch deleted file mode 100644 index 7340e1fb2be0..000000000000 --- a/games-fps/alephone/files/alephone-20230119-c99.patch +++ /dev/null @@ -1,99 +0,0 @@ -https://github.com/Aleph-One-Marathon/alephone/pull/405 -From: Matt Jolly <Matt.Jolly@footclan.ninja> -Date: Sat, 28 Jan 2023 18:03:51 +1100 -Subject: [PATCH] use designated initialisers for SDL_ffmpegCodec* - -These were failing to compile under clang16 as the old `audioBitrate` -was being jammed into `crf`, causing an incompatible integer conversion. ---- a/Source_Files/FFmpeg/SDL_ffmpeg.c -+++ b/Source_Files/FFmpeg/SDL_ffmpeg.c -@@ -155,41 +155,55 @@ int SDL_ffmpegDecodeVideoFrame( SDL_ffmpegFile*, AVPacket*, SDL_ffmpegVideoFrame - - const SDL_ffmpegCodec SDL_ffmpegCodecAUTO = - { -- -1, -- 720, 576, -- 1, 25, -- 6000000, -- -1, -1, -- -1, -- 2, 48000, -- 192000, -- -1, -1 -+ .videoCodecID=-1, -+ .width=720, -+ .height=576, -+ .framerateNum=1, -+ .framerateDen=25, -+ .videoBitrate=6000000, -+ .videoMinRate=-1, -+ .videoMaxRate=-1, -+ .audioCodecID=-1, -+ .channels=2, -+ .sampleRate=48000, -+ .cpuCount=-1, -+ .audioQuality=-1 - }; - -+ -+ - const SDL_ffmpegCodec SDL_ffmpegCodecPALDVD = - { -- AV_CODEC_ID_MPEG2VIDEO, -- 720, 576, -- 1, 25, -- 6000000, -- -1, -1, -- AV_CODEC_ID_MP2, -- 2, 48000, -- 192000, -- -1, -1 -+ .videoCodecID=AV_CODEC_ID_MPEG2VIDEO, -+ .width=720, -+ .height=576, -+ .framerateNum=1, -+ .framerateDen=25, -+ .videoBitrate=6000000, -+ .videoMinRate=-1, -+ .videoMaxRate=-1, -+ .audioCodecID=AV_CODEC_ID_MP2, -+ .channels=2, -+ .sampleRate=48000, -+ .cpuCount=-1, -+ .audioQuality=-1 - }; - - const SDL_ffmpegCodec SDL_ffmpegCodecPALDV = - { -- AV_CODEC_ID_DVVIDEO, -- 720, 576, -- 1, 25, -- 6553600, -- -1, -1, -- AV_CODEC_ID_DVAUDIO, -- 2, 48000, -- 256000, -- -1, -1 -+ .videoCodecID=AV_CODEC_ID_DVVIDEO, -+ .width=720, -+ .height=576, -+ .framerateNum=1, -+ .framerateDen=25, -+ .videoBitrate=6553600, -+ .videoMinRate=-1, -+ .videoMaxRate=-1, -+ .audioCodecID=AV_CODEC_ID_DVAUDIO, -+ .channels=2, -+ .sampleRate=48000, -+ .cpuCount=-1, -+ .audioQuality=-1 - }; - - SDL_ffmpegFile* SDL_ffmpegCreateFile() -@@ -2269,4 +2283,4 @@ int SDL_ffmpegDecodeVideoFrame( SDL_ffmpegFile* file, AVPacket *pack, SDL_ffmpeg - /** - \endcond - */ --#endif -\ No newline at end of file -+#endif diff --git a/games-fps/alephone/metadata.xml b/games-fps/alephone/metadata.xml index 62d4b84ac671..4931274cfc84 100644 --- a/games-fps/alephone/metadata.xml +++ b/games-fps/alephone/metadata.xml @@ -1,12 +1,12 @@ <?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> </maintainer> - <maintainer type="person" proxied="yes"> - <email>Matt.Jolly@footclan.ninja</email> + <maintainer type="person"> + <email>kangie@gentoo.org</email> <name>Matt Jolly</name> </maintainer> <upstream> diff --git a/games-fps/chocolate-doom/Manifest b/games-fps/chocolate-doom/Manifest index b2cd839d0fdd..395ec4e9c217 100644 --- a/games-fps/chocolate-doom/Manifest +++ b/games-fps/chocolate-doom/Manifest @@ -1,2 +1 @@ -DIST chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch 26736 BLAKE2B 3b75eaf6ea38280eb649eb0a35cf72376fc8daafda51a79bb321e1ac9311bd7d7edc6b7740b235288c32142c01fcf346045091783912739317556a78eb07751a SHA512 64512c47d404de1a85f84948bcf780257070f5b22dce6fa7dba66ba65027a15e93e39145424be327de4abd1f1f3b994fcd936e3dcdc564f1f96238b133a3a554 -DIST chocolate-doom-3.0.1.tar.gz 2245563 BLAKE2B 0c9babfbc9e52ea7822ca00c0dbf84e471bfe6d6ec94f729d3d0f72243205b060e5a3b5f1f99728da7764e81af735b45d001bb368dd2b5796666554e3c911090 SHA512 2a81905cf619ea2def7e2f9ebe65b38543d01bd83a95e535e88d04a79f2676f8ba0da64031a650bd905e1345cda1b9d28a398ad87c10c92f2d3d50f3253ec214 +DIST chocolate-doom-3.1.0.tar.gz 2256537 BLAKE2B 4e311985e1c20d2d5bf0cc6ef3e860c78a0d1e413ca398800bcdcf86f43727e48f1306e7e9c8878e3313e9ca2e7ba3d48eddd220ef5def06230caf32fe0890fb SHA512 17f65c6f4a48dd1b0aa71bdf495d1036602739f1955d64f7de46157fce912ab4e4344a0f7ad073980f50d67e34f9f5e84402e7f2142cd6364453b71c8d5c2592 diff --git a/games-fps/chocolate-doom/chocolate-doom-3.0.1-r1.ebuild b/games-fps/chocolate-doom/chocolate-doom-3.0.1-r1.ebuild deleted file mode 100644 index 6ef3622f6d35..000000000000 --- a/games-fps/chocolate-doom/chocolate-doom-3.0.1-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools prefix python-any-r1 xdg - -DESCRIPTION="A Doom source port that is minimalist and historically accurate" -HOMEPAGE="https://www.chocolate-doom.org" -SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz - https://gist.githubusercontent.com/vilhelmgray/28d4713cb6387ad62ab76cfac1443355/raw/f7600d93ca45a5102969b8f89974a3c36a3563f5/${P}-overhaul-manpages-add-parameters.patch" - -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc libsamplerate +midi png vorbis" - -DEPEND=" - media-libs/libsdl2[video] - media-libs/sdl2-mixer[midi?,vorbis?] - media-libs/sdl2-net - libsamplerate? ( media-libs/libsamplerate ) - png? ( media-libs/libpng:= )" -RDEPEND="${DEPEND}" -# ${PYTHON_DEPS} for bash-completion -BDEPEND=" - ${PYTHON_DEPS} - doc? ( ${PYTHON_DEPS} )" - -S="${WORKDIR}/${PN}-${P}" - -PATCHES=( - "${DISTDIR}/${P}-overhaul-manpages-add-parameters.patch" - "${FILESDIR}/${P}-further-manpage-substitutions-and-fixes.patch" - "${FILESDIR}/${P}-bash-completion-run-docgen-with-z-argument.patch" - "${FILESDIR}/${P}-install-AppStream-metadata-into-the-proper-location.patch" - "${FILESDIR}/${P}-Update-AppStream-XML-files-to-current-0.11-standards.patch" - "${FILESDIR}/${P}-bash-completion-Build-from-actual-shell-script-templ.patch" - "${FILESDIR}/${P}-configure-add-AM_PROG_AR-macro.patch" - "${FILESDIR}/${P}-bash-completion-always-install-into-datadir-bash-com.patch" - "${FILESDIR}/${P}-Update-to-latest-AppStream-formerly-AppData-standard.patch" - "${FILESDIR}/${P}-use-reverse-DNS-naming-for-installing-.desktop-files.patch" - "${FILESDIR}/${P}-Remove-redundant-demoextend-definition.patch" - "${FILESDIR}/${P}-Introduce-configure-options-for-bash-completion-doc-.patch" - "${FILESDIR}/${P}-Add-support-for-usr-share-doom-IWAD-search-path.patch" - "${FILESDIR}/${P}-Update-documentation-about-usr-share-doom-IWAD-locat.patch" - "${FILESDIR}/${P}-Fix-Python-check.patch" -) - -DOCS=( - "AUTHORS" - "ChangeLog" - "NEWS.md" - "NOT-BUGS.md" - "PHILOSOPHY.md" - "README.md" - "README.Music.md" - "README.Strife.md" -) - -src_prepare() { - default - - hprefixify src/d_iwad.c - - eautoreconf -} - -src_configure() { - econf \ - --enable-bash-completion \ - $(use_enable doc) \ - --disable-fonts \ - --disable-icons \ - $(use_with libsamplerate) \ - $(use_with png libpng) -} - -src_install() { - emake DESTDIR="${D}" install - - # Remove redundant documentation files - rm -r "${ED}/usr/share/doc/"* || die - - einstalldocs -} diff --git a/games-fps/chocolate-doom/chocolate-doom-3.1.0.ebuild b/games-fps/chocolate-doom/chocolate-doom-3.1.0.ebuild new file mode 100644 index 000000000000..afb39759009b --- /dev/null +++ b/games-fps/chocolate-doom/chocolate-doom-3.1.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit autotools prefix python-any-r1 xdg + +DESCRIPTION="A Doom source port that is minimalist and historically accurate" +HOMEPAGE="https://www.chocolate-doom.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" +LICENSE="BSD GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="doc libsamplerate +midi png vorbis" + +DEPEND=" + media-libs/libsdl2[video] + media-libs/sdl2-mixer[midi?,vorbis?] + media-libs/sdl2-net + libsamplerate? ( media-libs/libsamplerate ) + png? ( media-libs/libpng:= ) +" + +RDEPEND=" + ${DEPEND} +" + +# ${PYTHON_DEPS} for bash-completion and docs. +BDEPEND=" + ${PYTHON_DEPS} +" + +DOCS=( + "AUTHORS" + "ChangeLog" + "NEWS.md" + "NOT-BUGS.md" + "PHILOSOPHY.md" + "README.md" + "README.Music.md" + "README.Strife.md" +) + +src_prepare() { + default + + hprefixify src/d_iwad.c + + eautoreconf +} + +src_configure() { + econf \ + --enable-bash-completion \ + $(use_enable doc) \ + --disable-fonts \ + --disable-icons \ + $(use_with libsamplerate) \ + $(use_with png libpng) +} + +src_install() { + emake DESTDIR="${D}" install + + # Remove redundant documentation files + rm -r "${ED}/usr/share/doc/"* || die + + einstalldocs +} diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Add-support-for-usr-share-doom-IWAD-search-path.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Add-support-for-usr-share-doom-IWAD-search-path.patch deleted file mode 100644 index 719ec12a93dc..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Add-support-for-usr-share-doom-IWAD-search-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 405662edfda15bd4ba2a6e32023eeb8c5e73646f Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray <vilhelm.gray@gmail.com> -Date: Thu, 25 Jun 2020 11:13:55 -0400 -Subject: [PATCH] Add support for /usr/share/doom IWAD search path - -Some Linux distros such as Gentoo have deprecated the /usr/share/games -directory. IWADs are typically installed under the /usr/share directory -for these distros. ---- - src/d_iwad.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/d_iwad.c b/src/d_iwad.c -index 09853a64..e112e4f4 100644 ---- a/src/d_iwad.c -+++ b/src/d_iwad.c -@@ -657,6 +657,7 @@ static void AddXdgDirs(void) - // source ports is /usr/share/games/doom - we support this through the - // XDG_DATA_DIRS mechanism, through which it can be overridden. - AddIWADPath(env, "/games/doom"); -+ AddIWADPath(env, "/doom"); - - // The convention set by RBDOOM-3-BFG is to install Doom 3: BFG - // Edition into this directory, under which includes the Doom --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Fix-Python-check.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Fix-Python-check.patch deleted file mode 100644 index 8d4f169bd03e..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Fix-Python-check.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ab1a38d8e902baebc7183fb511bd58c50e2b4571 Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray <vilhelm.gray@gmail.com> -Date: Mon, 24 Aug 2020 09:03:57 -0400 -Subject: [PATCH] Fix Python check for doc, bash-completion, fonts, and icons - options - -Fixes: cfc56fa6 ("Introduce configure options for bash-completion, doc, fonts, and icons") ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9bef517a..4dbd2db7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,7 +40,7 @@ AC_ARG_ENABLE([bash-completion], - AS_HELP_STRING([--disable-bash-completion], [Disable bash-completion]) - ) - AS_IF([test "x$enable_bash_completion" != xno], [ -- AS_IF([test HAVE_PYTHON = false], [ -+ AS_IF([test "x$HAVE_PYTHON" = xfalse], [ - AC_MSG_WARN([Building bash-completion requires Python, but Python not found]) - enable_bash_completion=no - ]) -@@ -51,7 +51,7 @@ AC_ARG_ENABLE([doc], - AS_HELP_STRING([--disable-doc], [Disable documentation]) - ) - AS_IF([test "x$enable_doc" != xno], [ -- AS_IF([test HAVE_PYTHON = false], [ -+ AS_IF([test "x$HAVE_PYTHON" = xfalse], [ - AC_MSG_WARN([Building documentation requires Python, but Python not found]) - enable_doc=no - ]) -@@ -62,7 +62,7 @@ AC_ARG_ENABLE([fonts], - AS_HELP_STRING([--disable-fonts], [Disable fonts]) - ) - AS_IF([test "x$enable_fonts" != xno], [ -- AS_IF([test HAVE_PYTHON = false], [ -+ AS_IF([test "x$HAVE_PYTHON" = xfalse], [ - AC_MSG_WARN([Building fonts require Python, but Python not found]) - enable_fonts=no - ]) -@@ -73,7 +73,7 @@ AC_ARG_ENABLE([icons], - AS_HELP_STRING([--disable-icons], [Disable icons]) - ) - AS_IF([test "x$enable_icons" != xno], [ -- AS_IF([test HAVE_PYTHON = false], [ -+ AS_IF([test "x$HAVE_PYTHON" = xfalse], [ - AC_MSG_WARN([Building icons require Python, but Python not found]) - enable_icons=no - ]) --- -2.28.0 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Introduce-configure-options-for-bash-completion-doc-.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Introduce-configure-options-for-bash-completion-doc-.patch deleted file mode 100644 index bb1e000460a5..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Introduce-configure-options-for-bash-completion-doc-.patch +++ /dev/null @@ -1,171 +0,0 @@ -From cfc56fa6a5809c2dbc7276df3579836e586d9193 Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray <vilhelm.gray@gmail.com> -Date: Tue, 23 Jun 2020 12:56:01 -0400 -Subject: [PATCH] Introduce configure options for bash-completion, doc, fonts, - and icons - -This patch introduces the --enable-bash-completion, --enable-doc, ---enable-fonts, and --enable-icons configuration options to control the -build of bash-completion, documentation, fonts, and icons respectively. -This is useful for users of systems such as Gentoo which allow custom -configuration of packages, or for package maintainers in general who -would like finer control over the components built when compiling -Chocolate Doom. ---- - Makefile.am | 2 +- - configure.ac | 49 ++++++++++++++++++++++++++++++++- - man/Makefile.am | 2 +- - man/bash-completion/Makefile.am | 2 +- - src/Makefile.am | 2 +- - src/setup/Makefile.am | 2 +- - textscreen/fonts/Makefile.am | 2 +- - 7 files changed, 54 insertions(+), 7 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 1bd91a43..70f2e5b9 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -50,7 +50,7 @@ SUBDIRS=textscreen midiproc opl pcsound data src man - - DIST_SUBDIRS=pkg $(SUBDIRS) - --if HAVE_PYTHON -+if HAVE_DOC - - INSTALL : man/INSTALL.template man/simplecpp - ./man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \ -diff --git a/configure.ac b/configure.ac -index 8e18a0e9..9bef517a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -35,6 +35,50 @@ PKG_CHECK_MODULES(SDL, [sdl2 >= 2.0.1]) - PKG_CHECK_MODULES(SDLMIXER, [SDL2_mixer >= 2.0.0]) - PKG_CHECK_MODULES(SDLNET, [SDL2_net >= 2.0.0]) - -+# Check for bash-completion. -+AC_ARG_ENABLE([bash-completion], -+AS_HELP_STRING([--disable-bash-completion], [Disable bash-completion]) -+) -+AS_IF([test "x$enable_bash_completion" != xno], [ -+ AS_IF([test HAVE_PYTHON = false], [ -+ AC_MSG_WARN([Building bash-completion requires Python, but Python not found]) -+ enable_bash_completion=no -+ ]) -+]) -+ -+# Check for doc. -+AC_ARG_ENABLE([doc], -+AS_HELP_STRING([--disable-doc], [Disable documentation]) -+) -+AS_IF([test "x$enable_doc" != xno], [ -+ AS_IF([test HAVE_PYTHON = false], [ -+ AC_MSG_WARN([Building documentation requires Python, but Python not found]) -+ enable_doc=no -+ ]) -+]) -+ -+# Check for fonts. -+AC_ARG_ENABLE([fonts], -+AS_HELP_STRING([--disable-fonts], [Disable fonts]) -+) -+AS_IF([test "x$enable_fonts" != xno], [ -+ AS_IF([test HAVE_PYTHON = false], [ -+ AC_MSG_WARN([Building fonts require Python, but Python not found]) -+ enable_fonts=no -+ ]) -+]) -+ -+# Check for icons. -+AC_ARG_ENABLE([icons], -+AS_HELP_STRING([--disable-icons], [Disable icons]) -+) -+AS_IF([test "x$enable_icons" != xno], [ -+ AS_IF([test HAVE_PYTHON = false], [ -+ AC_MSG_WARN([Building icons require Python, but Python not found]) -+ enable_icons=no -+ ]) -+]) -+ - # Check for libsamplerate. - AC_ARG_WITH([libsamplerate], - AS_HELP_STRING([--without-libsamplerate], -@@ -106,7 +150,10 @@ AS_IF([test "x$enable_werror" = "xyes"], [ - ]) - - AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "") --AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON) -+AM_CONDITIONAL(HAVE_BASH_COMPLETION, [test "x$enable_bash_completion" != xno]) -+AM_CONDITIONAL(HAVE_DOC, [test "x$enable_doc" != xno]) -+AM_CONDITIONAL(HAVE_FONTS, [test "x$enable_fonts" != xno]) -+AM_CONDITIONAL(HAVE_ICONS, [test "x$enable_icons" != xno]) - - dnl Automake v1.8.0 is required, please upgrade! - -diff --git a/man/Makefile.am b/man/Makefile.am -index 915cb206..5a886fc9 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -15,7 +15,7 @@ hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic - hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen - strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife - --if HAVE_PYTHON -+if HAVE_DOC - - GENERATED_MAN_PAGES = \ - @PROGRAM_PREFIX@doom.6 \ -diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am -index 9c1400f1..a79fe623 100644 ---- a/man/bash-completion/Makefile.am -+++ b/man/bash-completion/Makefile.am -@@ -6,7 +6,7 @@ BASH_COMPLETION_TEMPLATES = \ - hexen.template \ - strife.template - --if HAVE_PYTHON -+if HAVE_BASH_COMPLETION - - BASH_COMPLETION_SCRIPTLETS = \ - @PROGRAM_PREFIX@doom \ -diff --git a/src/Makefile.am b/src/Makefile.am -index 19a42598..698d2ce0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -271,7 +271,7 @@ CLEANFILES = $(execgames_SCRIPTS) $(app_DATA) $(screensaver_DATA) - %.o : %.rc - $(WINDRES) $< -o $@ - --if HAVE_PYTHON -+if HAVE_ICONS - - icon.c : $(top_builddir)/data/doom.png - $(top_builddir)/data/convert-icon $(top_builddir)/data/doom.png $@ -diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am -index a9dd240c..493b0b47 100644 ---- a/src/setup/Makefile.am -+++ b/src/setup/Makefile.am -@@ -33,7 +33,7 @@ CLEANFILES = $(app_DATA) - @PACKAGE_RDNS@.Setup.desktop : Setup.desktop - cp Setup.desktop $@ - --if HAVE_PYTHON -+if HAVE_ICONS - - setup_icon.c : $(top_builddir)/data/setup.png - $(top_builddir)/data/convert-icon $(top_builddir)/data/setup.png $@ -diff --git a/textscreen/fonts/Makefile.am b/textscreen/fonts/Makefile.am -index 67ae8a21..5f6ad066 100644 ---- a/textscreen/fonts/Makefile.am -+++ b/textscreen/fonts/Makefile.am -@@ -3,7 +3,7 @@ EXTRA_DIST = small.png normal.png large.png convert-font $(FONT_HDRS) - - noinst_DATA = $(FONT_HDRS) - --if HAVE_PYTHON -+if HAVE_FONTS - - small.h: small.png convert-font - ./convert-font small small.png small.h --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Remove-redundant-demoextend-definition.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Remove-redundant-demoextend-definition.patch deleted file mode 100644 index 9c087769a26c..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Remove-redundant-demoextend-definition.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a8fd4b1f563d24d4296c3e8225c8404e2724d4c2 Mon Sep 17 00:00:00 2001 -From: Jordan Christiansen <xordspar0@gmail.com> -Date: Sun, 15 Mar 2020 16:55:33 -0500 -Subject: [PATCH] Remove redundant demoextend definition - -GCC 10 enables -fno-common by default, which causes the linker to fail when -there are multple definitions of a global variable. - -See https://gcc.gnu.org/gcc-10/porting_to.html ---- - src/hexen/mn_menu.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c -index 059f45b3..a97b7fcd 100644 ---- a/src/hexen/mn_menu.c -+++ b/src/hexen/mn_menu.c -@@ -131,7 +131,6 @@ boolean MenuActive; - int InfoType; - int messageson = true; - boolean mn_SuicideConsole; --boolean demoextend; // from h2def.h - - // PRIVATE DATA DEFINITIONS ------------------------------------------------ - --- -2.28.0 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-AppStream-XML-files-to-current-0.11-standards.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-AppStream-XML-files-to-current-0.11-standards.patch deleted file mode 100644 index 7c2bfa48de29..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-AppStream-XML-files-to-current-0.11-standards.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 35827930553ca522270bd74df37a378d6b2dea8a Mon Sep 17 00:00:00 2001 -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Mon, 22 Jan 2018 20:41:16 -0800 -Subject: [PATCH] Update AppStream XML files to current (0.11) standards - -<id> tag is changed to a Reverse-DNS form, and an accommodating -PACKAGE_RDNS is set in configure.ac to use it. - -<name> and <summary> tags have been added, using existing autoconf -variable values. - -The `appstream-util validate` command will complain about some -optionally-missing tags and a strict string length limit on some of -the <caption> tags. `validate-relax` passes, and by the letter of the -AppStream specification, we should be completely valid. ---- - configure.ac | 2 ++ - src/doom.appdata.xml.in | 4 +++- - src/heretic.appdata.xml.in | 4 +++- - src/hexen.appdata.xml.in | 4 +++- - src/strife.appdata.xml.in | 4 +++- - 5 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 17299714..2190a32b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,6 +7,7 @@ PACKAGE_COPYRIGHT="Copyright (C) 1993-2017" - PACKAGE_LICENSE="GNU General Public License, version 2" - PACKAGE_MAINTAINER="Simon Howard" - PACKAGE_URL="https://www.chocolate-doom.org/" -+PACKAGE_RDNS="org.chocolate_doom" - PACKAGE_ISSUES="https://github.com/chocolate-doom/chocolate-doom/issues" - - AC_CONFIG_AUX_DIR(autotools) -@@ -142,6 +143,7 @@ AC_SUBST(PACKAGE_COPYRIGHT) - AC_SUBST(PACKAGE_LICENSE) - AC_SUBST(PACKAGE_MAINTAINER) - AC_SUBST(PACKAGE_URL) -+AC_SUBST(PACKAGE_RDNS) - AC_SUBST(PACKAGE_ISSUES) - - AC_SUBST(bashcompletiondir) -diff --git a/src/doom.appdata.xml.in b/src/doom.appdata.xml.in -index ed499f47..42747251 100644 ---- a/src/doom.appdata.xml.in -+++ b/src/doom.appdata.xml.in -@@ -1,7 +1,9 @@ - <?xml version="1.0" encoding="UTF-8"?> - - <component type="desktop"> -- <id>@PROGRAM_PREFIX@doom.desktop</id> -+ <id>@PACKAGE_RDNS@.Doom</id> -+ <name>@PACKAGE_SHORTNAME@ Doom</name> -+ <summary>@PACKAGE_SHORTDESC@</summary> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <developer_name>@PACKAGE_MAINTAINER@</developer_name> -diff --git a/src/heretic.appdata.xml.in b/src/heretic.appdata.xml.in -index 36a1739a..dc8093de 100644 ---- a/src/heretic.appdata.xml.in -+++ b/src/heretic.appdata.xml.in -@@ -1,7 +1,9 @@ - <?xml version="1.0" encoding="UTF-8"?> - - <component type="desktop"> -- <id>@PROGRAM_PREFIX@heretic.desktop</id> -+ <id>@PACKAGE_RDNS@.Heretic</id> -+ <name>@PACKAGE_SHORTNAME@ Heretic</name> -+ <summary>@PACKAGE_SHORTDESC@</summary> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <developer_name>@PACKAGE_MAINTAINER@</developer_name> -diff --git a/src/hexen.appdata.xml.in b/src/hexen.appdata.xml.in -index b5a526f2..7583cca8 100644 ---- a/src/hexen.appdata.xml.in -+++ b/src/hexen.appdata.xml.in -@@ -1,7 +1,9 @@ - <?xml version="1.0" encoding="UTF-8"?> - - <component type="desktop"> -- <id>@PROGRAM_PREFIX@hexen.desktop</id> -+ <id>@PACKAGE_RDNS@.Hexen</id> -+ <name>@PACKAGE_SHORTNAME@ Hexen</name> -+ <summary>@PACKAGE_SHORTDESC@</summary> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <developer_name>@PACKAGE_MAINTAINER@</developer_name> -diff --git a/src/strife.appdata.xml.in b/src/strife.appdata.xml.in -index 7be869c3..6db4fad4 100644 ---- a/src/strife.appdata.xml.in -+++ b/src/strife.appdata.xml.in -@@ -1,7 +1,9 @@ - <?xml version="1.0" encoding="UTF-8"?> - - <component type="desktop"> -- <id>@PROGRAM_PREFIX@strife.desktop</id> -+ <id>@PACKAGE_RDNS@.Strife</id> -+ <name>@PACKAGE_SHORTNAME@ Strife</name> -+ <summary>@PACKAGE_SHORTDESC@</summary> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <developer_name>@PACKAGE_MAINTAINER@</developer_name> --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-documentation-about-usr-share-doom-IWAD-locat.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-documentation-about-usr-share-doom-IWAD-locat.patch deleted file mode 100644 index 90cd352a5874..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-documentation-about-usr-share-doom-IWAD-locat.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: William Breathitt Gray <vilhelm.gray@gmail.com> -Date: Thu, 25 Jun 2020 11:30:42 -0400 -Subject: [PATCH] Update documentation about /usr/share/doom IWAD location - ---- - man/INSTALL.template | 2 ++ - man/iwad_paths.man | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/man/INSTALL.template b/man/INSTALL.template -index f04e98e6..9c9f7601 100644 ---- a/man/INSTALL.template -+++ b/man/INSTALL.template -@@ -199,6 +199,8 @@ do one of the following: - * Put the file into one of the following directories: - -+ /usr/share/doom - /usr/share/games/doom -+ /usr/local/share/doom - /usr/local/share/games/doom - - * Set the environment variable DOOMWADDIR to specify the path to a -diff --git a/man/iwad_paths.man b/man/iwad_paths.man -index 98058154..a41aba41 100644 ---- a/man/iwad_paths.man -+++ b/man/iwad_paths.man -@@ -35,7 +35,8 @@ Writeable directory in the user's home directory. The path can be overridden - using the \fBXDG_DATA_HOME\fR environment variable (see the XDG Base Directory - Specification). - .TP --\fB/usr/local/share/games/doom, /usr/share/games/doom\fR -+\fB/usr/local/share/doom, /usr/local/share/games/doom, /usr/share/doom, -+/usr/share/games/doom\fR - System-wide locations that can be accessed by all users. The path - \fB/usr/share/games/doom\fR is a standard path that is supported by most - Doom source ports. These paths can be overridden using the \fBXDG_DATA_DIRS\fR --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-to-latest-AppStream-formerly-AppData-standard.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-to-latest-AppStream-formerly-AppData-standard.patch deleted file mode 100644 index 39cef73483e9..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-to-latest-AppStream-formerly-AppData-standard.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Sat, 7 Sep 2019 10:43:57 -0700 -Subject: [PATCH] Update to latest AppStream (formerly AppData) standards - -Install files into ${prefix}/share/metainfo rather than -${prefix}/share/appdata, name files by reverse-DNS and suffixed -.metainfo.xml. - -"appstream-util validate" still complains about a missing -update_contact tag and issues with the caption tags being either short -or long, but the specification at -https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html -says these are not errors. ---- - configure.ac | 8 +++--- - ...om.appdata.xml.in => Doom.metainfo.xml.in} | 0 - ...appdata.xml.in => Heretic.metainfo.xml.in} | 0 - ...n.appdata.xml.in => Hexen.metainfo.xml.in} | 0 - src/Makefile.am | 28 +++++++++---------- - ....appdata.xml.in => Strife.metainfo.xml.in} | 0 - 7 files changed, 19 insertions(+), 19 deletions(-) - rename src/{doom.appdata.xml.in => Doom.metainfo.xml.in} (100%) - rename src/{heretic.appdata.xml.in => Heretic.metainfo.xml.in} (100%) - rename src/{hexen.appdata.xml.in => Hexen.metainfo.xml.in} (100%) - rename src/{strife.appdata.xml.in => Strife.metainfo.xml.in} (100%) - -diff --git a/configure.ac b/configure.ac -index 5ec9dfbf..8a3e1bbc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -167,14 +167,14 @@ pkg/osx/Info.plist - rpm.spec - data/Makefile - src/Makefile --src/doom.appdata.xml -+src/Doom.metainfo.xml - src/doom.desktop - src/doom-screensaver.desktop - src/doom/Makefile --src/heretic.appdata.xml -+src/Heretic.metainfo.xml - src/heretic.desktop - src/heretic/Makefile --src/hexen.appdata.xml -+src/Hexen.metainfo.xml - src/hexen.desktop - src/hexen/Makefile - src/resource.rc -@@ -182,7 +182,7 @@ src/setup-res.rc - src/setup/Makefile - src/setup/setup.desktop - src/setup/setup-manifest.xml --src/strife.appdata.xml -+src/Strife.metainfo.xml - src/strife.desktop - src/strife/Makefile - textscreen/Makefile -diff --git a/src/doom.appdata.xml.in b/src/Doom.metainfo.xml.in -similarity index 100% -rename from src/doom.appdata.xml.in -rename to src/Doom.metainfo.xml.in -diff --git a/src/heretic.appdata.xml.in b/src/Heretic.metainfo.xml.in -similarity index 100% -rename from src/heretic.appdata.xml.in -rename to src/Heretic.metainfo.xml.in -diff --git a/src/hexen.appdata.xml.in b/src/Hexen.metainfo.xml.in -similarity index 100% -rename from src/hexen.appdata.xml.in -rename to src/Hexen.metainfo.xml.in -diff --git a/src/Makefile.am b/src/Makefile.am -index e54aeead..6880bd3c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -220,24 +220,24 @@ EXTRA_DIST = \ - doom-screensaver.desktop.in \ - manifest.xml - --appdatadir = $(prefix)/share/metainfo --appdata_DATA = \ -- @PROGRAM_PREFIX@doom.appdata.xml \ -- @PROGRAM_PREFIX@heretic.appdata.xml \ -- @PROGRAM_PREFIX@hexen.appdata.xml \ -- @PROGRAM_PREFIX@strife.appdata.xml -+metainfodir = $(prefix)/share/metainfo -+metainfo_DATA = \ -+ @PACKAGE_RDNS@.Doom.metainfo.xml \ -+ @PACKAGE_RDNS@.Heretic.metainfo.xml \ -+ @PACKAGE_RDNS@.Hexen.metainfo.xml \ -+ @PACKAGE_RDNS@.Strife.metainfo.xml - --@PROGRAM_PREFIX@doom.appdata.xml : doom.appdata.xml -- cp doom.appdata.xml $@ -+@PACKAGE_RDNS@.Doom.metainfo.xml : Doom.metainfo.xml -+ cp Doom.metainfo.xml $@ - --@PROGRAM_PREFIX@heretic.appdata.xml : heretic.appdata.xml -- cp heretic.appdata.xml $@ -+@PACKAGE_RDNS@.Heretic.metainfo.xml : Heretic.metainfo.xml -+ cp Heretic.metainfo.xml $@ - --@PROGRAM_PREFIX@hexen.appdata.xml : hexen.appdata.xml -- cp hexen.appdata.xml $@ -+@PACKAGE_RDNS@.Hexen.metainfo.xml : Hexen.metainfo.xml -+ cp Hexen.metainfo.xml $@ - --@PROGRAM_PREFIX@strife.appdata.xml : strife.appdata.xml -- cp strife.appdata.xml $@ -+@PACKAGE_RDNS@.Strife.metainfo.xml : Strife.metainfo.xml -+ cp Strife.metainfo.xml $@ - - appdir = $(prefix)/share/applications - app_DATA = \ -diff --git a/src/strife.appdata.xml.in b/src/Strife.metainfo.xml.in -similarity index 100% -rename from src/strife.appdata.xml.in -rename to src/Strife.metainfo.xml.in --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-Build-from-actual-shell-script-templ.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-Build-from-actual-shell-script-templ.patch deleted file mode 100644 index 48445cf6efc2..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-Build-from-actual-shell-script-templ.patch +++ /dev/null @@ -1,53 +0,0 @@ -From da88012088dad9f7a5d53c26aa40aa393cb5b703 Mon Sep 17 00:00:00 2001 -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Sat, 27 Jan 2018 04:49:08 -0800 -Subject: [PATCH] bash-completion: Build from actual shell script templates. - -At some point, the Makefile was inerrantly modified so that it -generated manpage sources instead of shell script, making completions -very screwed up. ---- - man/bash-completion/Makefile.am | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am -index 60e7ae9c..bb706fc7 100644 ---- a/man/bash-completion/Makefile.am -+++ b/man/bash-completion/Makefile.am -@@ -17,28 +17,27 @@ BASH_COMPLETION_SCRIPTLETS = \ - bashcompletion_DATA = $(BASH_COMPLETION_SCRIPTLETS) - CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS) - --MANDIR = $(top_srcdir)/man --DOCGEN = $(MANDIR)/docgen -+DOCGEN = $(top_srcdir)/man/docgen - DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@" - - @PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -- -g doom -b $(MANDIR)/doom.template \ -+ -g doom -b doom.template \ - $(top_srcdir)/src $(top_srcdir)/src/doom > $@ - - @PROGRAM_PREFIX@heretic: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -- -g heretic -b $(MANDIR)/heretic.template \ -+ -g heretic -b heretic.template \ - $(top_srcdir)/src $(top_srcdir)/src/heretic > $@ - - @PROGRAM_PREFIX@hexen: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -- -g hexen -b $(MANDIR)/hexen.template \ -+ -g hexen -b hexen.template \ - $(top_srcdir)/src $(top_srcdir)/src/hexen > $@ - - @PROGRAM_PREFIX@strife: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -- -g strife -b $(MANDIR)/strife.template \ -+ -g strife -b strife.template \ - $(top_srcdir)/src $(top_srcdir)/src/strife > $@ - - EXTRA_DIST = \ --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-always-install-into-datadir-bash-com.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-always-install-into-datadir-bash-com.patch deleted file mode 100644 index 3931166599f9..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-always-install-into-datadir-bash-com.patch +++ /dev/null @@ -1,61 +0,0 @@ -From b9d4c04c840321f5ec70787d8afb1256766aaa01 Mon Sep 17 00:00:00 2001 -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Tue, 6 Aug 2019 15:40:46 -0700 -Subject: [PATCH] bash-completion: always install into $datadir/bash-completion -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The bash-completion package by default searches in $HOME/.local and -/usr/local first before /usr, and we should respect local installation -locations instead of always trying to write to a path that is -accessible only to root and could conflict with a package manager. - -This removes a toggle in the configure script, which neither actually -worked properly (setting DIR didn’t work) and I believe did the wrong -thing by default anyway. ---- - configure.ac | 9 --------- - man/bash-completion/Makefile.am | 2 +- - 2 files changed, 1 insertion(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f12eae68..5ec9dfbf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -87,13 +87,6 @@ AC_CHECK_DECLS([strcasecmp, strncasecmp], [], [], [[#include <strings.h>]]) - AC_CHECK_LIB(i386, i386_iopl) - AC_CHECK_LIB(amd64, amd64_iopl) - --AC_ARG_WITH([bashcompletiondir], -- AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completion directory]), -- [], -- [AS_IF([$($PKG_CONFIG --exists bash-completion 2> /dev/null)], -- [bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)], -- [bashcompletiondir=${datadir}/bash-completion/completions])]) -- - case "$host" in - *-*-mingw* | *-*-cygwin* | *-*-msvc* ) - AC_CHECK_TOOL(WINDRES, windres, ) -@@ -153,8 +146,6 @@ AC_SUBST(PACKAGE_URL) - AC_SUBST(PACKAGE_RDNS) - AC_SUBST(PACKAGE_ISSUES) - --AC_SUBST(bashcompletiondir) -- - dnl Shut up the datarootdir warnings. - AC_DEFUN([AC_DATAROOTDIR_CHECKED]) - -diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am -index bb706fc7..9c1400f1 100644 ---- a/man/bash-completion/Makefile.am -+++ b/man/bash-completion/Makefile.am -@@ -1,4 +1,4 @@ --bashcompletiondir=@bashcompletiondir@ -+bashcompletiondir=@datadir@/bash-completion/completions - - BASH_COMPLETION_TEMPLATES = \ - doom.template \ --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-run-docgen-with-z-argument.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-run-docgen-with-z-argument.patch deleted file mode 100644 index d9df5743d765..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-run-docgen-with-z-argument.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ccfbd4a046de9590cadb522d1f754c78ee9f8d4e Mon Sep 17 00:00:00 2001 -From: Jonathan Dowland <jon@dow.land> -Date: Mon, 15 Jan 2018 19:10:16 +0000 -Subject: [PATCH] bash-completion: run docgen with -z argument - ---- - man/bash-completion/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am -index 801dd212..60e7ae9c 100644 ---- a/man/bash-completion/Makefile.am -+++ b/man/bash-completion/Makefile.am -@@ -19,7 +19,7 @@ CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS) - - MANDIR = $(top_srcdir)/man - DOCGEN = $(MANDIR)/docgen --DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@" - - @PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-configure-add-AM_PROG_AR-macro.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-configure-add-AM_PROG_AR-macro.patch deleted file mode 100644 index 725ddb2dba55..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-configure-add-AM_PROG_AR-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 560cdc3e4572cc84d493c5450092b6ce1694bd89 Mon Sep 17 00:00:00 2001 -From: Simon Howard <fraggle@soulsphere.org> -Date: Sun, 30 Sep 2018 23:34:52 -0400 -Subject: [PATCH] configure: add AM_PROG_AR macro. - -Some platforms (eg. Emscripten) have their own version of the ar tool, -so it is important to pick one that matches the target architecture. -Without this macro we always use the default system-installed version -of ar. ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 175d7f3b..6dfced8d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,6 +15,7 @@ AC_CANONICAL_HOST - - orig_CFLAGS="$CFLAGS" - -+AM_PROG_AR - AC_PROG_CC - AC_PROG_RANLIB - AC_CHECK_PROG(HAVE_PYTHON, python, true, false) --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-further-manpage-substitutions-and-fixes.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-further-manpage-substitutions-and-fixes.patch deleted file mode 100644 index 62fc424f42b9..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-further-manpage-substitutions-and-fixes.patch +++ /dev/null @@ -1,322 +0,0 @@ -From c1f553b92a7a4873b33026463866101e18be8e76 Mon Sep 17 00:00:00 2001 -From: Jonathan Dowland <jon@dow.land> -Date: Mon, 27 Nov 2017 22:24:04 +0000 -Subject: [PATCH] further manpage substitutions and fixes - -Convert chocolate-setup.6 into a template file and generate outputs -based on @PROGRAM_PREFIX@. - -Add @PACKAGE_SHORTNAME@ to the list of parameters handed to docgen -and make appropriate substitutions in the manpage templates. ---- - man/Makefile.am | 15 ++++++++---- - man/docgen | 30 ++++++++++++++--------- - man/heretic.template | 8 +++--- - man/hexen.template | 8 +++--- - man/{chocolate-setup.6 => setup.template} | 4 +-- - man/strife.template | 14 +++++------ - 6 files changed, 45 insertions(+), 34 deletions(-) - rename man/{chocolate-setup.6 => setup.template} (94%) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 5916edf9..f0099c79 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -30,6 +30,7 @@ GENERATED_MAN_PAGES = \ - @PROGRAM_PREFIX@strife.6 \ - strife.cfg.5 \ - @PROGRAM_PREFIX@strife.cfg.5 \ -+ @PROGRAM_PREFIX@setup.6 \ - @PROGRAM_PREFIX@server.6 - - SETUP_MAN_PAGES = \ -@@ -38,8 +39,7 @@ SETUP_MAN_PAGES = \ - @PROGRAM_PREFIX@hexen-setup.6 \ - @PROGRAM_PREFIX@strife-setup.6 - --man_MANS = chocolate-setup.6 \ -- $(GENERATED_MAN_PAGES) \ -+man_MANS = $(GENERATED_MAN_PAGES) \ - $(SETUP_MAN_PAGES) - - doomdocs_DATA = INSTALL.doom CMDLINE.doom -@@ -51,10 +51,10 @@ CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \ - $(doomdocs_DATA) $(hereticdocs_DATA) \ - $(hexendocs_DATA) $(strifedocs_DATA) - DOCGEN = $(srcdir)/docgen --DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@" - --$(SETUP_MAN_PAGES): chocolate-setup.6 -- cp $(srcdir)/chocolate-setup.6 $@ -+$(SETUP_MAN_PAGES): @PROGRAM_PREFIX@setup.6 -+ cp $(srcdir)/@PROGRAM_PREFIX@setup.6 $@ - - @PROGRAM_PREFIX@doom.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -@@ -138,6 +138,11 @@ INSTALL.hexen: INSTALL.template - -g server -m $(srcdir)/server.template \ - $(top_srcdir)/src > $@ - -+@PROGRAM_PREFIX@setup.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES) -+ $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -+ -g setup -m $(srcdir)/setup.template \ -+ $(top_srcdir)/src > $@ -+ - strife.cfg.5: $(top_srcdir)/src default.cfg.template - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ - -g strife -m $(srcdir)/default.cfg.template \ -diff --git a/man/docgen b/man/docgen -index defb9060..1c8a2471 100755 ---- a/man/docgen -+++ b/man/docgen -@@ -430,7 +430,7 @@ def process_files(path): - - process_file(path) - --def print_template(template_file, program_prefix, package_name, content): -+def print_template(template_file, program_prefix, package_name, package_shortname, content): - f = io.open(template_file, encoding='UTF-8') - - try: -@@ -440,16 +440,18 @@ def print_template(template_file, program_prefix, package_name, content): - filename = match.group(1) - filename = os.path.join(os.path.dirname(template_file), - filename) -- print_template(filename, program_prefix, package_name, content) -+ print_template(filename, program_prefix, package_name, package_shortname, content) - else: - line = line.replace("@content", content) - line = line.replace("@PROGRAM_SPREFIX@", program_prefix) -- line = line.replace("@PACKAGE_SHORTNAME@", package_name) -+ line = line.replace("@PACKAGE_NAME@", package_name) -+ if package_shortname: -+ line = line.replace("@PACKAGE_SHORTNAME@", package_shortname) - stdout(line.rstrip().encode('UTF-8') + b'\n') - finally: - f.close() - --def manpage_output(targets, program_prefix, package_name, template_file): -+def manpage_output(targets, program_prefix, package_name, package_shortname, template_file): - - content = "" - -@@ -458,7 +460,7 @@ def manpage_output(targets, program_prefix, package_name, template_file): - - content = content.replace("-", "\\-") - -- print_template(template_file, program_prefix, package_name, content) -+ print_template(template_file, program_prefix, package_name, package_shortname, content) - - def wiki_output(targets, template): - read_wikipages() -@@ -466,30 +468,31 @@ def wiki_output(targets, template): - for t in targets: - stdout(t.wiki_output().encode('UTF-8') + b'\n') - --def plaintext_output(targets, program_prefix, package_name, template_file): -+def plaintext_output(targets, program_prefix, package_name, package_shortname, template_file): - - content = "" - - for t in targets: - content += t.plaintext_output() + "\n" - -- print_template(template_file, program_prefix, package_name, content) -+ print_template(template_file, program_prefix, package_name, package_shortname, content) - --def completion_output(targets, program_prefix, package_name, template_file): -+def completion_output(targets, program_prefix, package_name, package_shortname, template_file): - - content = "" - - for t in targets: - content += t.completion_output() + "\n" - -- print_template(template_file, program_prefix, package_name, content) -+ print_template(template_file, program_prefix, package_name, package_shortname, content) - - def usage(): -- print("Usage: %s [-V] [-c tag] [-g game] -n name ( -m | -w | -p ) <dir>..." \ -+ print("Usage: %s [-V] [-c tag] [-g game] -n program_name -s package_name [ -z shortname ] ( -m | -w | -p ) <dir>..." \ - % sys.argv[0]) - print(" -c : Provide documentation for the specified configuration file") - print(" (matches the given tag name in the source file)") - print(" -s : Package name (for substitution)") -+ print(" -z : Package short-name (for substitution)") - print(" -n : Program name (for substitution)") - print(" -m : Manpage output") - print(" -w : Wikitext output") -@@ -501,7 +504,7 @@ def usage(): - - # Parse command line - --opts, args = getopt.getopt(sys.argv[1:], "n:s:m:wp:b:c:g:V") -+opts, args = getopt.getopt(sys.argv[1:], "n:s:z:m:wp:b:c:g:V") - - output_function = None - template = None -@@ -509,12 +512,15 @@ doc_config_file = None - match_game = None - program_prefix = None - package_name = None -+package_shortname = None - - for opt in opts: - if opt[0] == "-n": - program_prefix = opt[1] - if opt[0] == "-s": - package_name = opt[1] -+ if opt[0] == "-z": -+ package_shortname = opt[1] - if opt[0] == "-m": - output_function = manpage_output - template = opt[1] -@@ -556,5 +562,5 @@ else: - - # Generate the output - -- output_function(documentation_targets, program_prefix, package_name, template) -+ output_function(documentation_targets, program_prefix, package_name, package_shortname, template) - -diff --git a/man/heretic.template b/man/heretic.template -index c078c7c6..3fa4ce1d 100644 ---- a/man/heretic.template -+++ b/man/heretic.template -@@ -6,7 +6,7 @@ - [\fIOPTIONS\fR] - .SH DESCRIPTION - .PP --Chocolate Heretic is a port of Raven Software's 1994 game "Heretic" that -+@PACKAGE_SHORTNAME@ Heretic is a port of Raven Software's 1994 game "Heretic" that - aims to behave as similar to the original DOS version of Heretic as - possible. - .br -@@ -14,16 +14,16 @@ possible. - .SH IWAD SEARCH PATHS - @include iwad_paths.man - .SH ENVIRONMENT --This section describes environment variables that control Chocolate Heretic's -+This section describes environment variables that control @PACKAGE_SHORTNAME@ Heretic's - behavior. - @include environ.man - .SH FILES - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/heretic.cfg\fR --The main configuration file for Chocolate Heretic. See \fBheretic.cfg\fR(5). -+The main configuration file for @PACKAGE_SHORTNAME@ Heretic. See \fBheretic.cfg\fR(5). - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-heretic.cfg\fR --Extra configuration values that are specific to Chocolate Heretic and not -+Extra configuration values that are specific to @PACKAGE_SHORTNAME@ Heretic and not - present in Vanilla Heretic. See \fB@PROGRAM_SPREFIX@\-heretic.cfg\fR(5). - .SH SEE ALSO - \fB@PROGRAM_SPREFIX@\-doom\fR(6), -diff --git a/man/hexen.template b/man/hexen.template -index 9184a27e..fc953edf 100644 ---- a/man/hexen.template -+++ b/man/hexen.template -@@ -6,7 +6,7 @@ - [\fIOPTIONS\fR] - .SH DESCRIPTION - .PP --Chocolate Hexen is a port of Raven Software's 1995 game "Hexen" that -+@PACKAGE_SHORTNAME@ Hexen is a port of Raven Software's 1995 game "Hexen" that - aims to behave as similar to the original DOS version of Hexen as - possible. - .br -@@ -14,16 +14,16 @@ possible. - .SH IWAD SEARCH PATHS - @include iwad_paths.man - .SH ENVIRONMENT --This section describes environment variables that control Chocolate Hexen's -+This section describes environment variables that control @PACKAGE_SHORTNAME@ Hexen's - behavior. - @include environ.man - .SH FILES - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/hexen.cfg\fR --The main configuration file for Chocolate Hexen. See \fBhexen.cfg\fR(5). -+The main configuration file for @PACKAGE_SHORTNAME@ Hexen. See \fBhexen.cfg\fR(5). - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-hexen.cfg\fR --Extra configuration values that are specific to Chocolate Hexen and not -+Extra configuration values that are specific to @PACKAGE_SHORTNAME@ Hexen and not - present in Vanilla Hexen. See \fB@PROGRAM_SPREFIX@\-hexen.cfg\fR(5). - .SH SEE ALSO - \fB@PROGRAM_SPREFIX@\-doom\fR(6), -diff --git a/man/chocolate-setup.6 b/man/setup.template -similarity index 94% -rename from man/chocolate-setup.6 -rename to man/setup.template -index 64f65937..2b5a45ea 100644 ---- a/man/chocolate-setup.6 -+++ b/man/setup.template -@@ -25,9 +25,9 @@ Load configuration from the specified file, instead of default.cfg. - \fB-extraconfig <file>\fR - Load extra configuration from the specified file, instead of @PROGRAM_SPREFIX@\-doom.cfg. - .SH SEE ALSO --\fB@CHOCOLATE_SPREFIX@\-doom\fR(6), -+\fB@PROGRAM_SPREFIX@\-doom\fR(6), - \fBdefault.cfg\fR(5), --\fB@CHOCOLATE_SPREFIX@\-doom.cfg\fR(5) -+\fB@PROGRAM_SPREFIX@\-doom.cfg\fR(5) - .SH AUTHOR - Chocolate Doom is written and maintained by Simon Howard. - .PP -diff --git a/man/strife.template b/man/strife.template -index 9ca7f14e..b82c39d4 100644 ---- a/man/strife.template -+++ b/man/strife.template -@@ -6,7 +6,7 @@ - [\fIOPTIONS\fR] - .SH DESCRIPTION - .PP --Chocolate Strife is an accurate and complete recreation of Rogue -+@PACKAGE_SHORTNAME@ Strife is an accurate and complete recreation of Rogue - Entertainment's "Strife: Quest for the Sigil". It was created through - more than two years of reverse engineering effort with the blessings - of the original programmers of the game (see the section HISTORY below). -@@ -16,17 +16,17 @@ of the original programmers of the game (see the section HISTORY below). - .SH IWAD SEARCH PATHS - @include iwad_paths.man - .SH ENVIRONMENT --This section describes environment variables that control Chocolate Strife's -+This section describes environment variables that control @PACKAGE_SHORTNAME@ Strife's - behavior. - @include environ.man - - .SH FILES - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/strife.cfg\fR --The main configuration file for Chocolate Strife. See \fBstrife.cfg\fR(5). -+The main configuration file for @PACKAGE_SHORTNAME@ Strife. See \fBstrife.cfg\fR(5). - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-strife.cfg\fR --Extra configuration values that are specific to Chocolate Strife and not -+Extra configuration values that are specific to @PACKAGE_SHORTNAME@ Strife and not - present in Vanilla Strife. See \fB@PROGRAM_SPREFIX@\-strife.cfg\fR(5). - .SH SEE ALSO - \fB@PROGRAM_SPREFIX@\-doom\fR(6), -@@ -57,15 +57,15 @@ and neither Rogue nor their publisher, Velocity, Inc., exist any longer as - legal entities, this is effectively legal permission. - - .SH BUGS --Chocolate Strife is almost, but not entirely perfect, in recreating the -+@PACKAGE_SHORTNAME@ Strife is almost, but not entirely perfect, in recreating the - behavior of Vanilla Strife. Help us by reporting any discrepancies you - might notice between this executable and the vanilla DOS program. - - However, do *not* report any glitch that you can replicate in the vanilla EXE --as a bug. The point of Chocolate Strife, like Chocolate Doom before it, is to -+as a bug. The point of @PACKAGE_SHORTNAME Strife, like Chocolate Doom before it, is to - be as bug-compatible with the original game as possible. Also be aware that - some glitches are impossible to compatibly recreate, and wherever this is the --case, Chocolate Strife has erred on the side of not crashing the program, -+case, @PACKAGE_SHORTNAME@ Strife has erred on the side of not crashing the program, - for example by initializing pointers to NULL rather than using them without - setting a value first. - --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-install-AppStream-metadata-into-the-proper-location.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-install-AppStream-metadata-into-the-proper-location.patch deleted file mode 100644 index 025ccf0ad179..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-install-AppStream-metadata-into-the-proper-location.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 12d69a4ee62094b48b37f550d31113e84cca0043 Mon Sep 17 00:00:00 2001 -From: Fabian Greffrath <fabian@greffrath.com> -Date: Mon, 22 Jan 2018 17:24:41 +0100 -Subject: [PATCH] install AppStream metadata into the proper location - -AppStream metadata is to be placed in the /usr/share/metainfo/ directory, /usr/share/appdata is a legacy location. ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index e3bc7bb1..04474ab3 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -212,7 +212,7 @@ EXTRA_DIST = \ - doom-screensaver.desktop.in \ - manifest.xml - --appdatadir = $(prefix)/share/appdata -+appdatadir = $(prefix)/share/metainfo - appdata_DATA = \ - @PROGRAM_PREFIX@doom.appdata.xml \ - @PROGRAM_PREFIX@heretic.appdata.xml \ --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-use-reverse-DNS-naming-for-installing-.desktop-files.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-use-reverse-DNS-naming-for-installing-.desktop-files.patch deleted file mode 100644 index ceed45834ff0..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-use-reverse-DNS-naming-for-installing-.desktop-files.patch +++ /dev/null @@ -1,162 +0,0 @@ -From bc50bd123e2b43ff404599b2a017a98261a66e47 Mon Sep 17 00:00:00 2001 -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Sat, 7 Sep 2019 10:57:50 -0700 -Subject: [PATCH] use reverse-DNS naming for installing *.desktop files - -This is similar to and consistent with the previous commit, and the -desktop entry specification recommends doing this as well. ---- - configure.ac | 12 +++---- - src/{doom.desktop.in => Doom.desktop.in} | 0 - ...desktop.in => Doom_Screensaver.desktop.in} | 0 - ...{heretic.desktop.in => Heretic.desktop.in} | 0 - src/{hexen.desktop.in => Hexen.desktop.in} | 0 - src/Makefile.am | 32 +++++++++---------- - src/{strife.desktop.in => Strife.desktop.in} | 0 - src/setup/Makefile.am | 6 ++-- - .../{setup.desktop.in => Setup.desktop.in} | 0 - 9 files changed, 25 insertions(+), 25 deletions(-) - rename src/{doom.desktop.in => Doom.desktop.in} (100%) - rename src/{doom-screensaver.desktop.in => Doom_Screensaver.desktop.in} (100%) - rename src/{heretic.desktop.in => Heretic.desktop.in} (100%) - rename src/{hexen.desktop.in => Hexen.desktop.in} (100%) - rename src/{strife.desktop.in => Strife.desktop.in} (100%) - rename src/setup/{setup.desktop.in => Setup.desktop.in} (100%) - -diff --git a/configure.ac b/configure.ac -index 8a3e1bbc..032a8be2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -168,22 +168,22 @@ rpm.spec - data/Makefile - src/Makefile - src/Doom.metainfo.xml --src/doom.desktop --src/doom-screensaver.desktop -+src/Doom.desktop -+src/Doom_Screensaver.desktop - src/doom/Makefile - src/Heretic.metainfo.xml --src/heretic.desktop -+src/Heretic.desktop - src/heretic/Makefile - src/Hexen.metainfo.xml --src/hexen.desktop -+src/Hexen.desktop - src/hexen/Makefile - src/resource.rc - src/setup-res.rc - src/setup/Makefile --src/setup/setup.desktop -+src/setup/Setup.desktop - src/setup/setup-manifest.xml - src/Strife.metainfo.xml --src/strife.desktop -+src/Strife.desktop - src/strife/Makefile - textscreen/Makefile - textscreen/examples/Makefile -diff --git a/src/doom.desktop.in b/src/Doom.desktop.in -similarity index 100% -rename from src/doom.desktop.in -rename to src/Doom.desktop.in -diff --git a/src/doom-screensaver.desktop.in b/src/Doom_Screensaver.desktop.in -similarity index 100% -rename from src/doom-screensaver.desktop.in -rename to src/Doom_Screensaver.desktop.in -diff --git a/src/heretic.desktop.in b/src/Heretic.desktop.in -similarity index 100% -rename from src/heretic.desktop.in -rename to src/Heretic.desktop.in -diff --git a/src/hexen.desktop.in b/src/Hexen.desktop.in -similarity index 100% -rename from src/hexen.desktop.in -rename to src/Hexen.desktop.in -diff --git a/src/Makefile.am b/src/Makefile.am -index 6880bd3c..19a42598 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -217,7 +217,7 @@ endif - EXTRA_DIST = \ - CMakeLists.txt \ - icon.c \ -- doom-screensaver.desktop.in \ -+ Doom_Screensaver.desktop.in \ - manifest.xml - - metainfodir = $(prefix)/share/metainfo -@@ -241,28 +241,28 @@ metainfo_DATA = \ - - appdir = $(prefix)/share/applications - app_DATA = \ -- @PROGRAM_PREFIX@doom.desktop \ -- @PROGRAM_PREFIX@heretic.desktop \ -- @PROGRAM_PREFIX@hexen.desktop \ -- @PROGRAM_PREFIX@strife.desktop -+ @PACKAGE_RDNS@.Doom.desktop \ -+ @PACKAGE_RDNS@.Heretic.desktop \ -+ @PACKAGE_RDNS@.Hexen.desktop \ -+ @PACKAGE_RDNS@.Strife.desktop - --@PROGRAM_PREFIX@doom.desktop : doom.desktop -- cp doom.desktop $@ -+@PACKAGE_RDNS@.Doom.desktop : Doom.desktop -+ cp Doom.desktop $@ - --@PROGRAM_PREFIX@heretic.desktop : heretic.desktop -- cp heretic.desktop $@ -+@PACKAGE_RDNS@.Heretic.desktop : Heretic.desktop -+ cp Heretic.desktop $@ - --@PROGRAM_PREFIX@hexen.desktop : hexen.desktop -- cp hexen.desktop $@ -+@PACKAGE_RDNS@.Hexen.desktop : Hexen.desktop -+ cp Hexen.desktop $@ - --@PROGRAM_PREFIX@strife.desktop : strife.desktop -- cp strife.desktop $@ -+@PACKAGE_RDNS@.Strife.desktop : Strife.desktop -+ cp Strife.desktop $@ - - screensaverdir = $(prefix)/share/applications/screensavers --screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop -+screensaver_DATA = @PACKAGE_RDNS@.Doom_Screensaver.desktop - --@PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop -- cp doom-screensaver.desktop $@ -+@PACKAGE_RDNS@.Doom_Screensaver.desktop: Doom_Screensaver.desktop -+ cp Doom_Screensaver.desktop $@ - - CLEANFILES = $(execgames_SCRIPTS) $(app_DATA) $(screensaver_DATA) - -diff --git a/src/strife.desktop.in b/src/Strife.desktop.in -similarity index 100% -rename from src/strife.desktop.in -rename to src/Strife.desktop.in -diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am -index 76db29cf..a9dd240c 100644 ---- a/src/setup/Makefile.am -+++ b/src/setup/Makefile.am -@@ -26,12 +26,12 @@ EXTRA_DIST= \ - setup_icon.c - - appdir = $(prefix)/share/applications --app_DATA = @PROGRAM_PREFIX@setup.desktop -+app_DATA = @PACKAGE_RDNS@.Setup.desktop - - CLEANFILES = $(app_DATA) - --@PROGRAM_PREFIX@setup.desktop : setup.desktop -- cp setup.desktop $@ -+@PACKAGE_RDNS@.Setup.desktop : Setup.desktop -+ cp Setup.desktop $@ - - if HAVE_PYTHON - -diff --git a/src/setup/setup.desktop.in b/src/setup/Setup.desktop.in -similarity index 100% -rename from src/setup/setup.desktop.in -rename to src/setup/Setup.desktop.in --- -2.26.2 - diff --git a/games-fps/chocolate-doom/metadata.xml b/games-fps/chocolate-doom/metadata.xml index b1f37c9b7072..e457eb8c59dc 100644 --- a/games-fps/chocolate-doom/metadata.xml +++ b/games-fps/chocolate-doom/metadata.xml @@ -4,14 +4,6 @@ <longdescription lang="en"> Chocolate Doom aims to accurately reproduce the original DOS version of Doom and other games based on the Doom engine in a form that can be run on modern computers. </longdescription> - <maintainer type="person" proxied="yes"> - <email>vilhelm.gray@gmail.com</email> - <name>William Breathitt Gray</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> diff --git a/games-fps/darkplaces/darkplaces-20140513-r2.ebuild b/games-fps/darkplaces/darkplaces-20140513-r2.ebuild index 80635bac833c..5f728ab6f31e 100644 --- a/games-fps/darkplaces/darkplaces-20140513-r2.ebuild +++ b/games-fps/darkplaces/darkplaces-20140513-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -127,6 +127,11 @@ src_compile() { # bug #739194 unset STRIP + # Strict aliasing violations (bug #858740), but they seem to be fixed in git. + # Check on next release (>20140513) / snapshot. + append-flags -fno-strict-aliasing + filter-lto + tc-export CC # Preferred sound is alsa diff --git a/games-fps/darkplaces/metadata.xml b/games-fps/darkplaces/metadata.xml index feb0bf1abb63..9ccc2564b2fb 100644 --- a/games-fps/darkplaces/metadata.xml +++ b/games-fps/darkplaces/metadata.xml @@ -11,4 +11,7 @@ <flag name="lights">Install and setup the updated light maps</flag> <flag name="textures">Install and setup the updated textures</flag> </use> + <upstream> + <remote-id type="github">DarkPlacesEngine/darkplaces</remote-id> + </upstream> </pkgmetadata> diff --git a/games-fps/doom-data/doom-data-1.9.ebuild b/games-fps/doom-data/doom-data-1.9.ebuild index e176da56f39f..e272c5dd08e5 100644 --- a/games-fps/doom-data/doom-data-1.9.ebuild +++ b/games-fps/doom-data/doom-data-1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://distro.ibiblio.org/pub/linux/distributions/slitaz/sources/packag LICENSE="freedist" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" S="${DISTDIR}" diff --git a/games-fps/doomsday/doomsday-2.3.1.ebuild b/games-fps/doomsday/doomsday-2.3.1.ebuild index 85cb6a73b906..c74d3513f98d 100644 --- a/games-fps/doomsday/doomsday-2.3.1.ebuild +++ b/games-fps/doomsday/doomsday-2.3.1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) -inherit cmake python-any-r1 qmake-utils readme.gentoo-r1 xdg +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 xdg DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen" -HOMEPAGE="https://www.dengine.net" +HOMEPAGE="https://dengine.net" SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/${P}.tar.gz" - +S="${WORKDIR}/${P}/${PN}" LICENSE="GPL-3+ LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="demo +display-mode freedoom fluidsynth openal tools" RDEPEND=" @@ -43,8 +43,6 @@ PDEPEND=" freedoom? ( games-fps/freedoom ) " -S="${WORKDIR}/${P}/${PN}" - DOC_CONTENTS="You need to copy Doom, Doom 2, Chex Quest, Heretic, Hexen, HexenDD, or Doom64 wads to a folder of your choice and then tell the game engine where that folder is. This is different to older versions, which had separate launchers for each game and required the files to be in a specific place." src_prepare() { @@ -55,6 +53,14 @@ src_prepare() { } src_configure() { + # -Werror=odr, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/858743 + # + # Currently working on reporting an upstream bug. Four different websites + # including sourceforge and github but the only place for submitting bugs + # is a self-hosted redmine that has disabled registration. + filter-lto + local mycmakeargs=( -DDENG_ASSIMP_EMBEDDED=OFF -DDENG_ENABLE_DISPLAYMODE=$(usex display-mode) diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml index 40cf9e97525a..0b45508d1e96 100644 --- a/games-fps/doomsday/metadata.xml +++ b/games-fps/doomsday/metadata.xml @@ -14,5 +14,7 @@ </use> <upstream> <remote-id type="sourceforge">deng</remote-id> + <remote-id type="github">skyjake/Doomsday-Engine</remote-id> + <bugs-to>https://tracker.dengine.net/projects/deng</bugs-to> </upstream> </pkgmetadata> diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild index bdccbe5b8c9d..feb57df50554 100644 --- a/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild +++ b/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,10 +14,10 @@ MY_P_GOG="${MY_PN_GOG}_${MY_PV_GOG}" inherit cdrom DESCRIPTION="Duke Nukem 3D (Atomic Edition) data files" -HOMEPAGE="http://www.3drealms.com/" +HOMEPAGE="https://www.3drealms.com/" SRC_URI=" - demo? ( "ftp://ftp.3drealms.com/share/${MY_P_DEMO}.zip" ) - gog? ( "${MY_P_GOG}.sh" ) + demo? ( https://archive.org/download/3dduke13/${MY_P_DEMO}.zip ) + gog? ( ${MY_P_GOG}.sh ) " S="${WORKDIR}" diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest index a8203f4a22d7..0a3d646e108e 100644 --- a/games-fps/eduke32/Manifest +++ b/games-fps/eduke32/Manifest @@ -2,7 +2,7 @@ DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638 DIST duke3d_music-sc55-4.02.zip 155441427 BLAKE2B 7fa0c98927dd9a18411ad473269a795d1bc809fa8f9479deef06e12cd0dc97953680e7519c9d22e2d32b6ff79726682746820f78429ad11cb5edf1b64d2e4fe7 SHA512 70d3d7b4705e30cdb19ddc95e11a88afff1dc01dfc6495a488ea665f8097c1200695ec67246ac47a2480d0e68cd7d74e1d61c2120485f53bb93d9c0fb16ba9b2 DIST duke3d_musopl-2.01.zip 266444823 BLAKE2B 5255c671782279c7723fb1f848a331645a89fdc8dd5336250d06e6eed5b63511c37bfbb07d22d7e7ce29707efe2c55406f2ee81522374de3633f2b448c7dbd6b SHA512 08308b672516a6f3a3b9b85fd836f2a29a24c8fa5f353953f5f55a281dea370046817ccfb8467b4ce25385277ced8afd83c00882e8a246b03afa5e0e349efd35 DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c17b1163107e1f8c6eab4be2b5a2ed74f302604f5769d3bb71d3ce8355b69b75352dc470918ebd5c0c73d68665 SHA512 e98f3bbfb2055fa72c4376ebbdb64814b1bca7c66968ffea8ca4d980d432f59f6ae013c889a57a28b2961bbeca2cc80b83b573dc0cbc2550cd9f428cf9d2a625 -DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15 +DIST duke3d_voxels-2.0-rc2.zip 4432485 BLAKE2B f8df7821eeae7886d7530b4e7344a78e25babd527deea903afceb6f50448659aad62a8855d8141358020649b396e23b573f1ce1e9873c6f12c907c417f1653ed SHA512 67558f078c42dba09a09eb78df1c9fe8aa391a1ccfe24c3b81a2eb1e05911cf9eef4cb706a1a69d283409bebe0111069904f94bc93f29e627692576d7cae6f14 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833 -DIST eduke32_src_20230123-10167-1a90b9883.tar.xz 17453612 BLAKE2B 763624f23ccafb340decd879d9906fdf59403f303bb6dd628ca41fae1217cd07cb3b61115101098ce6f897b16ed0783147e7d3c8138af586f23e90b7ea4a920f SHA512 beae1c9a34656530bb031eea9847339af0e28ff9dba029d2ae3539bd726c17f74b3b4929d6fa46c04b1966f985b97dcfd5a5da253d2ecc89d2b50d9ecefacea6 +DIST eduke32_src_20241226-10608-8d79c372a.tar.xz 18976772 BLAKE2B 1096ab8c1bbdb29882efc364bd72ad3f45c1a7a13a059ef2674258309c6b5130d22194fe5720e5f409e9c2768066b84375912380d767087563ffbb4d31cd711c SHA512 e37b83b568653d19ed1f6b6902728eb8d2b96e5abfded64b41abd8e07778046f3282a7c2473afc53ddd0c1b66615a6f4986e1920ff16f4746933dbd92e5a69da diff --git a/games-fps/eduke32/eduke32-20230123.10167.ebuild b/games-fps/eduke32/eduke32-20241226.10608.ebuild index 20194e48fa48..10e75540441b 100644 --- a/games-fps/eduke32/eduke32-20230123.10167.ebuild +++ b/games-fps/eduke32/eduke32-20241226.10608.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit desktop toolchain-funcs xdg-utils -EGIT_COMMIT="1a90b9883" +EGIT_COMMIT="8d79c372a" MY_BUILD="$(ver_cut 2)" MY_DATE="$(ver_cut 1)" MY_PV_HRP="5.4" @@ -13,7 +13,7 @@ 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" +MY_PV_VOXELS="2.0-rc2" DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D" HOMEPAGE="http://www.eduke32.com/" @@ -25,11 +25,11 @@ SRC_URI=" 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 ) + voxels? ( https://github.com/NightFright2k19/duke3d_voxelpack/releases/download/${MY_PV_VOXELS}/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip ) " S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}" -LICENSE="BUILDLIC GPL-2 HRP" +LICENSE="BUILDLIC GPL-2 hrp? ( HRP ) offensive? ( HRP )" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp" @@ -52,7 +52,7 @@ RDEPEND=" media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis - media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] + media-libs/sdl2-mixer[flac,fluidsynth?,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( @@ -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() { @@ -139,7 +139,7 @@ src_compile() { SDL_TARGET=2 SIMPLE_MENU=0 STRIP="" - TANDALONE=0 + STANDALONE=0 STARTUP_WINDOW=$(usex gtk 1 0) USE_OPENGL=$(usex opengl 1 0) USE_LIBVPX=$(usex vpx 1 0) 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"); diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml index 970fd2d68d82..8c509fc367cd 100644 --- a/games-fps/eduke32/metadata.xml +++ b/games-fps/eduke32/metadata.xml @@ -27,7 +27,6 @@ <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> </use> </pkgmetadata> diff --git a/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild b/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild index d4d62ccdf6fe..c3e055e100fd 100644 --- a/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild +++ b/games-fps/ezquake-bin/ezquake-bin-2.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,12 +8,12 @@ inherit wrapper MY_FULL_PV=1.9.3 MY_PN="${PN/-bin/}" DESCRIPTION="Quakeworld client with mqwcl functionality and many more features" -HOMEPAGE="http://ezquake.sf.net/" +HOMEPAGE="https://ezquake.sourceforge.net/" SRC_URI=" - amd64? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_64.${MY_FULL_PV}.tar.gz - mirror://sourceforge/${MY_PN}/${MY_PN}_linux64_${PV}.tar.gz ) - x86? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_${MY_FULL_PV}.tar.gz - mirror://sourceforge/${MY_PN}/${MY_PN}_linux32_${PV}.tar.gz ) + amd64? ( https://downloads.sourceforge.net/${MY_PN}/${MY_PN}_linux-x86_64.${MY_FULL_PV}.tar.gz + https://downloads.sourceforge.net/${MY_PN}/${MY_PN}_linux64_${PV}.tar.gz ) + x86? ( https://downloads.sourceforge.net/${MY_PN}/${MY_PN}_linux-x86_${MY_FULL_PV}.tar.gz + https://downloads.sourceforge.net/${MY_PN}/${MY_PN}_linux32_${PV}.tar.gz ) " S="${WORKDIR}"/${MY_PN} diff --git a/games-fps/freedm-data/files/freedm-data-0.12.1-Python-PIL-10.0.0-support.patch b/games-fps/freedm-data/files/freedm-data-0.12.1-Python-PIL-10.0.0-support.patch new file mode 100644 index 000000000000..9cc65812de85 --- /dev/null +++ b/games-fps/freedm-data/files/freedm-data-0.12.1-Python-PIL-10.0.0-support.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/909540 +https://github.com/freedoom/freedoom/issues/1015 +https://github.com/freedoom/freedoom/pull/1027 + +From d64ddc6ea90406e21b4b93f5a1e7f99abfaac0d9 Mon Sep 17 00:00:00 2001 +From: Steven Elliott <selliott512@gmail.com> +Date: Sun, 16 Jul 2023 14:52:04 -0400 +Subject: [PATCH] create_caption: Python PIL 10.0.0 support (#1027) + +To support Python PIL 10.0.0 this change uses newer API textbbox() when +available, and older API textsize() when not. +--- + graphics/text/create_caption | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/graphics/text/create_caption b/graphics/text/create_caption +index 7ddbd8d66..22bc0507d 100755 +--- a/graphics/text/create_caption ++++ b/graphics/text/create_caption +@@ -18,8 +18,21 @@ background_image.load() + background_image = background_image.convert("RGBA") + image = Image.new("RGBA", background_image.size, (0, 0, 0, 0)) + draw = ImageDraw.Draw(image) +-txt1_size = draw.textsize(txt1, font=font) +-txt2_size = draw.textsize(txt2, font=font) ++ ++# Getting the text size is tricky since for newer PIL, such as 10.0.0, only ++# textbbox() is supported, but for older PIL, such 7.2.0, only textsize() ++# is supported. The solution is to default to the newer API, but fallback to ++# the older one when it is not available. ++try: ++ # This newer API returns a four item tuple. The "xy" kwarg is returned in ++ # the first two items, and last two items is the size needed, but with "xy" ++ # added, so passing "(0, 0)" returns the size needed. ++ txt1_size = draw.textbbox(xy=(0, 0), text=txt1, font=font)[2:] ++ txt2_size = draw.textbbox(xy=(0, 0), text=txt2, font=font)[2:] ++except: ++ # This older API simply returns the size needed. ++ txt1_size = draw.textsize(txt1, font=font) ++ txt2_size = draw.textsize(txt2, font=font) + + draw.text( + (5, int(image.height - txt1_size[1] - 5)), diff --git a/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild b/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild index 354720400a4a..c0ad383f8105 100644 --- a/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild +++ b/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit prefix python-any-r1 xdg @@ -20,6 +20,10 @@ BDEPEND=" app-text/asciidoc games-util/deutex[png]" +PATCHES=( + "${FILESDIR}"/${PN}-0.12.1-Python-PIL-10.0.0-support.patch +) + S="${WORKDIR}/freedoom-${PV}" DOOMWADPATH=share/doom diff --git a/games-fps/freedm-data/metadata.xml b/games-fps/freedm-data/metadata.xml index bc6fe858c1ac..a9c261e3dc0b 100644 --- a/games-fps/freedm-data/metadata.xml +++ b/games-fps/freedm-data/metadata.xml @@ -16,14 +16,6 @@ powers Doom is free; Freedoom complements this with free levels, artwork, sound effects and music to make a completely free game. </longdescription> - <maintainer type="person" proxied="yes"> - <email>vilhelm.gray@gmail.com</email> - <name>William Breathitt Gray</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> diff --git a/games-fps/freedm/metadata.xml b/games-fps/freedm/metadata.xml index bc6fe858c1ac..a9c261e3dc0b 100644 --- a/games-fps/freedm/metadata.xml +++ b/games-fps/freedm/metadata.xml @@ -16,14 +16,6 @@ powers Doom is free; Freedoom complements this with free levels, artwork, sound effects and music to make a completely free game. </longdescription> - <maintainer type="person" proxied="yes"> - <email>vilhelm.gray@gmail.com</email> - <name>William Breathitt Gray</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> diff --git a/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch b/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch new file mode 100644 index 000000000000..333bff6d2598 --- /dev/null +++ b/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/909548 +https://github.com/freedoom/freedoom/issues/1015 +https://github.com/freedoom/freedoom/pull/1027 + +From d64ddc6ea90406e21b4b93f5a1e7f99abfaac0d9 Mon Sep 17 00:00:00 2001 +From: Steven Elliott <selliott512@gmail.com> +Date: Sun, 16 Jul 2023 14:52:04 -0400 +Subject: [PATCH] create_caption: Python PIL 10.0.0 support (#1027) + +To support Python PIL 10.0.0 this change uses newer API textbbox() when +available, and older API textsize() when not. +--- + graphics/text/create_caption | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/graphics/text/create_caption b/graphics/text/create_caption +index 7ddbd8d66..22bc0507d 100755 +--- a/graphics/text/create_caption ++++ b/graphics/text/create_caption +@@ -18,8 +18,21 @@ background_image.load() + background_image = background_image.convert("RGBA") + image = Image.new("RGBA", background_image.size, (0, 0, 0, 0)) + draw = ImageDraw.Draw(image) +-txt1_size = draw.textsize(txt1, font=font) +-txt2_size = draw.textsize(txt2, font=font) ++ ++# Getting the text size is tricky since for newer PIL, such as 10.0.0, only ++# textbbox() is supported, but for older PIL, such 7.2.0, only textsize() ++# is supported. The solution is to default to the newer API, but fallback to ++# the older one when it is not available. ++try: ++ # This newer API returns a four item tuple. The "xy" kwarg is returned in ++ # the first two items, and last two items is the size needed, but with "xy" ++ # added, so passing "(0, 0)" returns the size needed. ++ txt1_size = draw.textbbox(xy=(0, 0), text=txt1, font=font)[2:] ++ txt2_size = draw.textbbox(xy=(0, 0), text=txt2, font=font)[2:] ++except: ++ # This older API simply returns the size needed. ++ txt1_size = draw.textsize(txt1, font=font) ++ txt2_size = draw.textsize(txt2, font=font) + + draw.text( + (5, int(image.height - txt1_size[1] - 5)), diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild index 62bcb30b42a9..14d73d3f3fd6 100644 --- a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild +++ b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit prefix python-any-r1 xdg @@ -13,13 +13,17 @@ SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom- LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" BDEPEND=" $(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]') app-text/asciidoc games-util/deutex[png]" +PATCHES=( + "${FILESDIR}"/${PN}-0.12.1-Python-PIL-10.0.0-support.patch +) + S="${WORKDIR}/freedoom-${PV}" DOOMWADPATH=share/doom diff --git a/games-fps/freedoom-data/metadata.xml b/games-fps/freedoom-data/metadata.xml index 561d4d0ad152..aafdae7a61d2 100644 --- a/games-fps/freedoom-data/metadata.xml +++ b/games-fps/freedoom-data/metadata.xml @@ -22,14 +22,6 @@ The levels in this game tend to demand more skillful play than the previous chapters. It is compatible with mods for Doom II. </longdescription> - <maintainer type="person" proxied="yes"> - <email>vilhelm.gray@gmail.com</email> - <name>William Breathitt Gray</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> diff --git a/games-fps/freedoom/freedoom-0.12.1.ebuild b/games-fps/freedoom/freedoom-0.12.1.ebuild index 36bdbfb13be0..b7bd5cd1f59e 100644 --- a/games-fps/freedoom/freedoom-0.12.1.ebuild +++ b/games-fps/freedoom/freedoom-0.12.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ HOMEPAGE="https://freedoom.github.io" LICENSE="metapackage" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" RDEPEND=" ~games-fps/freedoom-data-${PV} diff --git a/games-fps/freedoom/metadata.xml b/games-fps/freedoom/metadata.xml index 561d4d0ad152..aafdae7a61d2 100644 --- a/games-fps/freedoom/metadata.xml +++ b/games-fps/freedoom/metadata.xml @@ -22,14 +22,6 @@ The levels in this game tend to demand more skillful play than the previous chapters. It is compatible with mods for Doom II. </longdescription> - <maintainer type="person" proxied="yes"> - <email>vilhelm.gray@gmail.com</email> - <name>William Breathitt Gray</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index 66a88cc2bfa1..a0775c9f044a 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1,2 +1,2 @@ DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586 SHA512 fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6 -DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5 SHA512 5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42 +DIST gzdoom-4.12.2.tar.gz 25910359 BLAKE2B 3f456136cfc161d67451d8bf1f359d748d6f30f4461a3bff4ab6b02fd949e4057dcbee79eae9ebc0566e33d2f1f3f42add18417b1932e3bccf8b4d5cae9b9a38 SHA512 1e9f34af0d5bf9f3797e0cfef01f993c0b8a742ba0af53b4b13cbce9ecefa15f22949bdbbba5a09e890a01dc32af81806fcb6fc632e0dc9261494580782a5007 diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch new file mode 100644 index 000000000000..d34cb749e7f5 --- /dev/null +++ b/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/907087 + +diff --git a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h +index fd44722..7189d0e 100644 +--- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h ++++ b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h +@@ -20,6 +20,8 @@ + // THE SOFTWARE. + // + ++#include <cstdio> ++ + #ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H + #define AMD_VULKAN_MEMORY_ALLOCATOR_H diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch new file mode 100644 index 000000000000..3a3a153b5a6e --- /dev/null +++ b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch @@ -0,0 +1,106 @@ +From b95dbaf914618cccaeaa95c650e02be669e477f8 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 1 Jul 2023 13:36:48 +0100 +Subject: [PATCH] Ensure local headers are used over system headers to avoid + breakage + +types.h was being picked up from webp rather than locally due to the +`include_directories` call for GTK (and therefore its -I arguments) +coming before the same call for the local sources. webp can be pulled in +via GTK -> gdk-pixbuf -> tiff -> webp. + +This can be avoided by specifying `SYSTEM` or `BEFORE` as appropriate +when calling `include_directories`. I have done both for good measure. +--- + src/CMakeLists.txt | 18 ++++++++++-------- + tools/zipdir/CMakeLists.txt | 2 +- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cf254ad6a..b4d06f9ce 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -97,7 +97,7 @@ else() + if( NOT DYN_GTK ) + set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK3_LIBRARIES} ) + endif() +- include_directories( ${GTK3_INCLUDE_DIRS} ) ++ include_directories( SYSTEM ${GTK3_INCLUDE_DIRS} ) + link_directories( ${GTK3_LIBRARY_DIRS} ) + else() + pkg_check_modules( GTK2 gtk+-2.0 ) +@@ -105,7 +105,7 @@ else() + if( NOT DYN_GTK ) + set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK2_LIBRARIES} ) + endif() +- include_directories( ${GTK2_INCLUDE_DIRS} ) ++ include_directories( SYSTEM ${GTK2_INCLUDE_DIRS} ) + link_directories( ${GTK2_LIBRARY_DIRS} ) + else() + set( NO_GTK ON ) +@@ -132,7 +132,7 @@ else() + # Non-Windows version also needs SDL except native OS X backend + if( NOT APPLE OR NOT OSX_COCOA_BACKEND ) + find_package( SDL2 REQUIRED ) +- include_directories( "${SDL2_INCLUDE_DIR}" ) ++ include_directories( SYSTEM "${SDL2_INCLUDE_DIR}" ) + set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${SDL2_LIBRARY}" ) + endif() + +@@ -143,7 +143,7 @@ if( NOT NO_OPENAL ) + find_package( OpenAL ) + mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR) + if( OPENAL_INCLUDE_DIR ) +- include_directories( ${OPENAL_INCLUDE_DIR} ) ++ include_directories( SYSTEM ${OPENAL_INCLUDE_DIR} ) + mark_as_advanced(CLEAR OPENAL_LIBRARY) + if( OPENAL_LIBRARY ) + set( PROJECT_LIBRARIES ${OPENAL_LIBRARY} ${PROJECT_LIBRARIES} ) +@@ -373,17 +373,17 @@ endif() + + if( VPX_FOUND ) + add_definitions( "-DUSE_LIBVPX=1" ) +- include_directories( "${VPX_INCLUDE_DIR}" ) ++ include_directories( SYSTEM "${VPX_INCLUDE_DIR}" ) + set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${VPX_LIBRARIES} ) + else() + message( SEND_ERROR "Could not find libvpx" ) + endif() + +-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") ++include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") + + if( ${HAVE_VM_JIT} ) + add_definitions( -DHAVE_VM_JIT ) +- include_directories( "${ASMJIT_INCLUDE_DIR}" ) ++ include_directories( SYSTEM "${ASMJIT_INCLUDE_DIR}" ) + set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ASMJIT_LIBRARIES}") + endif() + +@@ -1243,7 +1243,9 @@ endif() + + target_link_libraries( zdoom ${PROJECT_LIBRARIES} gdtoa lzma ${ZMUSIC_LIBRARIES} ) + +-include_directories( . ++include_directories( ++ BEFORE ++ . + common/audio/sound + common/audio/music + common/2d +diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt +index 65eb2fb72..762d9027f 100644 +--- a/tools/zipdir/CMakeLists.txt ++++ b/tools/zipdir/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required( VERSION 3.1.0 ) + + if( NOT CMAKE_CROSSCOMPILING ) +- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) ++ include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) + add_executable( zipdir + zipdir.c ) + target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma ) +-- +2.41.0 + diff --git a/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch b/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch deleted file mode 100644 index 6070d47566e0..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b132d2c3fe7f9074e1c08dbab77fc1270e8736fb Mon Sep 17 00:00:00 2001 -From: Omar Polo <op@omarpolo.com> -Date: Mon, 11 Jul 2022 11:52:43 +0200 -Subject: [PATCH] fix gzdoom.pk3 not found error - -Move the initialization before BaseFileSearch is called, otherwise -GameConfig is used not initialized and it doesn't find the gzdoom.pk3 -file. - -GameConfig used uninitalized was spotted by @LoneFox78. ---- - src/d_main.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/d_main.cpp b/src/d_main.cpp -index b64142c07fe..005f8cf8cd5 100644 ---- a/src/d_main.cpp -+++ b/src/d_main.cpp -@@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void) - - std::set_new_handler(NewFailure); - const char *batchout = Args->CheckValue("-errorlog"); -+ -+ D_DoomInit(); - - // [RH] Make sure zdoom.pk3 is always loaded, - // as it contains magic stuff we need. -@@ -3568,8 +3570,6 @@ static int D_DoomMain_Internal (void) - - if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, GetVersionString()); - -- D_DoomInit(); -- - extern void D_ConfirmSendStats(); - D_ConfirmSendStats(); - diff --git a/games-fps/gzdoom/gzdoom-4.10.0.ebuild b/games-fps/gzdoom/gzdoom-4.10.0.ebuild index a9545cb61896..0d69df1faeac 100644 --- a/games-fps/gzdoom/gzdoom-4.10.0.ebuild +++ b/games-fps/gzdoom/gzdoom-4.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="~amd64 ~arm64 ~ppc64" IUSE="debug gles2 gtk +non-free openmp +swr telemetry vulkan" DEPEND=" @@ -30,6 +30,8 @@ S="${WORKDIR}/${PN}-g${PV}" PATCHES=( "${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch + "${FILESDIR}"/${P}-gcc-13.patch + "${FILESDIR}"/${P}-headers.patch ) src_prepare() { diff --git a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild b/games-fps/gzdoom/gzdoom-4.12.2.ebuild index e8ae3900cb9f..b308fb3d0b50 100644 --- a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild +++ b/games-fps/gzdoom/gzdoom-4.12.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,29 +8,28 @@ inherit cmake desktop xdg flag-o-matic DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine" HOMEPAGE="https://zdoom.org" SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-g${PV}" LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )" SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="debug gles2 gtk +non-free openmp telemetry vulkan" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="debug gles2 gtk +non-free openmp +swr telemetry vulkan" DEPEND=" app-arch/bzip2 media-libs/libjpeg-turbo:0= media-libs/libsdl2[gles2?,opengl,vulkan?] media-libs/libvpx:= + media-libs/libwebp media-libs/openal media-libs/zmusic sys-libs/zlib gtk? ( x11-libs/gtk+:3 )" RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-g${PV}" - PATCHES=( "${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch - "${FILESDIR}"/${P}-fix-gzdoom-pk3.patch ) src_prepare() { @@ -40,6 +39,16 @@ src_prepare() { rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die fi + { + echo "// 0" + echo "// The above line prevents UpdateRevision.cmake from replacing this file." + echo "// This file was generated by the Gentoo ebuild." + echo + echo "#define GIT_DESCRIPTION \"g${PV}\"" + echo "#define GIT_HASH \"0\"" + echo "#define GIT_TIME \"\"" + } > "${S}/src/gitinfo.h" || die + cmake_src_prepare } @@ -59,6 +68,7 @@ src_configure() { -DHAVE_VULKAN="$(usex vulkan)" -DHAVE_GLES2="$(usex gles2)" -DNO_OPENMP="$(usex !openmp)" + -DZDOOM_ENABLE_SWR="$(usex swr)" -DBUILD_NONFREE="$(usex non-free)" ) diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml index 41b3c9962102..dc9f81322c53 100644 --- a/games-fps/gzdoom/metadata.xml +++ b/games-fps/gzdoom/metadata.xml @@ -1,20 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>vilhelm.gray@gmail.com</email> - <name>William Breathitt Gray</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> </maintainer> <use> - <flag name="gles2">Enable GLES2 backend</flag> <flag name="non-free">Enable non-free components</flag> <flag name="swr">Enable software renderer</flag> </use> diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild index 11e294ca141f..80543d6a62f9 100644 --- a/games-fps/industri/industri-1.01.ebuild +++ b/games-fps/industri/industri-1.01.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,8 +7,8 @@ inherit toolchain-funcs DESCRIPTION="Quake/Tenebrae based, single player game" HOMEPAGE="http://industri.sourceforge.net/" -SRC_URI="mirror://sourceforge/industri/industri_BIN-${PV}-src.tar.gz - mirror://sourceforge/industri/industri-1.00.zip" +SRC_URI="https://downloads.sourceforge.net/industri/industri_BIN-${PV}-src.tar.gz + https://downloads.sourceforge.net/industri/industri-1.00.zip" S="${WORKDIR}"/industri_BIN LICENSE="GPL-2" diff --git a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild index 00e77d1f5b27..247670d951db 100644 --- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild +++ b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,8 +10,8 @@ MY_P=${PN}-${PV//./} MAPS=nexmappack_r2 DESCRIPTION="Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine" HOMEPAGE="http://www.nexuiz.com/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip - maps? ( mirror://sourceforge/${PN}/${MAPS}.zip )" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.zip + maps? ( https://downloads.sourceforge.net/${PN}/${MAPS}.zip )" LICENSE="GPL-2" SLOT="0" diff --git a/games-fps/prboom-plus/prboom-plus-2.6.2.ebuild b/games-fps/prboom-plus/prboom-plus-2.6.2.ebuild index 12406b61ac93..e4120351b849 100644 --- a/games-fps/prboom-plus/prboom-plus-2.6.2.ebuild +++ b/games-fps/prboom-plus/prboom-plus-2.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${PV}.orig.t 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 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="alsa dumb fluidsynth mad net +opengl +pcre portmidi sdl2-image +sdl2-mixer server vorbis zlib" REQUIRED_USE="server? ( net )" diff --git a/games-fps/quake1-data/quake1-data-2.40-r1.ebuild b/games-fps/quake1-data/quake1-data-2.40-r1.ebuild index ed730aa32cb3..974117cb7bf2 100644 --- a/games-fps/quake1-data/quake1-data-2.40-r1.ebuild +++ b/games-fps/quake1-data/quake1-data-2.40-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # TODO: if installing off of the 1.01 cd, need to fetch the @@ -17,6 +17,7 @@ S="${WORKDIR}" LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="~amd64 ~x86" +RESTRICT="bindist" RDEPEND="!games-fps/quake1-demodata[symlink]" BDEPEND="app-arch/lha" diff --git a/games-fps/quake2-data/quake2-data-3.20-r1.ebuild b/games-fps/quake2-data/quake2-data-3.20-r1.ebuild index f631098f4959..2aa94b7063e0 100644 --- a/games-fps/quake2-data/quake2-data-3.20-r1.ebuild +++ b/games-fps/quake2-data/quake2-data-3.20-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,8 +12,9 @@ S="${WORKDIR}" LICENSE="Q2EULA" SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="videos" +RESTRICT="bindist" RDEPEND="!games-fps/quake2-demodata[symlink]" BDEPEND="app-arch/unzip" diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild b/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild index b7fe8cd32c7d..fc2d0953a824 100644 --- a/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild +++ b/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ S="${WORKDIR}" # See license.txt - it's a bit different to Q2EULA in Portage LICENSE="quake2-demodata" SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="symlink" RDEPEND="!games-fps/quake2-data" # games-fps/quake2-data already includes the demo data diff --git a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch index 09da62bee201..318d514b944c 100644 --- a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch +++ b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch @@ -1,7 +1,55 @@ +From db3c20829db69b3e7451a167f9f639a89d41491a Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 12 May 2024 14:31:52 -0400 +Subject: [PATCH] remove bogus nan.h header + +In theory somehow maybe possibly sort of, glibc has bits/nan.h, and in +gentoo-historical-2.git: + +commit e5551898509b2b7802941b16bb580ef7cf34b488 +Author: Mike Frysinger <vapier@gentoo.org> +AuthorDate: Sat Dec 27 14:45:18 2003 +Commit: Mike Frysinger <vapier@gentoo.org> +CommitDate: Sat Dec 27 14:45:18 2003 + + add rogue/xatrix game support #33029 + +a patch was added to switch it to including that header instead. +Helpfully, bits/nan.h has this to say: + +#ifndef _MATH_H +#error "Never use <bits/nan.h> directly; include <math.h> instead." +#endif + +... or at least it does, on versions of glibc that installed such a +header. In 2.27 the header file was removed entirely. + +Now, "fortunately", g_local.h had already included math.h, which meant +the best efforts of glibc developers to demonstrate this is an error +were evaded; no error was emitted. Unfortunately, glibc 2.27 is long in +the past and this code no longer builds, times 2 because now we patched +it to be extra silly. + +Fix it properly this time. + +Bug: https://bugs.gentoo.org/33029 +Bug: https://bugs.gentoo.org/738832 +--- + src/rogue/g_local.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/rogue/g_local.h b/src/rogue/g_local.h +index 6ecbe2d..6746240 100644 --- a/rogue/g_local.h +++ b/rogue/g_local.h -@@ -24,3 +24,3 @@ +@@ -22,7 +22,6 @@ + //================================================================== + #ifndef _WIN32 -#include <nan.h> -+#include <bits/nan.h> #define min(a,b) ((a) < (b) ? (a) : (b)) + #define max(a,b) ((a) > (b) ? (a) : (b)) + #ifdef __sun__ +-- +2.43.2 + diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r2.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r3.ebuild index ef6f7b8b34a4..c51bb899c34f 100644 --- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r2.ebuild +++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r3.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit desktop toolchain-funcs +inherit desktop flag-o-matic toolchain-funcs MY_P="quake2-r${PV}" DESCRIPTION="The icculus.org Linux port of iD's Quake 2 engine" -HOMEPAGE="http://icculus.org/quake2/" -SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz - qmax? ( http://icculus.org/quake2/files/maxpak.pak ) +HOMEPAGE="https://icculus.org/quake2/" +SRC_URI="https://icculus.org/quake2/files/${MY_P}.tar.gz + qmax? ( https://icculus.org/quake2/files/maxpak.pak ) rogue? ( mirror://idsoftware/quake2/source/roguesrc320.shar.Z ) xatrix? ( mirror://idsoftware/quake2/source/xatrixsrc320.shar.Z )" S="${WORKDIR}"/${MY_P} @@ -102,6 +102,14 @@ yesno() { } src_compile() { + # -Werror=strict-aliasing, also -Werror=lto-type-mismatch + # https://bugs.gentoo.org/858752 + # + # Upstream last committed changes in 2006, and that was "Switch from CVS to SVN". + # Effectively no mailing list discussion since then (sporadic posts from users). + append-flags -fno-strict-aliasing + filter-lto + # xatrix fails to build # rogue fails to build local libsuffix diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild index 39d69b2b24e3..49370b798b8c 100644 --- a/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild +++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -52,8 +52,8 @@ BDEPEND=" sys-devel/flex virtual/pkgconfig doc? ( - app-doc/doxygen[dot] - media-gfx/transfig + app-text/doxygen[dot] + >=media-gfx/fig2dev-3.2.9-r1 )" PATCHES=( diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild index 9c6f72e80f93..51a4a3e89b0f 100644 --- a/games-fps/quakeforge/quakeforge-9999.ebuild +++ b/games-fps/quakeforge/quakeforge-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,8 +54,8 @@ BDEPEND=" sys-devel/flex virtual/pkgconfig doc? ( - app-doc/doxygen[dot] - media-gfx/transfig + app-text/doxygen[dot] + >=media-gfx/fig2dev-3.2.9-r1 )" src_prepare() { diff --git a/games-fps/rott/rott-1.1.2-r1.ebuild b/games-fps/rott/rott-1.1.2-r1.ebuild index a11a0d2074c1..7b80302df3e4 100644 --- a/games-fps/rott/rott-1.1.2-r1.ebuild +++ b/games-fps/rott/rott-1.1.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="Rise of the Triad for Linux!" HOMEPAGE="https://www.icculus.org/rott/" @@ -33,6 +33,18 @@ src_prepare() { } src_compile() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/858758 + # + # The upstream homepage notes that you should send bug reports and feature + # requests to your distro. Rationale: "1.1.2 contains all the debian + # patches from the previous 2.5 years" and "1.1.1. contains all the debian + # and fedora patches that accumulated during the past year." + # + # This is an interesting collaborative model that unfortunately means there + # will be NO bug report. + filter-lto + tc-export CC emake -j1 \ EXTRACFLAGS="${CFLAGS} -DDATADIR=\\\"/usr/share/${PN}/\\\"" \ diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest index 71010ab94cfb..ac6dbb73f725 100644 --- a/games-fps/sauerbraten/Manifest +++ b/games-fps/sauerbraten/Manifest @@ -1 +1 @@ -DIST sauerbraten_2020_12_27_linux.tar.bz2 985815649 BLAKE2B 4ec9caf705766aed76153a8631b1990c6432db8c816d579e891263b36adf0e7ed4831d2fee010b7692f6457989c0acea552f72c95e0924e97182d2a03dc947f2 SHA512 60487e0493478b9dd8940a9239834d8f3f6b6ca529f3c5b718f91caf5116073942ca6908d7fff26ab37b7ec590114ab07f24cdcea5c355288d3c2706d626ea28 +DIST sauerbraten_2020_12_29_linux.tar.bz2 985823440 BLAKE2B 8d3cb9a26b65fecd6596211af58504cf8a2f5f95486785e15fb2faa8398046d80f7548727dff96683a1d6dcd713ec175bbd9ca47852a8c88d872d954d02ab2c0 SHA512 fd2106e4ed3d48352b5cc2f9d4037933a486e6200ef89bf9e3f31952f4a27ef565f7740d45c32bb9b22da0e17e6542257169134f216bc51a6a465ff311f9bae9 diff --git a/games-fps/sauerbraten/files/sauerbraten-2020.12.29-includefix.patch b/games-fps/sauerbraten/files/sauerbraten-2020.12.29-includefix.patch new file mode 100644 index 000000000000..422d6b1b3963 --- /dev/null +++ b/games-fps/sauerbraten/files/sauerbraten-2020.12.29-includefix.patch @@ -0,0 +1,39 @@ +diff --git a/movie.cpp b/movie.cpp +index 25cb491..7f7536c 100644 +--- a/src/engine/movie.cpp ++++ b/src/engine/movie.cpp +@@ -8,7 +8,7 @@ + // kino - ok + + #include "engine.h" +-#include "SDL_mixer.h" ++#include <SDL2/SDL_mixer.h> + + VAR(dbgmovie, 0, 0, 1); + +diff --git a/sound.cpp b/sound.cpp +index 38ff025..a0ed5db 100644 +--- a/src/engine/sound.cpp ++++ b/src/engine/sound.cpp +@@ -1,7 +1,7 @@ + // sound.cpp: basic positional sound using sdl_mixer + + #include "engine.h" +-#include "SDL_mixer.h" ++#include <SDL2/SDL_mixer.h> + + bool nosound = true; + +diff --git a/texture.cpp b/texture.cpp +index 964d39d..f76b9b1 100644 +--- a/src/engine/texture.cpp ++++ b/src/engine/texture.cpp +@@ -1,7 +1,7 @@ + // texture.cpp: texture slot management + + #include "engine.h" +-#include "SDL_image.h" ++#include <SDL2/SDL_image.h> + + #ifndef SDL_IMAGE_VERSION_ATLEAST + #define SDL_IMAGE_VERSION_ATLEAST(X, Y, Z) \ diff --git a/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild b/games-fps/sauerbraten/sauerbraten-2020.12.29.ebuild index 8b66fceccde3..ca0be0265bc5 100644 --- a/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild +++ b/games-fps/sauerbraten/sauerbraten-2020.12.29.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop flag-o-matic toolchain-funcs wrapper xdg DESCRIPTION="Sauerbraten is a FOSS game engine (Cube 2) with freeware game data (Sauerbraten)" HOMEPAGE="http://sauerbraten.org/" -SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2020_11_29/sauerbraten_${PV//./_}_linux.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/sauerbraten/sauerbraten/2020_11_29/sauerbraten_${PV//./_}_linux.tar.bz2" S="${WORKDIR}"/${PN} LICENSE="ZLIB freedist" @@ -43,6 +43,8 @@ PATCHES=( # Don't use freetype-config, it's obsolete "${FILESDIR}"/${PN}-2020.12.27-use-pkg-config-for-freetype2.patch + # More sensible ways of including SDL_mixer and SDL_image. Game doesn't build w/o this. + "${FILESDIR}"/${PN}-2020.12.29-includefix.patch ) src_prepare() { diff --git a/games-fps/serious-sam-tse/Manifest b/games-fps/serious-sam-tse/Manifest deleted file mode 100644 index 455f22799ffc..000000000000 --- a/games-fps/serious-sam-tse/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ssamtse-beta1.sh.bin 7952607 BLAKE2B 775c5f22b5c2d8418e69a6ac9d8e46f7f3d958108900ca0bc2135a889b4ee34d4d6528b2dfbe1de343fc8cd28af3f0d86cc764014875d8bb4d7a32ee55f361ea SHA512 43f07fbaef0bf8f90644a748931220331ed5f9179412e5a37daf0472aa98c5bb2455148c54254eae1af0b38ba8a3fde9c310cd8d488ea6b2806fa0f6fb1e1644 diff --git a/games-fps/serious-sam-tse/metadata.xml b/games-fps/serious-sam-tse/metadata.xml deleted file mode 100644 index 115e9d64a669..000000000000 --- a/games-fps/serious-sam-tse/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild b/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild deleted file mode 100644 index cec0725099f6..000000000000 --- a/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cdrom eutils versionator unpacker - -# MY_PV will be e.g. "beta1" -MY_PN="ssamtse" -MY_PV=$(get_version_component_range 2-2) - -DESCRIPTION="Serious Sam: The Second Encounter" -HOMEPAGE="http://www.croteam.com/ - http://www.seriouszone.com/" -SRC_URI="http://icculus.org/betas/ssam/${MY_PN}-${MY_PV}.sh.bin" - -LICENSE="LOKI-EULA" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -RESTRICT="bindist mirror strip" -IUSE="alsa" - -DEPEND=">=app-arch/unshield-0.6" -RDEPEND=" - >=media-libs/libogg-1.3.1[abi_x86_32(-)] - >=media-libs/libsdl-1.2.15-r5[X,joystick,opengl,video,abi_x86_32(-)] - virtual/opengl[abi_x86_32(-)] - alsa? ( - >=media-libs/libsdl-1.2.15-r5[alsa,sound,abi_x86_32(-)] - >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] - ) -" - -S=${WORKDIR} - -QA_TEXTRELS=" -opt/ssamtse/Bin/libEntitiesMP.so -opt/ssamtse/Bin/libGameMP.so -opt/ssamtse/Bin/libamp11lib.so -opt/ssamtse/Bin/libShaders.so -" - -QA_FLAGS_IGNORED=" -opt/ssamtse/Bin/libEntitiesMP.so -opt/ssamtse/Bin/libGameMP.so -opt/ssamtse/Bin/libamp11lib.so -opt/ssamtse/Bin/libShaders.so -opt/ssamtse/Bin/ssam_lnxded -opt/ssamtse/Bin/ssam_lnxded.dynamic -opt/ssamtse/Bin/ssam_lnx.dynamic -opt/ssamtse/Bin/ssam_lnx -" - -pkg_setup() { - cdrom_get_cds "Install/SE1_00.gro" -} - -src_unpack() { - mkdir Levels Mods - - unpack_makeself "${MY_PN}-${MY_PV}.sh.bin" - unpack ./setupstuff.tar.gz - unpack ./bins.tar.bz2 -} - -src_prepare() { - default - - # Switch to dynamic executable - runs at sane speeds on modern hardware - sed -i -e 's;exec "./ssam_lnx";exec "./ssam_lnx.dynamic";' bin/${MY_PN} \ - || die "dynamic binary update failed" -} - -src_install() { - local dir="/opt/${MY_PN}" - - # Remove bundled libs - rm -f Bin/{libogg.so,libvorbis.so,libvorbisfile.so} || die "failed to remove bundled libs" - - einfo "Copying from ${CDROM_ROOT}" - insinto "${dir}" - doins -r "${CDROM_ROOT}"/Install/* - - # Correct paths of copied resource files - mv "${D}/${dir}"/Locales/eng/Controls/* "${D}/${dir}"/Controls/ || die "Failed to move file" - mv "${D}/${dir}"/Locales/eng/Data/Var/* "${D}/${dir}"/Data/Var/ || die "Failed to move file" - mv "${D}/${dir}"/Locales/eng/Demos/* "${D}/${dir}"/Demos/ || die "Failed to move file" - mv "${D}/${dir}"/Locales/eng/Help/* "${D}/${dir}"/Help/ || die "Failed to move file" - mv "${D}/${dir}"/Locales/eng/Mods/Warped/Scripts/Addons/WarpedTweak.des "${D}/${dir}"/Mods/Warped/Scripts/Addons/ || die "Failed to move file" - mv "${D}/${dir}"/Locales/eng/Mods/Warped/Readme.html "${D}/${dir}"/Mods/Warped/ || die "Failed to move file" - mv "${D}/${dir}"/Locales/eng/Mods/*.des "${D}/${dir}"/Mods/ || die "Failed to move file" - mv "${D}/${dir}"/Locales/eng/Scripts/Addons/* "${D}/${dir}"/Scripts/Addons/ || die "Failed to move file" - mv "${D}/${dir}"/Locales/eng/Scripts/CustomOptions/* "${D}/${dir}"/Scripts/CustomOptions/ || die "Failed to move file" - mv "${D}/${dir}"/Locales/eng/Scripts/NetSettings/* "${D}/${dir}"/Scripts/NetSettings/ || die "Failed to move file" - rm -rf "${D}/${dir}"/Locales || die "failed to removed Locales dir" - - # The data CABs contain optional multiplayer maps in the "Levels" directory - einfo "Extracting additional levels" - unshield x "${D}/${dir}"/data1.cab >/dev/null || die "unshield data1.cab failed" - rm "${D}/${dir}"/data?.cab || die "Failed to remove cab" - - # Correct paths of extracted levels - mv Levels/Levels/LevelsMP/* Levels/LevelsMP/ || die "Failed to move file" - rm -rf Levels/Levels || die "Failed to remove dir" - mv Levels/LevelsMP/Technology/* Levels/ || die "Failed to move file" - rmdir Levels/LevelsMP/Technology || die "Failed to remove dir" - mv Levels/Mods/Warped/ Mods/ || die "Failed to move file" - rmdir Levels/Mods/ || die "Failed to remove dir" - - doins -r Bin Data Levels Mods *.txt README* - - # Install bins last to ensure they are marked executable - exeinto "${dir}" - doexe bin/${MY_PN} - exeinto "${dir}"/Bin - doexe Bin/{ssam_lnx*,*.so} - - # Remove useless Windows files - rm -rf "${D}/${dir}/Bin"/{*.exe,*.dll,*.DLL,GameSpy} || die "Failed to remove windows cruft" - rm -f "${D}/${dir}"/{*.exe,*.ex_,*.bmp,*.inx,*.hdr,*.bin} || die "Failed to remove windows cruft" - - dodoc README.linux - - newicon ssam.xpm ${MY_PN}.xpm - make_wrapper ${MY_PN} ./${MY_PN} "${dir}" "${dir}" - make_desktop_entry ${MY_PN} "Serious Sam - Second Encounter" ${MY_PN} - - # Ensure that file datestamps from the CD are sane - find "${D}/${dir}" -exec touch '{}' \; || die "touch failed" -} - -pkg_postinst() { - elog "The warning regarding 'XiG-SUNDRY-NONSTANDARD missing' is harmless." - elog "Important information about the Linux port is at:" - elog " http://files.seriouszone.com/download.php?fileid=616" - echo -} diff --git a/games-fps/serioussam-tfe-data/Manifest b/games-fps/serioussam-tfe-data/Manifest new file mode 100644 index 000000000000..be0fb14292c0 --- /dev/null +++ b/games-fps/serioussam-tfe-data/Manifest @@ -0,0 +1 @@ +DIST serioussamfe-patch_1.05_FE.tar.xz 1221836 BLAKE2B 0ae7103151ee42f3c1ff88afd2d77037e0c3e5c49c19adf213068f87eed524c7aa6552d020c3337f5457847f167c1a2e4ca1fda7572e96b9630fb2dbfd3e6b0f SHA512 18c5a5f66e1fbe3864eca3274d20e525f50c223507e0c1c793a642aed66edfeb723cf3d4ffc583afa4d9a10388cbed14af7035bf6a1b9c214dac79c5eb1d2548 diff --git a/games-fps/serioussam-tfe-data/metadata.xml b/games-fps/serioussam-tfe-data/metadata.xml new file mode 100644 index 000000000000..e76bc72b6a01 --- /dev/null +++ b/games-fps/serioussam-tfe-data/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>t.x00100x.t@yandex.ru</email> + <name>Alexander Pavlov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">tx00100xt/serioussam-mods</remote-id> + </upstream> +</pkgmetadata> diff --git a/games-fps/serioussam-tfe-data/serioussam-tfe-data-1.5-r1.ebuild b/games-fps/serioussam-tfe-data/serioussam-tfe-data-1.5-r1.ebuild new file mode 100644 index 000000000000..8b0b3f73ea37 --- /dev/null +++ b/games-fps/serioussam-tfe-data/serioussam-tfe-data-1.5-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cdrom unpacker + +# Game name +GN="serioussam" +PATCH_PREFIX="${GN}fe-patch_1.05_FE" + +DESCRIPTION="Croteam's Serious Sam Classic The First Encounter ... the data files" +HOMEPAGE="https://www.croteam.com/ + https://store.steampowered.com/app/41050/Serious_Sam_Classic_The_First_Encounter/" +SRC_URI="https://github.com/tx00100xt/serioussam-mods/raw/main/Patches/${PATCH_PREFIX}.tar.xz" +S="${WORKDIR}" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="bindist" + +pkg_setup() { + cdrom_get_cds "Install/1_00_music.gro" +} + +src_unpack() { + mkdir Levels Mods || die "failed create dirs" + cat "${DISTDIR}/${PATCH_PREFIX}.tar.xz" > "${PATCH_PREFIX}.tar.xz" \ + || die "failed to copy patch 1.05" + unpack "${WORKDIR}/${PATCH_PREFIX}.tar.xz" +} + +src_install() { + local dir="/usr/share/${GN}" + + einfo "Copying from ${CDROM_ROOT}" + insinto "${dir}" + doins -r "${CDROM_ROOT}"/Install/* + + mv "${WORKDIR}"/*.gro "${ED}${dir}" || die "failed to moved patch 1.05" + mv "${ED}${dir}"/Scripts/PersistentSymbols.ini "${WORKDIR}" \ + || die "failed to moved PersistentSymbols.ini" + + rm -rf \ + "${ED}${dir}"/{Bin,Controls,Data,Demos,Mods,Players,Scripts} \ + || die "failed to remove directories" + rm -rf \ + "${ED}${dir}"/{VirtualTrees,Locales,Help/ShellSymbols.txt} \ + || die "failed to remove directories" + mkdir "${ED}${dir}/Scripts" || die "failed create Scripts dir" + mv "${WORKDIR}"/PersistentSymbols.ini "${ED}${dir}/Scripts" \ + || die "failed to moved PersistentSymbols.ini" + + # Remove useless Windows files + rm -f "${ED}${dir}"/{*.exe,*.ex_,*.bmp,*.inx,*.hdr,*.bin,*.cab,*.ini,*.log} \ + || die "Failed to remove windows cruft" + + # Ensure that file datestamps from the CD are sane + find "${ED}${dir}"/Levels -exec touch -d '09 May 2020 14:00' '{}' \; \ + || die "touch failed" +} + +pkg_postinst() { + elog "Important information about the Linux port is at:" + elog " https://github.com/tx00100xt/SeriousSamClassic-VK" + elog " look at:" + elog " https://github.com/tx00100xt/SeriousSamClassic-VK/wiki" + elog " For information about of the game" +} diff --git a/games-fps/serioussam-tse-data/Manifest b/games-fps/serioussam-tse-data/Manifest new file mode 100644 index 000000000000..17920efbe1b7 --- /dev/null +++ b/games-fps/serioussam-tse-data/Manifest @@ -0,0 +1 @@ +DIST serioussamse-patch_1.07_SE.tar.xz 33172 BLAKE2B bc185d0b504e7aa01862a57ba97691881e19d0031ac88187ec80fb52d8bd758c0dac6b932a333fa4f9df09264232ab87e97875a8ae7a58cd0816153a082ffc45 SHA512 1c0e2ac2503584d26ac7fc59f72b0dcb6903bfc4897acc5732b426fe691928c1f49839b3a893809e635e178e447aa72fb9969179806a1703d412c4ea321ca637 diff --git a/games-fps/serioussam-tse-data/metadata.xml b/games-fps/serioussam-tse-data/metadata.xml new file mode 100644 index 000000000000..e76bc72b6a01 --- /dev/null +++ b/games-fps/serioussam-tse-data/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>t.x00100x.t@yandex.ru</email> + <name>Alexander Pavlov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">tx00100xt/serioussam-mods</remote-id> + </upstream> +</pkgmetadata> diff --git a/games-fps/serioussam-tse-data/serioussam-tse-data-1.7-r1.ebuild b/games-fps/serioussam-tse-data/serioussam-tse-data-1.7-r1.ebuild new file mode 100644 index 000000000000..3f46d0d019f9 --- /dev/null +++ b/games-fps/serioussam-tse-data/serioussam-tse-data-1.7-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cdrom unpacker + +# Game name +GN="serioussamse" +PATCH_PREFIX="${GN}-patch_1.07_SE" + +DESCRIPTION="Croteam's Serious Sam Classic The Second Encounter ... the data files" +HOMEPAGE="https://www.croteam.com/ + https://store.steampowered.com/app/41060/Serious_Sam_Classic_The_Second_Encounter/" +SRC_URI="https://github.com/tx00100xt/serioussam-mods/raw/main/Patches/${PATCH_PREFIX}.tar.xz" +S="${WORKDIR}" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="bindist" + +pkg_setup() { + cdrom_get_cds "Install/SE1_00_Levels.gro" +} + +src_unpack() { + mkdir Levels Mods || die "failed create dirs" + cat "${DISTDIR}/${PATCH_PREFIX}.tar.xz" > "${PATCH_PREFIX}.tar.xz" \ + || die "failed to copy patch 1.07" + unpack "${WORKDIR}/${PATCH_PREFIX}.tar.xz" +} + +src_install() { + local dir="/usr/share/${GN}" + + einfo "Copying from ${CDROM_ROOT}" + insinto "${dir}" + doins -r "${CDROM_ROOT}"/Install/* + + mv "${WORKDIR}"/*.gro "${ED}${dir}" || die "failed to moved patch 1.07" + mv "${ED}${dir}"/Scripts/PersistentSymbols.ini "${WORKDIR}" \ + || die "failed to moved PersistentSymbols.ini" + + rm -rf \ + "${ED}${dir}"/{Bin,Controls,Data,Demos,Mods,Players,Scripts,Locales} \ + || die "failed to remove directories" + rm -rf \ + "${ED}${dir}"/{VirtualTrees,ModEXT.txt,Help/ShellSymbols.txt} \ + || die "failed to remove directories" + mkdir "${ED}${dir}/Scripts" || die "failed create Scripts dir" + mv "${WORKDIR}"/PersistentSymbols.ini "${ED}${dir}/Scripts" \ + || die "failed to moved PersistentSymbols.ini" + + # Remove useless Windows files + rm -f "${ED}${dir}"/{*.exe,*.ex_,*.bmp,*.inx,*.hdr,*.bin,*.cab,*.ini,*.log} \ + || die "Failed to remove windows cruft" + + # Ensure that file datestamps from the CD are sane + find "${ED}${dir}"/Levels -exec touch -d '09 May 2020 14:00' '{}' \; \ + || die "touch failed" +} + +pkg_postinst() { + elog "Important information about the Linux port is at:" + elog " https://github.com/tx00100xt/SeriousSamClassic-VK" + elog " look at:" + elog " https://github.com/tx00100xt/SeriousSamClassic-VK/wiki" + elog " For information about of the game" +} diff --git a/games-fps/serioussam/Manifest b/games-fps/serioussam/Manifest new file mode 100644 index 000000000000..a3473b88b03b --- /dev/null +++ b/games-fps/serioussam/Manifest @@ -0,0 +1,2 @@ +DIST serioussam-1.10.6c.tar.gz 47908208 BLAKE2B 90af9f8c11b474ce0e114c3390e1afd5c746c1b2ca4e61bd6085f1dc42f6f73981cc4434ff8fdcc1306178ae9d2707026765a3a1da006d5adb841d2d314a4214 SHA512 de1ba536c84977d1e7335833b8a2080b13a22ca25efba88363972dceb4bcbfda1db448de42d262fa003fe9df393327509e76afc3cc501f96ed6495d29b74b6bb +DIST serioussam-1.10.6d.tar.gz 47922084 BLAKE2B b035df25f897e498e8e6bf4707c3003e0aeb79eff8d0067b5887716acd3630640e2d599434288635f4ae7d6aeb522a0e814c0b5acb64dc6166d7b7487e9ee88c SHA512 1a71e1277f6d2e7d0d059a15c51877d3d838e1c97ea6d8c61cdeb4ff0a4c2640be6a412db2c099b78d15b657d3b0bf8f324416d9258f7867fee6cf54923a542d diff --git a/games-fps/serioussam/metadata.xml b/games-fps/serioussam/metadata.xml new file mode 100644 index 000000000000..c9c22cde71e7 --- /dev/null +++ b/games-fps/serioussam/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>t.x00100x.t@yandex.ru</email> + <name>Alexander Pavlov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="alsa">Enable support ALSA sound.</flag> + <flag name="pipewire">Enable support for pipewire.</flag> + <flag name="vulkan">Enable support Vulkan render.</flag> + </use> + <upstream> + <remote-id type="github">tx00100xt/SeriousSamClassic-VK</remote-id> + <bugs-to>https://github.com/tx00100xt/SeriousSamClassic-VK/issues</bugs-to> + <changelog>https://github.com/tx00100xt/SeriousSamClassic-VK/releases</changelog> + </upstream> +</pkgmetadata> diff --git a/games-fps/serioussam/serioussam-1.10.6c.ebuild b/games-fps/serioussam/serioussam-1.10.6c.ebuild new file mode 100644 index 000000000000..79d84e4d8acf --- /dev/null +++ b/games-fps/serioussam/serioussam-1.10.6c.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop + +MY_PN1="SamTFE" +MY_PN2="SamTSE" +# Game name +GN1="serioussam" +GN2="serioussamse" + +DESCRIPTION="Linux port of Serious Sam Classic with Vulkan support" +HOMEPAGE="https://github.com/tx00100xt/SeriousSamClassic-VK" +SRC_URI="https://github.com/tx00100xt/SeriousSamClassic-VK/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/SeriousSamClassic-VK-${PV}" + +MY_CONTENT1="${WORKDIR}/SeriousSamClassic-VK-${PV}/${MY_PN1}" +MY_CONTENT2="${WORKDIR}/SeriousSamClassic-VK-${PV}/${MY_PN2}" + +LICENSE="GPL-2 ZLIB" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="alsa pipewire vulkan" + +RDEPEND=" + games-fps/serioussam-tfe-data + games-fps/serioussam-tse-data + media-libs/libsdl2[video,joystick,opengl] + media-libs/libvorbis + sys-libs/zlib + alsa? ( + >=media-libs/libsdl2-2.0.6[alsa,sound] + ) + pipewire? ( + >=media-libs/libsdl2-2.0.6[pipewire,sound] + ) + vulkan? ( + dev-util/vulkan-headers + media-libs/vulkan-loader + media-libs/libsdl2[video,joystick,opengl,vulkan] + ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + app-alternatives/lex + app-alternatives/yacc + media-gfx/imagemagick +" + +src_configure() { + einfo "Remove Win32 stuff..." + rm -rf "${MY_CONTENT1}"/Tools.Win32 || die "Failed to remove stuff Win32" + rm -rf "${MY_CONTENT2}"/Tools.Win32 || die "Failed to remove stuff Win32" + + einfo "Setting build type Release..." + CMAKE_BUILD_TYPE="Release" + local mycmakeargs=( + -DUSE_SYSTEM_INSTALL=ON + -DUSE_SYSTEM_VULKAN=$(usex vulkan ON OFF) + -DUSE_ASM=$(usex x86 OFF ON) + ) + cmake_src_configure +} + +src_install() { + local dir1="/usr/share/${GN1}" + local dir2="/usr/share/${GN2}" + local dir3="/usr/share/applications" + cmake_src_install + + # install man pages + mv "${S}"/man/gentoo/serioussam-vk.1 "${S}"/man/gentoo/serioussam.1 \ + || die "Failed move man pages" + doman "${S}"/man/gentoo/serioussam.1 + + # removing repo stuff + rm -fr "${MY_CONTENT1}/Sources" && rm -fr "${MY_CONTENT2}/Sources" \ + || die "Failed to remove Sources" + rm -f "${MY_CONTENT1}"/{*.png,*.desktop} \ + || die "Failed to remove serioussam icon and desktop file" + rm -f "${MY_CONTENT2}"/{*.png,*.desktop} \ + || die "Failed to remove serioussamse icon and desktop file" + rm -f "${ED}${dir3}/${GN1}.desktop" "${ED}${dir3}/${GN2}.desktop" \ + || die "Failed to remove desktop file" + + # moving repo content (Scripts, Data, Settings ...) + cp -fr "${MY_CONTENT1}"/* "${ED}${dir1}" \ + || die "Failed to copy repo content (Scripts, Settings)" + cp -fr "${MY_CONTENT2}"/* "${ED}${dir2}" \ + || die "Failed to copy repo content (Scripts, Settings)" + + make_desktop_entry ${GN1} "Serious Sam The First Encounter" ${GN1} + make_desktop_entry ${GN2} "Serious Sam The Second Encounter" ${GN2} +} + +pkg_postinst() { + elog " Look at:" + elog " man serioussam" + elog " https://github.com/tx00100xt/SeriousSamClassic-VK" + elog " https://github.com/tx00100xt/SeriousSamClassic-VK/wiki" + elog " For information on the first launch of the game" +} diff --git a/games-fps/serioussam/serioussam-1.10.6d.ebuild b/games-fps/serioussam/serioussam-1.10.6d.ebuild new file mode 100644 index 000000000000..4df47b2386ee --- /dev/null +++ b/games-fps/serioussam/serioussam-1.10.6d.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop + +MY_PN1="SamTFE" +MY_PN2="SamTSE" +# Game name +GN1="serioussam" +GN2="serioussamse" + +DESCRIPTION="Linux port of Serious Sam Classic with Vulkan support" +HOMEPAGE="https://github.com/tx00100xt/SeriousSamClassic-VK" +SRC_URI="https://github.com/tx00100xt/SeriousSamClassic-VK/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/SeriousSamClassic-VK-${PV}" + +MY_CONTENT1="${WORKDIR}/SeriousSamClassic-VK-${PV}/${MY_PN1}" +MY_CONTENT2="${WORKDIR}/SeriousSamClassic-VK-${PV}/${MY_PN2}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="alsa pipewire vulkan" + +RDEPEND=" + games-fps/serioussam-tfe-data + games-fps/serioussam-tse-data + media-libs/libsdl2[video,joystick,opengl] + media-libs/libvorbis + sys-libs/zlib + alsa? ( + >=media-libs/libsdl2-2.0.6[alsa,sound] + ) + pipewire? ( + >=media-libs/libsdl2-2.0.6[pipewire,sound] + ) + vulkan? ( + dev-util/vulkan-headers + media-libs/vulkan-loader + media-libs/libsdl2[video,joystick,opengl,vulkan] + ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + app-alternatives/lex + app-alternatives/yacc + media-gfx/imagemagick +" + +src_configure() { + einfo "Remove Win32 stuff..." + rm -rf "${MY_CONTENT1}"/Tools.Win32 || die "Failed to remove stuff Win32" + rm -rf "${MY_CONTENT2}"/Tools.Win32 || die "Failed to remove stuff Win32" + + einfo "Setting build type Release..." + CMAKE_BUILD_TYPE="Release" + local mycmakeargs=( + -DUSE_SYSTEM_INSTALL=ON + -DUSE_SYSTEM_VULKAN=$(usex vulkan ON OFF) + -DUSE_ASM=$(usex x86 OFF ON) + ) + cmake_src_configure +} + +src_install() { + local dir1="/usr/share/${GN1}" + local dir2="/usr/share/${GN2}" + local dir3="/usr/share/applications" + cmake_src_install + + # install man pages + mv "${S}"/man/gentoo/serioussam-vk.1 "${S}"/man/gentoo/serioussam.1 \ + || die "Failed move man pages" + doman "${S}"/man/gentoo/serioussam.1 + + # removing repo stuff + rm -fr "${MY_CONTENT1}/Sources" && rm -fr "${MY_CONTENT2}/Sources" \ + || die "Failed to remove Sources" + rm -f "${MY_CONTENT1}"/{*.png,*.desktop} \ + || die "Failed to remove serioussam icon and desktop file" + rm -f "${MY_CONTENT2}"/{*.png,*.desktop} \ + || die "Failed to remove serioussamse icon and desktop file" + rm -f "${ED}${dir3}/${GN1}.desktop" "${ED}${dir3}/${GN2}.desktop" \ + || die "Failed to remove desktop file" + + # moving repo content (Scripts, Data, Settings ...) + cp -fr "${MY_CONTENT1}"/* "${ED}${dir1}" \ + || die "Failed to copy repo content (Scripts, Settings)" + cp -fr "${MY_CONTENT2}"/* "${ED}${dir2}" \ + || die "Failed to copy repo content (Scripts, Settings)" + + make_desktop_entry ${GN1} "Serious Sam The First Encounter" ${GN1} + make_desktop_entry ${GN2} "Serious Sam The Second Encounter" ${GN2} +} + +pkg_postinst() { + elog " Look at:" + elog " man serioussam" + elog " https://github.com/tx00100xt/SeriousSamClassic-VK" + elog " https://github.com/tx00100xt/SeriousSamClassic-VK/wiki" + elog " For information on the first launch of the game" +} diff --git a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild index 07743ada8ed5..433bb4b09774 100644 --- a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild +++ b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,8 +9,8 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="Adds stencil shadows and per pixel lights to quake" -HOMEPAGE="http://tenebrae.sourceforge.net/" -SRC_URI="mirror://sourceforge/tenebrae/tenebraedata.zip +HOMEPAGE="https://tenebrae.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/tenebrae/tenebraedata.zip mirror://gentoo/${P}.tbz2" S="${WORKDIR}" diff --git a/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild b/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild index 72ae024af233..c81d6d5611f9 100644 --- a/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild +++ b/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,8 +8,8 @@ inherit desktop wrapper MY_PN="${PN/-bin/}" DESCRIPTION="Blood remake" HOMEPAGE="https://www.transfusion-game.com/" -SRC_URI="mirror://sourceforge/blood/${MY_PN}-1.0-linux.i386.zip - mirror://sourceforge/blood/${MY_PN}-patch-${PV}-linux.i386.zip +SRC_URI="https://downloads.sourceforge.net/blood/${MY_PN}-1.0-linux.i386.zip + https://downloads.sourceforge.net/blood/${MY_PN}-patch-${PV}-linux.i386.zip mirror://gentoo/${MY_PN}.png" S="${WORKDIR}/${MY_PN}" diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild index b0041846f317..8379e932e377 100644 --- a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild +++ b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -61,14 +61,14 @@ pkg_pretend() { } src_configure() { - tc-export CC + tc-export CC PKG_CONFIG default } src_compile() { # Workaround for used zlib macro, which got renamed in Gentoo # wrt bug #449510 - append-cppflags "-DOF=_Z_OF" + has_version "<sys-libs/zlib-1.3" && append-cppflags "-DOF=_Z_OF" local myemakeargs=( ARCH=$(usex amd64 "x86_64" "i686" ) diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r5.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r5.ebuild index 37c4e15613e2..92c5ea481614 100644 --- a/games-fps/ut2003-demo/ut2003-demo-2206-r5.ebuild +++ b/games-fps/ut2003-demo/ut2003-demo-2206-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="bindist mirror strip" RDEPEND=" - sys-devel/bc + app-alternatives/bc sys-libs/glibc sys-libs/libstdc++-v3:5 virtual/opengl[abi_x86_32(-)] diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest index 1cdcee8f7d96..11839ddb2810 100644 --- a/games-fps/ut2004/Manifest +++ b/games-fps/ut2004/Manifest @@ -1,2 +1,2 @@ -DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1 +DIST ut2004-lnxpatch3369-2.tar.tar 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1 DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B 72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf diff --git a/games-fps/ut2004/ut2004-3369.3-r3.ebuild b/games-fps/ut2004/ut2004-3369.3-r3.ebuild index 3011645a2d0a..99cef93dc362 100644 --- a/games-fps/ut2004/ut2004-3369.3-r3.ebuild +++ b/games-fps/ut2004/ut2004-3369.3-r3.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit desktop wrapper -PATCH_P="${PN}-lnxpatch${PV%.*}-2.tar.bz2" +PATCH_P="${PN}-lnxpatch${PV%.*}-2.tar.tar" DESCRIPTION="Editor's Choice Edition plus Mega Pack for the well-known first-person shooter" HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004" SRC_URI=" - http://ut2004.ut-files.com/Patches/Linux/${PATCH_P} + http://ut2004.ut-files.com/UT2004/${PATCH_P} https://dev.gentoo.org/~chewi/distfiles/ut2004-v${PV/./-}-linux-dedicated.7z " - +S="${WORKDIR}/${PN^^}-Patch" LICENSE="ut2003" SLOT="0" KEYWORDS="-* ~amd64 ~x86" @@ -36,7 +36,6 @@ RDEPEND=" BDEPEND="app-arch/p7zip" -S="${WORKDIR}/${PN^^}-Patch" DIR="/opt/${PN}" # The executable pages are required. Bug #114733. diff --git a/games-fps/wolfgl/Manifest b/games-fps/wolfgl/Manifest deleted file mode 100644 index bc615f8e5c70..000000000000 --- a/games-fps/wolfgl/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST sdmdata.zip 557147 BLAKE2B a70a821941175aecfd3edd7746ed54e13181863ddb25bfcc77bf354b1366541b71462739543a1ba9aa548a754b8a88db60eff0cf5d8313097f6d41cb62892b3a SHA512 cf6eae7027acbe6e3da6985639eb36def04254790f6449f5353ffe5edd13a73c01b0a35ef9873f2e97d09ec59e632337c5b3a1a26185befdf4dfa5a161267076 -DIST wolfdata.zip 564771 BLAKE2B 0c1343cae6fbcb695930899fd2ba9e5798af47f4bec984fa15cdca85c9d96e5dd9ed6e5ff2b7bc489251e5be6342ed94a8cb7c626f39564a8599d5d3fe5eb6d2 SHA512 2b14c477e54d14fc543e146fa699f55dabb003bd3bac1e89422a49391cf8f29b5db6967b09c08a82c612f73fe71d624902c180d81481ad42f011f51448652a43 -DIST wolfgl-0.93.tbz2 146132 BLAKE2B b9dbf442be01a516c5cbf1146892d610df881109ca163ec7c1c79bd9ea1c328d8e9401ba5615e1be9c2df5df3940b83fdbe36154c4f0429b617dc6208b6ccf78 SHA512 834dda2eb4e099d70fad52e40760886208c5ca60e687024f1fe51088b94c8cdea7c058d326daa61966946bb70feeee97d0b7fb7c284e98fdec0eb8c503de7e30 diff --git a/games-fps/wolfgl/files/0.93-gcc.patch b/games-fps/wolfgl/files/0.93-gcc.patch deleted file mode 100644 index a22923393678..000000000000 --- a/games-fps/wolfgl/files/0.93-gcc.patch +++ /dev/null @@ -1,209 +0,0 @@ -diff -abur a/common/console.c b/common/console.c ---- a/common/console.c 2000-09-27 16:19:44.000000000 +0200 -+++ b/common/console.c 2003-09-11 19:59:46.037562040 +0200 -@@ -3,6 +3,14 @@ - #include "id_us.h" - #include "console.h" - -+#ifdef _LINUX -+#include <string.h> -+#endif -+ -+#ifdef _LINUX -+#include <string.h> -+#endif -+ - static char con_lines[32][45]; // buffer - static int con_active; // console is visible - static int con_current; // current line -diff -abur a/common/id_in.h b/common/id_in.h ---- a/common/id_in.h 2000-09-27 16:04:26.000000000 +0200 -+++ b/common/id_in.h 2003-09-11 19:32:14.368653880 +0200 -@@ -178,6 +178,7 @@ - - void IN_Startup(); - void IN_Shutdown(); -+void IN_KeyEvent(unsigned char key); - void IN_Default(wbool gotit, ControlType in); - void IN_ClearKeysDown(); - void IN_ReadControl(int player, ControlInfo *info); -diff -abur a/common/id_vh.c b/common/id_vh.c ---- a/common/id_vh.c 2000-09-26 17:39:36.000000000 +0200 -+++ b/common/id_vh.c 2003-09-11 19:24:57.183116184 +0200 -@@ -230,3 +230,4 @@ - - } - */ -\ No newline at end of file -+ -diff -abur a/common/opengl.c b/common/opengl.c ---- a/common/opengl.c 2000-09-27 16:04:26.000000000 +0200 -+++ b/common/opengl.c 2003-09-11 19:22:35.622636648 +0200 -@@ -1,5 +1,10 @@ - #include <stdio.h> - #include <stdlib.h> -+ -+#ifdef _LINUX -+#include <string.h> -+#endif -+ - #include "system.h" - #include "opengl.h" - #include "wl_def.h" -diff -abur a/common/wl_act2.c b/common/wl_act2.c ---- a/common/wl_act2.c 2000-09-27 16:04:26.000000000 +0200 -+++ b/common/wl_act2.c 2003-09-11 19:19:45.511497472 +0200 -@@ -1,5 +1,9 @@ - // WL_ACT2.C - -+#ifdef _LINUX -+#include <stdlib.h> -+#endif -+ - #include "wl_def.h" - - //============================================================================= -diff -abur a/common/wl_agent.c b/common/wl_agent.c ---- a/common/wl_agent.c 2003-09-11 20:04:40.738760648 +0200 -+++ b/common/wl_agent.c 2003-09-11 19:57:06.860760592 +0200 -@@ -3,6 +3,10 @@ - #include <string.h> - #include "wl_def.h" - -+#ifdef _LINUX -+#include <stdlib.h> -+#endif -+ - //============================================================================= - // LOCAL CONSTANTS - //============================================================================= -diff -abur a/common/wl_draw.c b/common/wl_draw.c ---- a/common/wl_draw.c 2003-09-11 20:04:40.739760496 +0200 -+++ b/common/wl_draw.c 2003-09-11 19:20:33.512200256 +0200 -@@ -2,6 +2,11 @@ - - #include <stdio.h> - #include <stdlib.h> -+ -+#ifdef _LINUX -+#include <string.h> -+#endif -+ - #include "system.h" - #include "opengl.h" - #include "wl_def.h" -diff -abur a/common/wl_menu.c b/common/wl_menu.c ---- a/common/wl_menu.c 2000-09-27 16:04:27.000000000 +0200 -+++ b/common/wl_menu.c 2003-09-11 20:07:38.892677136 +0200 -@@ -5,6 +5,10 @@ - // - //////////////////////////////////////////////////////////////////// - -+#ifdef _LINUX -+#include "../linux/input.h" -+#endif -+ - #include <string.h> - #include "opengl.h" - #include "wl_def.h" -diff -abur a/common/wl_menu.h b/common/wl_menu.h ---- a/common/wl_menu.h 2000-09-26 17:38:31.000000000 +0200 -+++ b/common/wl_menu.h 2003-09-11 18:31:41.593919584 +0200 -@@ -233,3 +233,4 @@ - void NonShareware(); - /*int GetYorN(int x,int y,int pic); - */ -\ No newline at end of file -+ -diff -abur a/common/wl_play.c b/common/wl_play.c ---- a/common/wl_play.c 2000-09-27 16:04:27.000000000 +0200 -+++ b/common/wl_play.c 2003-09-11 19:40:31.293109880 +0200 -@@ -1,6 +1,11 @@ - // WL_PLAY.C - - #include <memory.h> -+ -+#ifdef _LINUX -+#include "../linux/input.h" -+#endif -+ - #include "wl_def.h" - #include "system.h" - -diff -abur a/common/wl_state.c b/common/wl_state.c ---- a/common/wl_state.c 2000-09-27 16:04:27.000000000 +0200 -+++ b/common/wl_state.c 2003-09-11 19:23:26.895841936 +0200 -@@ -2,6 +2,10 @@ - - #include "wl_def.h" - -+#ifdef _LINUX -+#include <stdlib.h> -+#endif -+ - //============================================================================= - // GLOBAL VARIABLES - //============================================================================= -diff -abur a/common/wl_text.c b/common/wl_text.c ---- a/common/wl_text.c 2000-09-26 17:40:23.000000000 +0200 -+++ b/common/wl_text.c 2003-09-11 19:19:00.110399488 +0200 -@@ -4,6 +4,10 @@ - #include "wl_def.h" - #include "system.h" - -+#ifdef _LINUX -+#include <string.h> -+#endif -+ - #ifndef SPEAR - - void FreeMusic(); // WL_MENU.C -diff -abur a/linux/sound.c b/linux/sound.c ---- a/linux/sound.c 2000-09-26 17:57:48.000000000 +0200 -+++ b/linux/sound.c 2003-09-11 19:55:16.702507192 +0200 -@@ -9,6 +9,8 @@ - #include <stdlib.h> - - #include <sys/time.h> -+#include <string.h> -+#include <errno.h> - - #include <fcntl.h> - #include <unistd.h> -diff -abur a/linux/sound.h b/linux/sound.h ---- a/linux/sound.h 2000-09-26 17:57:48.000000000 +0200 -+++ b/linux/sound.h 2003-09-11 19:44:03.663824624 +0200 -@@ -1,5 +1,8 @@ - void S_LoadSound(int id, void* data, long length); - void S_PlaySound(int id, int pan); -+void S_UpdateSound(); -+void S_InitSound(); -+void S_ShutDownSound(); - - extern int DigitalDevice; - -diff -abur a/linux/system.c b/linux/system.c ---- a/linux/system.c 2000-09-26 17:57:48.000000000 +0200 -+++ b/linux/system.c 2003-09-11 19:42:14.955350824 +0200 -@@ -1,9 +1,12 @@ - #include <stdio.h> -+#include <string.h> -+#include <unistd.h> - #include <sys/time.h> - #include <X11/keysym.h> - #include <GL/gl.h> - #include <GL/glx.h> - #include "wl_def.h" -+#include "sound.h" - - int screen_width, screen_height; - Display *dpy; -@@ -117,7 +120,7 @@ - visinfo = glXChooseVisual( dpy, scrnum, attrib ); - if (!visinfo) { - printf("Error: couldn't get an RGB, Double-buffered visual\n"); -- exit(1); -+ _exit(1); - } - - /* window attributes */ diff --git a/games-fps/wolfgl/files/0.93-gcc4.patch b/games-fps/wolfgl/files/0.93-gcc4.patch deleted file mode 100644 index 5dcccd76049b..000000000000 --- a/games-fps/wolfgl/files/0.93-gcc4.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -ur wolfgl-0.93-orig/common/id_ca.c wolfgl-0.93/common/id_ca.c ---- wolfgl-0.93-orig/common/id_ca.c 2006-01-28 16:59:10.000000000 -0500 -+++ wolfgl-0.93/common/id_ca.c 2006-01-28 17:04:26.000000000 -0500 -@@ -252,6 +252,7 @@ - { - unsigned short ch,chhigh,count,offset; - unsigned short *copyptr, *inptr, *outptr; -+ unsigned char *uc_inptr; - - length/=2; - -@@ -268,13 +269,17 @@ - if (!count) - { - // have to insert a word containing the tag byte -- ch |= *((unsigned char*)inptr)++; -+ uc_inptr = (unsigned char*)inptr; -+ ch |= *(uc_inptr)++; -+ inptr = (unsigned short *)uc_inptr; - *outptr++ = ch; - length--; - } - else - { -- offset = *((unsigned char*)inptr)++; -+ uc_inptr = (unsigned char*)inptr; -+ offset = *(uc_inptr)++; -+ inptr = (unsigned short *)uc_inptr; - copyptr = outptr - offset; - length -= count; - while (count--) -@@ -287,7 +292,9 @@ - if (!count) - { - // have to insert a word containing the tag byte -- ch |= *((unsigned char*)inptr)++; -+ uc_inptr = (unsigned char*)inptr; -+ ch |= *(uc_inptr)++; -+ inptr = (unsigned short *)uc_inptr; - *outptr++ = ch; - length --; - } -@@ -806,7 +813,7 @@ - - for (i=0;i<NUMCHUNKS;i++) - if (grsegs[i]) -- MM_SetPurge (&(memptr)grsegs[i],3); -+ MM_SetPurge ((memptr)&grsegs[i],3); - ca_levelbit<<=1; - ca_levelnum++; - } -@@ -862,7 +869,7 @@ - - for (i = 0; i < NUMCHUNKS; i++) - if (grsegs[i]) -- MM_SetPurge (&(memptr)grsegs[i],3); -+ MM_SetPurge ((memptr)&grsegs[i],3); - } - - //=========================================================================== -diff -ur wolfgl-0.93-orig/common/wl_game.c wolfgl-0.93/common/wl_game.c ---- wolfgl-0.93-orig/common/wl_game.c 2006-01-28 16:59:10.000000000 -0500 -+++ wolfgl-0.93/common/wl_game.c 2006-01-28 17:07:08.000000000 -0500 -@@ -545,13 +545,13 @@ - { - // solid wall - tilemap[x][y] = tile; -- (unsigned short)actorat[x][y] = tile; -+ actorat[x][y] = tile; - } - else - { - // area floor - tilemap[x][y] = 0; -- (unsigned short)actorat[x][y] = 0; -+ actorat[x][y] = 0; - } - } - - diff --git a/games-fps/wolfgl/files/0.93-sample-rate.patch b/games-fps/wolfgl/files/0.93-sample-rate.patch deleted file mode 100644 index 6e7156a1c716..000000000000 --- a/games-fps/wolfgl/files/0.93-sample-rate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/linux/sound.c 2003-09-11 20:28:32.032170976 +0200 -+++ b/linux/sound.c 2003-09-11 20:28:45.111182664 +0200 -@@ -64,7 +64,7 @@ - #define BUFMUL 4 - #define MIXBUFFERSIZE (SAMPLECOUNT*BUFMUL) - --#define SAMPLERATE 11025 // Hz -+#define SAMPLERATE 8000 // Hz - #define SAMPLESIZE 2 // 16bit - - // The actual output device. diff --git a/games-fps/wolfgl/files/0.93-sprite.patch b/games-fps/wolfgl/files/0.93-sprite.patch deleted file mode 100644 index 135eb8e26eed..000000000000 --- a/games-fps/wolfgl/files/0.93-sprite.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- a/common/wl_agent.c 2003-09-11 20:39:02.674298800 +0200 -+++ b/common/wl_agent.c 2003-09-11 20:42:17.229721880 +0200 -@@ -919,32 +919,31 @@ - viewdist = 0x7fffffffl; - closest = NULL; - --// while (1) -+ while (1) - { - oldclosest = closest; - - for (check=ob->next ; check ; check=check->next) - if ((check->flags & FL_SHOOTABLE) -- //&& -+ && - // (check->flags & FL_VISABLE) && --// (abs(check->viewx - centerx) < shootdelta) -+ (abs(check->viewx - centerx) < shootdelta) - ) --// { -+ { - if (CheckLine(check)) --// if (check->transx < viewdist) -+ if (check->transx < viewdist) - { --// viewdist = check->transx; -+ viewdist = check->transx; - closest = check; -- break; - } --// } -+ } - - if (closest == oldclosest) - return; // no more targets, all missed - - // trace a line from player to enemey --// if (CheckLine(closest)) --// break; -+ if (CheckLine(closest)) -+ break; - } - - // hit something ---- a/common/wl_draw.c 2003-09-11 20:43:26.473195272 +0200 -+++ b/common/wl_draw.c 2003-09-11 20:46:57.859059736 +0200 -@@ -877,7 +877,7 @@ - tilespot = &tilemap[0][0]+spotloc; - - // could be in any of the nine surrounding tiles -- if ((*visspot) || -+ if (1 || (*visspot) || - (*(visspot-1) && !*(tilespot-1)) || - (*(visspot+1) && !*(tilespot+1)) || - (*(visspot-65) && !*(tilespot-65)) || -@@ -980,6 +980,8 @@ - - for (obj = player->next; obj; obj = obj->next) - { -+ int sprite; -+ - if (!areabyplayer[obj->areanumber]) - continue; - if (!gamestates[obj->state].shapenum) -@@ -989,10 +991,14 @@ - glTranslated((float)obj->x/(1<<16), (float)obj->y/(1<<16), 0); - glRotated(-player->angle, 0,0,1); - -- if (texture_index[PMSpriteStart+gamestates[obj->state].shapenum] == 0) -- CreateSprite(PMSpriteStart+gamestates[obj->state].shapenum); -+ sprite = gamestates[obj->state].shapenum; -+ if (gamestates[obj->state].rotate) -+ sprite += CalcRotate(obj); -+ -+ if (texture_index[PMSpriteStart+sprite] == 0) -+ CreateSprite(PMSpriteStart+sprite); - else -- glBindTexture(GL_TEXTURE_2D, texture_index[PMSpriteStart+gamestates[obj->state].shapenum]); -+ glBindTexture(GL_TEXTURE_2D, texture_index[PMSpriteStart+sprite]); - - glBegin(GL_QUADS); - glTexCoord2f(0,0); diff --git a/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch b/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch deleted file mode 100644 index f9da771e1d79..000000000000 --- a/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/linux/Makefile 2009-02-06 14:27:11.000000000 +0100 -+++ b/linux/Makefile 2009-02-06 14:27:40.000000000 +0100 -@@ -19,7 +19,7 @@ - @echo 'Do not call this file directly' - - wolfgl: $(LINUX_OBJS) $(COMMON_OBJS) -- $(CC) $(LINK_FLAGS) $(COMMON_OBJS) $(LINUX_OBJS) -o $(OUTDIR)/wolfgl -+ $(CC) $(LDFLAGS) $(COMMON_OBJS) $(LINUX_OBJS) $(LINK_FLAGS) -o $(OUTDIR)/wolfgl - - # common directory - diff --git a/games-fps/wolfgl/metadata.xml b/games-fps/wolfgl/metadata.xml deleted file mode 100644 index d601ba94dc9f..000000000000 --- a/games-fps/wolfgl/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">wolfgl</remote-id> - </upstream> -</pkgmetadata> diff --git a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild deleted file mode 100644 index 3b90a916f32e..000000000000 --- a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -#ECVS_SERVER="wolfgl.cvs.sourceforge.net:/cvsroot/wolfgl" -#ECVS_MODULE="wolfgl" -#inherit cvs - -DESCRIPTION="Wolfenstein and Spear of Destiny port using OpenGL" -HOMEPAGE="http://wolfgl.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tbz2 - mirror://sourceforge/wolfgl/wolfdata.zip - mirror://sourceforge/wolfgl/sdmdata.zip" -# mirror://sourceforge/wolfgl/wolfglx-wl6-${PV}.zip -# mirror://sourceforge/wolfgl/wolfglx-sod-${PV}.zip - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND="virtual/opengl" -DEPEND="${RDEPEND} - app-arch/unzip - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/${PV}-gcc.patch - "${FILESDIR}"/${PV}-sample-rate.patch - "${FILESDIR}"/${PV}-sprite.patch - "${FILESDIR}"/${P}-as-needed.patch - "${FILESDIR}"/${PV}-gcc4.patch -) - -src_compile() { - emake -j1 CFLAGS="${CFLAGS}" DATADIR="/usr/share/${PN}" -} - -src_install() { - newbin linux/SDM/wolfgl wolfgl-sdm - newbin linux/SOD/wolfgl wolfgl-sod - newbin linux/WL1/wolfgl wolfgl-wl1 - newbin linux/WL6/wolfgl wolfgl-wl6 - - insinto /usr/share/${PN} - doins "${WORKDIR}"/*.{sdm,wl1} -} - -pkg_postinst() { - elog "This installed the shareware data files for" - elog "Wolfenstein 3D and Spear Of Destiny." - elog "If you wish to play the full versions just" - elog "copy the data files to /usr/share/${PN}/" -} diff --git a/games-fps/worldofpadman/metadata.xml b/games-fps/worldofpadman/metadata.xml index dc2167e82ba6..3e4610474191 100644 --- a/games-fps/worldofpadman/metadata.xml +++ b/games-fps/worldofpadman/metadata.xml @@ -9,6 +9,6 @@ <flag name="maps">Install extra maps (PadPack)</flag> </use> <upstream> - <remote-id type="sourceforge">worldofpadman</remote-id> + <remote-id type="github">PadWorld-Entertainment/worldofpadman</remote-id> </upstream> </pkgmetadata> diff --git a/games-fps/worldofpadman/worldofpadman-1.6-r2.ebuild b/games-fps/worldofpadman/worldofpadman-1.6-r2.ebuild index a958dfcfe874..d655faeeb278 100644 --- a/games-fps/worldofpadman/worldofpadman-1.6-r2.ebuild +++ b/games-fps/worldofpadman/worldofpadman-1.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,8 +7,8 @@ inherit desktop DESCRIPTION="A cartoon style multiplayer first-person shooter" HOMEPAGE="https://worldofpadman.net/" -SRC_URI="mirror://sourceforge/${PN}/wop-1.5-unified.zip - mirror://sourceforge/${PN}/wop-1.5.x-to-1.6-patch-unified.zip" +SRC_URI="https://downloads.sourceforge.net/${PN}/wop-1.5-unified.zip + https://downloads.sourceforge.net/${PN}/wop-1.5.x-to-1.6-patch-unified.zip" S="${WORKDIR}/${P}_svn2178-src" LICENSE="GPL-2 worldofpadman" diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest index 1e1cdbcaa3e9..0416a5788373 100644 --- a/games-fps/xonotic/Manifest +++ b/games-fps/xonotic/Manifest @@ -1 +1 @@ -DIST xonotic-0.8.5.zip 1228561792 BLAKE2B 3f1391ff6522c8f6b7b4f717aecd6ffe852142d70e7cffff9cb5a602a69142c59850636cc1450aade5ae39088354170b819f696427ba8829bf7c375029f2430a SHA512 4ffc4b73eeb5f580d178a98419d5b44cbff0c56e356a62baa729b5b7a6c3d43b2b425b123428c9b1bf3f4718eaf61bcf5d62914521cc061c7563a253440c807e +DIST xonotic-0.8.6.zip 1238439495 BLAKE2B f9a9823a2ef8a1a8790c92fe898599938ff39fe9a32bb1f3595a4b451237f7fca29385feeaf8164216713a2cbe2db4d78cadeee91bb08093dae4a7ad1588e4d4 SHA512 cb39879e96f19abb2877588c2d50c5d3e64dd68153bec3dd1bebedf4d765e506afa419c28381d7005aed664cb1a042571c132b5b319e4308cab67745d996c2a6 diff --git a/games-fps/xonotic/xonotic-0.8.5.ebuild b/games-fps/xonotic/xonotic-0.8.6.ebuild index de5cb5d5a726..9848e246cedb 100644 --- a/games-fps/xonotic/xonotic-0.8.5.ebuild +++ b/games-fps/xonotic/xonotic-0.8.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -60,13 +60,15 @@ src_prepare() { src_compile() { tc-export CC + # do not pass in array to keep the makefile.inc's += flags + local -x CPUOPTIMIZATIONS=${CFLAGS} + local emakeargs=( -C source/darkplaces DEFAULT_SNDAPI=$(usex alsa ALSA OSS) DP_FS_BASEDIR="${EPREFIX}"/usr/share/${PN} DP_LINK_ODE=$(usex ode shared no) STRIP=: - CPUOPTIMIZATIONS="${CFLAGS}" GENTOO_LDFLAGS="${LDFLAGS}" ) diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest index 1d69a8710a45..e636ca9ae110 100644 --- a/games-fps/yamagi-quake2/Manifest +++ b/games-fps/yamagi-quake2/Manifest @@ -1,10 +1,9 @@ -DIST quake2-8.10.tar.xz 2138064 BLAKE2B 80fbb467977d365aa19015eade8d6cb6004895f8f5a605cdbd840ac41ad2d8a51da1ef3653f401bd1e597c39185f273a5f9720570ad9899815e6bc064a323027 SHA512 390a3971d5473166e4c24ef93b1866ae4ca05d17f6c5906d0b7a5bd81d3fbfbff6756b8222af5e3bf2a2f738215375a9eb2947b8690aceb99ac2bf4125d19d25 -DIST quake2-8.20.tar.xz 2152184 BLAKE2B 6616666bcc48f7d97d06e71744f6ebdd3ef6a2701b628fe6d7c26293f8b62586bd03037877a77c3c56660e6e11704e6149e8bd7aad3c5fe28964ee25278cd16f SHA512 5dbdbbf582494d16d00b9880ddea6de4b098a307dbe4ddf6bc90aa6b2bd2928c10fab40cf5dd63861e7a37f9c75b9afae6f43f8bfff3ee6704ca94f78ff9b7d2 -DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e -DIST quake2-ctf-1.09.tar.xz 136564 BLAKE2B 352dd4a8a7a10b28ecff49bf61517fa39f4836e3f40fc41f234d5bb845467e1e87a385d4f4786d61228e2d9bcbb8647b660f054ea72af826b7fefb052f946d7d SHA512 2ba40ef7c973cc57aa632e3a102784f5819109019dc5e614ff376e69ba85a21a85171c713c1c55a023f17ba2f2f8f888acbf37e103e39d4f21cc498d167a0aa6 -DIST quake2-ref_vk-1.0.2.tar.gz 295693 BLAKE2B 422fa9f406302140c0cad4994f4e33a6b145dd954417635a73406fd5d888ed8884d335a15e13069881d8102aa87157f0061553c3c3dc253b5fdb40b389b0027f SHA512 5b6d72a6a769cd9171a6ac2776f9c637e527800b3214e1799041e0c19c9b258130b6fb67812e5c889a1b1f593edd14c23ea4aa00cbfec06e68ef8aeb132a7102 -DIST quake2-ref_vk-1.0.4.tar.gz 301286 BLAKE2B f5b03e451a5e341fcce4db353d71dd80f579326e7d7d6db899e17490f74d4d2b74b6186a57a614bb82b8460f59d3b0ad0f60f8045ff6ad35bbc14ebb54cb8e1e SHA512 9db1b75c2676d22e10fe0d9954349585d055eb29a58d63e04a023670d1a60f8bc8fc0b8ecfc854edd1f464d6200a58d56dd8fdd3489389047e2e5198fdf756a3 -DIST quake2-rogue-2.09.tar.xz 305548 BLAKE2B d0623a68b52faf87caa974ba9bcf511e24b132b3fb371dea312c8ff8edab943fcdcfd0bf4278cb996c9b8b85da5c61a1b276e3f0d4493d2e69615908c4f6c01e SHA512 f69fe00c1d3484280231b4ec625aff5f3135f013398014d01ed3823834f17bcbc8930911843b00b088a8247e42ce5074f5b2a029ff2a695ed65e8561ed563de5 -DIST quake2-rogue-2.10.tar.xz 306052 BLAKE2B 3b77949857014dd0fa96ad14eabe9548f18cdc47a7620c2dba89709d5d0747e05a22a5b50fe6ee7599ae61969572fa4b26334615947991008b8187df6eb1d19a SHA512 52929c3d483b569a90f4e3183ffe0525ee5f73cd50ef12148e9c3894ee5e9ec73b3458677fcdeae4df4a93bd49ef9e43d6ff3c4ab989e982018d3e76a76e4fc0 -DIST quake2-xatrix-2.10.tar.xz 214664 BLAKE2B 858a33c10ad3378449cf96cf4cec45bbbeb0680eb7296a6ab9a266dcb83053a1ea784f171b3b163426583ce2bd4b5631daa0b327a9c4ab1c13ab469a62a3d85d SHA512 fa6c008fba766e0ec159ab0a9ea72fb4bcf33c428f5b5c37a0611c9f2052f147d14af9872bbccdfdf4ab485bf523398c32dfa91a767b715a2dc84355b7e1d204 -DIST quake2-xatrix-2.11.tar.xz 215284 BLAKE2B d763005e33d4d5db7c8ca9c93597e6a2d207cb9fb6f3fdbc758c148833226006caa7ebdb23865a6aa434e367d2259e630da177033a6760c7b1e51044cff4cb0b SHA512 a9f668804feb942a65eae1a537a4c26c079511d9dc7bf339fb9e1dff1de4dce8d0795813387e15947d0906044a75de7411d1c84f290b64e37f417d3fdf2fa5b0 +DIST quake2-8.30.tar.xz 2165532 BLAKE2B cc0d42d643d066368450f2d789a987a978a3c0f319fdba2593e5275c4af3b2e7833913326d6cee39ddf854564638a3e2dc27c8333afbf0ff36691c31f5b093d8 SHA512 2801cc167f6780c93b9abb5462b6f57c4487ba8745f61dd4732ec9fccd0c07b5058b9e6640dae71b74eece5248fbae72ce071cc5b96e0d9a9e0540389e1fa413 +DIST quake2-8.41.tar.xz 2161200 BLAKE2B 19c3f0958854916fa480e3a07be618a4bd5c972a231b5af41accf49979df45c318fedf010eb7c132ddb84d03fa204d1a3132028784a94281fffbac0cb2e4b578 SHA512 42870ace797146b2913669cea796b7e5525178078274eac6011183bab90df217fd4aa1c5b7232275b6a0d05a488bd4af6e9757c9f40194a33c7512c56c2caa53 +DIST quake2-ctf-1.10.tar.xz 136544 BLAKE2B 04a374a32b90d4dd77cb7f57f361775310560b29a75b61b7acec1f3694041b04afa9fc7c75b93872368c6af552531ab2aba0d766f2394fd5a77da8017a3f9878 SHA512 66734ce71097a8a584408916fe445d56e81ae86c19ecdd178dfe9f14aa1a526a9f098b0f5756441c80b5516c160e7f64454acc5c351f0ed99acc7dea0a2d9027 +DIST quake2-ref_vk-1.0.7.tar.gz 315716 BLAKE2B b12996f3f09f07ebd8ed10fe138115046061941b70db7c7da9d0c639ddb2553fd040f9552db107757ea4f86e496665c520b4d4c2b3611a6d51692bdb5c6cc9b4 SHA512 52a05e64e6d41be78945b6908a08839507e1c14d9d16661ba45eda3bb4147ca4c89cc767343a5ad96e2bcef5c7773ed4fa128eaf829c0433f363873fafd326a4 +DIST quake2-ref_vk-1.0.8.tar.gz 318062 BLAKE2B 0f9c647b8f8d7919b2ffde9a16b357efd354ebd5ba9d5ce7c2f7e654272d7bd1856a410bc0ccfd5928c9efaf669f91290f911befc532742a3aad05e1097bfcde SHA512 52d6c1336545671304e871c494c122381895dcf6658ed0cefc3fb94aaa2c4c37433a2e2a6c7d3b533864c8de37fe3aa11f482ee02d9fd548d4bd6b9611d13d65 +DIST quake2-rogue-2.11.tar.xz 324220 BLAKE2B c2c4b9b65238302f81f31f02b3576fd29507d276482c74b6b3720ceb4664e49109afc0e14a759de2866125b98e775e9417461682d14b11895e2470cb293e9da9 SHA512 9ff487c7907cb809efe2f327adb9547f65ca4dbaeec638ddc8e9e7b52da4d1b1574107e835a6975ab626ce5c0bf0cec0a7cc5880e45a973a208b7ebf051f80ce +DIST quake2-rogue-2.12.tar.xz 325864 BLAKE2B 3fb14d12a5d794dd61e047dbe71134171258632d6cfaf8761036796464eafc4d2b7ab3b551fe192bf8e6f78687e78af8500c99bc66d3add74bcefa10da3ffbb6 SHA512 d63b8ecd5297510606f9dae9b09da0924c464a55a25079828af6222a3eeca696fde693702071b2182f2fb99ba44a627614df9a1f77fafbab1f6181d90b2d1198 +DIST quake2-xatrix-2.12.tar.xz 216216 BLAKE2B db4e59a852a7e6f37532a79f5b74661390dd28782d0ee1ea4cc0ea77d191922adaefba8e8046b38c7b4231bd5a151562f92d56e0ee15b962cb9154fd8de36374 SHA512 291360583777dedab9935634a825f8859c12c851f103136d36c028d185bec2409a6634a6bf83db479c1b3fd3fece11698b1bd274eff75f41d51a9e498f0ba804 +DIST quake2-xatrix-2.13.tar.xz 218228 BLAKE2B 08e682ff8f82421817503625c20c7955ba168a8dcce2c40e62a5d99dfb9b97d0c9c9f988a52237ed7d8f8ac1a5ac182f820d00211a8c6034caacbb1f612f0031 SHA512 abb9086e7b449b09e01f78bf4a1e17550d962a563af58e5708bbdc39b376508b1f4e9c39249117d2f33b26270275fa60ce75866d591742c0d913827726843382 diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.20.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.30.ebuild index 8d465fc19a55..250ea6612a77 100644 --- a/games-fps/yamagi-quake2/yamagi-quake2-8.20.ebuild +++ b/games-fps/yamagi-quake2/yamagi-quake2-8.30.ebuild @@ -5,10 +5,10 @@ EAPI=8 inherit desktop toolchain-funcs wrapper -CTF_V="1.09" -ROGUE_V="2.10" -XATRIX_V="2.11" -REF_VK_V="1.0.4" +CTF_V="1.10" +ROGUE_V="2.11" +XATRIX_V="2.12" +REF_VK_V="1.0.7" DESCRIPTION="Quake 2 engine focused on single player" HOMEPAGE="https://www.yamagi.org/quake2/" diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.41.ebuild index 4a4a792e4187..0cdd4334ab66 100644 --- a/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild +++ b/games-fps/yamagi-quake2/yamagi-quake2-8.41.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit desktop toolchain-funcs wrapper -CTF_V="1.08" -ROGUE_V="2.09" -XATRIX_V="2.10" -REF_VK_V="1.0.2" +CTF_V="1.10" +ROGUE_V="2.12" +XATRIX_V="2.13" +REF_VK_V="1.0.8" DESCRIPTION="Quake 2 engine focused on single player" HOMEPAGE="https://www.yamagi.org/quake2/" |