From e9bf3526a3a5e02396f24203bf8535a21b6f9784 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Jan 2023 09:01:31 +0000 Subject: gentoo auto-resync : 31:01:2023 - 09:01:31 --- games-fps/Manifest.gz | Bin 11876 -> 11882 bytes games-fps/alephone/Manifest | 7 +- games-fps/alephone/alephone-20221126.ebuild | 100 -------------------- games-fps/alephone/alephone-20230119.ebuild | 102 +++++++++++++++++++++ games-fps/alephone/alephone-99999999.ebuild | 2 +- .../alephone/files/alephone-20230119-c99.patch | 99 ++++++++++++++++++++ 6 files changed, 206 insertions(+), 104 deletions(-) delete mode 100644 games-fps/alephone/alephone-20221126.ebuild create mode 100644 games-fps/alephone/alephone-20230119.ebuild create mode 100644 games-fps/alephone/files/alephone-20230119-c99.patch (limited to 'games-fps') diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz index 4a97a658e1bf..eda6f0c0bb51 100644 Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest index e654cff7951e..3e0550419f50 100644 --- a/games-fps/alephone/Manifest +++ b/games-fps/alephone/Manifest @@ -1,5 +1,6 @@ +AUX alephone-20230119-c99.patch 2226 BLAKE2B ce4b1164e5cbd07045ebf9c7612b943c2f052c2ce24a0629bce730154366964213b82bfe04c51d13fa46b837369f3d11da012b769bf948ccc637528e432fc663 SHA512 82a08c1d5b83681a69a97b9f054c7f70714ec607bb3b15e4dfefd09b2a8dbed9debe75a6eb090b41ad3787516f1dd6b7a5fbfeb051ca3cc7a719f49a85043774 AUX alephone.sh 486 BLAKE2B ed0a60d272e7894ec64ce6f5a727dd4cd129ae8e582f72c74d2177cf22e2be18ee72d0988204fb65650da2c0e3890c9640844bea2f8091b32d24dfb80537dd8e SHA512 4eaf345bec8daecba38125a4bceef2d20985b1653550f935af20a28ec59f8615bf14d9254257e56d006affa24d63a3859e3270f416fcfb318dc688fefa2aff3b -DIST release-20221126.tar.gz 6968670 BLAKE2B d4437f845fd9cc1c6f99620e3ff5b2e5e3fabda82622343589246999ee8c654f4762a0a2e13fc9e595ec34d1d1db7a114b4f8436967da559737af8ca86bfd559 SHA512 ca6acc4de03b65c27829c57bfabd7f6e49e78111c94aac29cf03aeb8606c9c6d8e56a477ebfbbd0b6079b2d8ed0946717883de27855532917ac4758ab43d108d -EBUILD alephone-20221126.ebuild 2293 BLAKE2B ac084f706868778a9e5e53607729c3f44306125b9c5937685e12b044d9a985a034108c981c2e5c347a8b5412c602d38af205fdc68714d929b86f868bc9a91b00 SHA512 1940625d889d7936755a8dbd814bda300e9c658ada25ee9931c353542d120022317d38d853d1d83cd7c7566b951d83ae5d82307fa43ac4aba9ea6b45f4c9ee80 -EBUILD alephone-99999999.ebuild 2293 BLAKE2B ac084f706868778a9e5e53607729c3f44306125b9c5937685e12b044d9a985a034108c981c2e5c347a8b5412c602d38af205fdc68714d929b86f868bc9a91b00 SHA512 1940625d889d7936755a8dbd814bda300e9c658ada25ee9931c353542d120022317d38d853d1d83cd7c7566b951d83ae5d82307fa43ac4aba9ea6b45f4c9ee80 +DIST release-20230119.tar.gz 6968352 BLAKE2B 06bc87b4c2bc6a311ee90f854f7c35fb4da2862c417b192a4364dbd38cac9c0c02c4439abf07e6bc7c2d68899fae4dd938464896039943f1fa6ae5a4a644260f SHA512 d1ede53c20a24b74f5525e2e8c09fdbbb05fa0262bbd8f6c1abe6c3698cdfd1dea2436487ec8f64c79a7e1f150367e40ea48838f8a42031b45c0b1498a0e77d1 +EBUILD alephone-20230119.ebuild 2335 BLAKE2B 9d36388498d4da51b8e3a7452d35c9c32a8030ebb459c9286d800dd6492cb7f7c7d0c48c617e55b174818bdfd0a17f02b0822f5263f857378b35faf8248d8f1a SHA512 bbf1d5dc2de7d6f19d809f2a74d063779aaf9f5a55cc4e82dec8cb30078cd0961394e0a737d2196b34253a52f6561b8ec1bc67df6766e6c35096cf7ada1bff3d +EBUILD alephone-99999999.ebuild 2293 BLAKE2B 1e59f7a82438a8e05d0038afdea6c7dc717ce2505bb9a38d1ad5c47fb9ca4b6580b27641b6b1e3ec61f8c41f1ea15f8a3bc82392011149c696b9bbf3e5e6cd12 SHA512 03ad350ea14f42a8a360a1f6b7eda2d73da28d0312d81822c30e576149086a17d45c6fbf28b02044e0db2e449a457ad04635d5fd95f74abc610b40f7d4593187 MISC metadata.xml 599 BLAKE2B fec1ac113594c4548d8cc07eda9a63bc49c345fb0c08ee0622d3de2c1f15b25f8f4a1c4f33770685a479417136a2aa5f66f3f8ee7e7b4ff91e4f3fb97c05eddb SHA512 42faf1057312f77764da14f535dacc06f1029524b4c92db915bcd353d529334614545bff73ee9c36ffc6955f78f451063fee03660a9d615f0b00a023cea1aefc diff --git a/games-fps/alephone/alephone-20221126.ebuild b/games-fps/alephone/alephone-20221126.ebuild deleted file mode 100644 index 70b887308564..000000000000 --- a/games-fps/alephone/alephone-20221126.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools optfeature prefix toolchain-funcs xdg - -DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon" -HOMEPAGE="https://alephone.lhowon.org/" -if [[ ${PV} = 9999* ]]; then - inherit git-r3 - 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" - S="${WORKDIR}/${PN}-release-${PV}" - KEYWORDS="~amd64" -fi - -LICENSE="GPL-3+ BitstreamVera OFL-1.1" -SLOT="0" - -IUSE="alsa curl speex 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/libpng - media-libs/libsdl2 - media-libs/sdl2-image[png] - media-libs/sdl2-net - media-libs/sdl2-ttf - media-video/ffmpeg:=[mp3,vorbis] - 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 ) -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - virtual/pkgconfig -" - -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) \ - $(use_with upnp miniupnpc) -} - -src_compile() { - tc-export AR - default -} - -src_install() { - default - prefixify_ro "${FILESDIR}"/${PN}.sh - dobin "${T}"/${PN}.sh - doman docs/${PN}.6 - docinto html/ - dodoc docs/*.html -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature_header "Install game data:" - optfeature "Marathon data files" games-fps/alephone-marathon - optfeature "Marathon 2 Durandal data files" games-fps/alephone-durandal - optfeature "Marathon: Infinity data files" games-fps/alephone-infinity -} diff --git a/games-fps/alephone/alephone-20230119.ebuild b/games-fps/alephone/alephone-20230119.ebuild new file mode 100644 index 000000000000..67bf15ff6d89 --- /dev/null +++ b/games-fps/alephone/alephone-20230119.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools optfeature prefix toolchain-funcs xdg + +DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon" +HOMEPAGE="https://alephone.lhowon.org/" +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + 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" + S="${WORKDIR}/${PN}-release-${PV}" + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3+ BitstreamVera OFL-1.1" +SLOT="0" + +IUSE="alsa curl speex 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/libpng + media-libs/libsdl2 + media-libs/sdl2-image[png] + media-libs/sdl2-net + media-libs/sdl2-ttf + media-video/ffmpeg:=[mp3,vorbis] + 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 ) +" + +DEPEND=" + ${RDEPEND} +" + +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) \ + $(use_with upnp miniupnpc) +} + +src_compile() { + tc-export AR + default +} + +src_install() { + default + prefixify_ro "${FILESDIR}"/${PN}.sh + dobin "${T}"/${PN}.sh + doman docs/${PN}.6 + docinto html/ + dodoc docs/*.html +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature_header "Install game data:" + optfeature "Marathon data files" games-fps/alephone-marathon + optfeature "Marathon 2 Durandal data files" games-fps/alephone-durandal + optfeature "Marathon: Infinity data files" games-fps/alephone-infinity +} diff --git a/games-fps/alephone/alephone-99999999.ebuild b/games-fps/alephone/alephone-99999999.ebuild index 70b887308564..15a4810f346c 100644 --- a/games-fps/alephone/alephone-99999999.ebuild +++ b/games-fps/alephone/alephone-99999999.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 diff --git a/games-fps/alephone/files/alephone-20230119-c99.patch b/games-fps/alephone/files/alephone-20230119-c99.patch new file mode 100644 index 000000000000..7340e1fb2be0 --- /dev/null +++ b/games-fps/alephone/files/alephone-20230119-c99.patch @@ -0,0 +1,99 @@ +https://github.com/Aleph-One-Marathon/alephone/pull/405 +From: Matt Jolly +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 -- cgit v1.2.3