diff options
Diffstat (limited to 'games-engines')
40 files changed, 303 insertions, 924 deletions
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz Binary files differindex 503dede18391..83afd447c5e5 100644 --- a/games-engines/Manifest.gz +++ b/games-engines/Manifest.gz diff --git a/games-engines/dMagnetic/Manifest b/games-engines/dMagnetic/Manifest index 7ca7a62e411d..99d0040f6cab 100644 --- a/games-engines/dMagnetic/Manifest +++ b/games-engines/dMagnetic/Manifest @@ -1,3 +1,3 @@ -DIST dMagnetic_0.36.tar.bz2 93540 BLAKE2B 3e6e4ddb4d20f28175737d8e99f51d95d98a5420c5125080879fee9bbd68ca376c2fb1baafd547555835faa209ab0d7c07ef59afb0e903b2b2a0c1a19fd7d41a SHA512 2de79a6de8ac3112f76b9b409def6eaa9265e9acd80143cdccf984dfead4d9134f1fc4ea3835f77f97b64a57a924eafadf57a4015e6710b6e4b603fc589128fd -EBUILD dMagnetic-0.36.ebuild 769 BLAKE2B 970ce5ea1323a3262e144a5fcedd2dbeb7c01ba22530b7f070fc3d1d6fbe180aaf22012c3cbef3cb52c45ba9eb45ab19928fda8c68e463e084931d33f363934b SHA512 52a2779904a7915d6998bd8cdf631b747703e6f824547d3705aadea5cbc51d63c2d87e6df5191235dad9655e24302476e03a73667c719f95b6c31bec016bd1ca +DIST dMagnetic_0.37.tar.bz2 93405 BLAKE2B 776ac0a96041ef5abae0c3cba5fb5bbb439b75197cc26800b92ea39e3783a30650f2be476169fec39084992e315f329faa9667fd7a9ff9d11fd837922b5d481e SHA512 44f2a7abcf0f97887f02c1567937cfcac54168effa2289766e4b2798773ad9561f634f028f36051faac229adf3cb27199a7df331fbf59e8981beb76941f29710 +EBUILD dMagnetic-0.37.ebuild 768 BLAKE2B 50e97d893040e0a46d03530de4c2a53a870ce0460f94229f52a4d6d8c9b0148c749781f89290e86a383fe722e05df41f1b04e5e66b038278be6073d00f1c6f94 SHA512 232d892260641bb34d31d0244a8d78c615362781d92b5f6450fdd366f0e459624dd0c2fe4ea29ec518877a1d77487f9f1cf6abeb5e5a831ed621395c8cf9a99e MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135 diff --git a/games-engines/dMagnetic/dMagnetic-0.36.ebuild b/games-engines/dMagnetic/dMagnetic-0.37.ebuild index 826c6e72aba2..ad01fc69e85f 100644 --- a/games-engines/dMagnetic/dMagnetic-0.36.ebuild +++ b/games-engines/dMagnetic/dMagnetic-0.37.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 @@ -9,12 +9,11 @@ MY_P="${PN}_${PV}" DESCRIPTION="A Magnetic Scrolls Interpreter for playing a collection of old text adventures" HOMEPAGE="https://www.dettus.net/dMagnetic/" SRC_URI="https://www.dettus.net/${PN}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~arm ~m68k ~x86" -S="${WORKDIR}/${MY_P}" - src_prepare() { default hprefixify src/toplevel/${PN}{,_helpscreens}.c diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest index b8f0089aff5f..36d6ff9616ae 100644 --- a/games-engines/devilutionx/Manifest +++ b/games-engines/devilutionx/Manifest @@ -1,3 +1,5 @@ DIST devilutionx-1.5.2.tar.xz 21968848 BLAKE2B 5a8c280f262e2d0f47ee5978cfc858ea62481eac838ad691996f359f1c4889499e4c78b5e6a1f2dc998cf0fc89ebbdf79296a25adb411e30e9248cce1b07d3a8 SHA512 b7fd5814c8671e439d4349297cfda0d89eb1f7a0945ec11bdf7a83637371664c9c39c036249e1650911397111e1b5d9e931f221ffd2d4a1f9e80d5ca58357dcf +DIST devilutionx-1.5.3.tar.xz 22394112 BLAKE2B 1b04c7fe334ddfd6b1eb619b1e86c1e429f6c26c980a16129d8322bb30641409d9d11a203e42ccdbce60a05e00dc49b1a2acbdd1007c5f99e40b88acd1251440 SHA512 619873bb232d1b344f5001c232364af9cfcda72e44f28fd2a15332292fa37c0e64b7fccade3570b96bd648be235ed56e0cc2e3fd8299ac57ef26f2ce844cbc2f EBUILD devilutionx-1.5.2.ebuild 2105 BLAKE2B 0fe2e3ac9b4d8e75edee23be87a91cfa91098e643da7d8fa0672fb8b2f4837fbc407c0a3d926b23858e8ebcf310bd6dc02596849626749697f5500dd232d5f40 SHA512 6db777af30c2425f6734cc88d2b392371e86f41bf32b8abe08e496c45a42bdeaf8046c59cb4778930205a6e4dba181977c0133c7ccf6ae60e5fa1156900c8a4a +EBUILD devilutionx-1.5.3.ebuild 2097 BLAKE2B 946d08ea383c603954b519bf654dc2a63256f535f1d2596c63c1b0868a4d91415461e219713eb211820249b3c89916ec22216ea9bc66959cffaa1a132b4f5a0f SHA512 a93135b7e5dee4ec71c049bfcddb51ad559be11d4999745d21f24cdeb67bf203da035e8970be8be4c88063fdd61c9ad9661cfd28390d43c50c039c96ba62b3f3 MISC metadata.xml 542 BLAKE2B 25e292f201570a11d08f4f22922a9dfa1f54d51784be9b38f3b8396a44559ffe6d5f8799e20b8c2fa888ce97e8a45d257894c13924e303a7f93d04c0c046e231 SHA512 acb1603f7e41f47daf7f9fde6128b2f7c51c277cb97be62b87695cceb48fca653f90c2ca3e22238758a78aae4fa34f2de555e07f7e8d896a8ccf5e1c569e8083 diff --git a/games-engines/devilutionx/devilutionx-1.5.3.ebuild b/games-engines/devilutionx/devilutionx-1.5.3.ebuild new file mode 100644 index 000000000000..d344483cdb2b --- /dev/null +++ b/games-engines/devilutionx/devilutionx-1.5.3.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Diablo engine for modern operating systems" +HOMEPAGE="https://github.com/diasurgical/devilutionX/" +SRC_URI=" + https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz + -> ${P}.tar.xz +" +S=${WORKDIR}/${PN}-src-${PV} + +LICENSE="Unlicense BSD CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BUSL-1.1 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug +sodium test zerotier" +RESTRICT="!test? ( test )" + +RDEPEND=" + app-arch/bzip2:= + dev-libs/libfmt:= + media-libs/libsdl2[haptic,joystick,opengl,video] + media-libs/sdl2-image[png] + media-libs/sdl_audiolib + sys-libs/zlib:= + sodium? ( dev-libs/libsodium:= ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/asio + dev-cpp/simpleini + test? ( dev-cpp/gtest ) +" +BDEPEND=" + sys-devel/gettext +" + +CMAKE_SKIP_TESTS=( + # timedemo tests only pass when game assets are available + Timedemo. +) + +src_prepare() { + cmake_src_prepare + + # use system asio + echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die + + # ensure system copies are used + rm -r dist/{asio,simpleini,sdl_audiolib}-src || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DCCACHE_PROGRAM=no #813768 + -DDEBUG=$(usex debug) + -DDISABLE_LTO=yes # let CFLAGS control this + -DDISABLE_ZERO_TIER=$(usex !zerotier) + -DPACKET_ENCRYPTION=$(usex sodium) + -DPIE=yes + ) + + cmake_src_configure +} + +src_install() { + local DOCS=( Packaging/nix/README.txt docs/*.md ) + cmake_src_install + + rm -- "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die +} + +pkg_postinst() { + xdg_pkg_postinst + + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog "In order to play the game, you will need to copy the following data file" + elog "from the original game, and optionally the hellfire expansion files:" + elog " - DIABDAT.MPQ" + elog " - hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq" + elog "to ~/.local/share/diasurgical/devilution/" + elog + elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details." + fi +} diff --git a/games-engines/fheroes2/Manifest b/games-engines/fheroes2/Manifest index 202fe77235ee..8c6d34086243 100644 --- a/games-engines/fheroes2/Manifest +++ b/games-engines/fheroes2/Manifest @@ -1,4 +1,4 @@ AUX fheroes2-1.0.4-scripts.patch 716 BLAKE2B 0b944bf9f012e0fc6789230343e230b400b8a3446a0d07140816c9cb2262ad5b11f5a87562a70f32d71676b55d504299ba610e097cfe4b1fe52147e70c11c249 SHA512 fc5772dab278884f78741f3122554df9e5befc31ff3b07f0d4c5bf6e8764deee651d1999982a2c73c3a0bc49e517dd67bdf8b50151e9b489e08b9f4ebb13123f -DIST fheroes2-1.0.13.tar.gz 11988273 BLAKE2B ff4cdde0e22a239d9c596d846d801facbf762b4d47d5778799697471efbbbb2437ab73a5e2024c29d6705615f6bb58519b4fdc1368ce517f4ef5fdc4202fa464 SHA512 989b71ad6f217c5283441392e5a4bdee8b49d07261dba05372e185dbee239f4bb7b75290ca0b86fbf3dbf98edfaaca6234adc7e0483495ea799bf1636af3f6bc -EBUILD fheroes2-1.0.13.ebuild 1690 BLAKE2B 2328e0598330b06f91272b29d5cfeb23a3c330d5e236b9d06ecfcd90cccc6674505fdb7aa16a5f3a31c2a3a144c8c6dd46b78837a333413d3686c7cc8030f5c5 SHA512 7ef9b0190003435d14275d0469e35709b1a092ac91a06e8c3e98e951597966666407743789748ade2bd32ef3fef8261c299ca2de85078d8336e1488632ef09a4 +DIST fheroes2-1.1.2.tar.gz 12226373 BLAKE2B 191710016c9b32b748315a548fe6309012917d690625b968b2f30afae50507eb736ef6dab4f71c3dae9e1d14b69e93fa0ae0a7cc8770f81e6a8d09e390117a3a SHA512 31bb63f4a8a7a58894ae0f5e28bb1cae0745a5cee475aa78eded20ad8c39fe6fb23bea3596215167fe042405509b08691234ec4a51a2a8367386a88b3e664659 +EBUILD fheroes2-1.1.2-r1.ebuild 1794 BLAKE2B bd8071a8a9afee50ec2d3dae8014b0ea35eb97fc6b0176b774671927695756440247dc1c18eedc6a784eb1891e0e90617c0c8d626289a824be4c5fc6b6cd9ffc SHA512 32cd853ef45bc100105c2f2489f551ce61ca82a42e04ec4d84b4e743d3d367a2fb9ad1a0ffd4e0e96b7ce24c2a14ca29e36b199acbf2119ebfcced88b5bc4e6b MISC metadata.xml 1185 BLAKE2B 28d22394a735740a0c230888558eccb00c4ca9ec0072aabfc27d271c9a5089ea011bc167678a7c3bf81cbeeaccbc8a0fb0b2b94d80fd83b42bc8f9a654da756a SHA512 8b3033b5de642317d2624486810cd189dee8746c9e10110a5f6ae023d51a9203c226f2b41ac4d0afb1e4b29f862063f0749b5170534b17732d26dd8dbaa89625 diff --git a/games-engines/fheroes2/fheroes2-1.0.13.ebuild b/games-engines/fheroes2/fheroes2-1.1.2-r1.ebuild index c54e921e38d6..20ce7e8e3312 100644 --- a/games-engines/fheroes2/fheroes2-1.0.13.ebuild +++ b/games-engines/fheroes2/fheroes2-1.1.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake python-single-r1 xdg DESCRIPTION="Recreation of HoMM2 game engine" @@ -27,7 +27,6 @@ RDEPEND=" ${DEPEND} ${PYTHON_DEPS} app-arch/libarchive - dev-lang/python virtual/libintl " BDEPEND=" @@ -39,6 +38,12 @@ PATCHES=( "${FILESDIR}/fheroes2-1.0.4-scripts.patch" ) +src_prepare() { + sed -i -e "s/python3/${EPYTHON}/" script/homm2/extract_homm2_resources.sh || die + + cmake_src_prepare +} + src_configure() { # Not using dev-games/libsmacker because the game crashes with it local mycmakeargs=( diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest index cedbd07eb68e..474e3cd5e4d0 100644 --- a/games-engines/frotz/Manifest +++ b/games-engines/frotz/Manifest @@ -1,4 +1,4 @@ -AUX frotz-2.53-uint32.patch 11097 BLAKE2B f5690216f66c07864b0b21a8def45e202df12f7437dd29fa7576d6782cd2c08d6405130d6c48aa71865a156f7101c80a8b5abbb9dd398154811074834adf3a41 SHA512 89cbbcc7782367ecfad571652990738adda0030c2b332fb6f137c56c893f41380c97301f4a614f1aad2d7c01537a478332bfe0df5fe69019eabcc4f1260dc330 -DIST frotz-2.54.tar.bz2 354087 BLAKE2B e3a77038605333ead060ac8b9c1a7fbcbd71ae4d91eae6c7f5dda482fba6113ff32c6e4b7aef701931ed260278522bc5a2b98f61cf939b68166d6ed32e9eba16 SHA512 f608007e4eb979b928128d22d960621100c6f7042e9d8fe1bdf44137da94c1c2aa4778be0309056763185eaab2662e3604bd7396c9f5cbf98ce52db626225295 -EBUILD frotz-2.54.ebuild 1763 BLAKE2B a4e4aee2f3455cb9ee5654d8af0950c9259f6e31a2ee0624e064b830f324b9a22e05e201bc571a397c9c2ec31f3452c9d95f7f74b5e05de3357225796591635a SHA512 8ce0617d7365e91962a48adef5b303228316ab367278c027a460d6dd19af68874959a04cc5dec97551f131c6a52751efbff40f5973679f3753e13990a58ceefa +AUX frotz-stray-dollar.patch 857 BLAKE2B b2d4681f2fddc4ef836b263a5592e34255d44a8f280f3b1d93fcb0e3aa18c222545ab81364ee673ec22e23d68d93e7fbc50b8dd296dd13ebc7b3fe81e81cb5ca SHA512 7640b2e70ad5200867fba5dcac6ca3f6a338cbd4778ec933901276d3f1b5de48e3d1385ab399081924caa4e571ea58cff23fb8a67391b126edaeb0278c83e46e +DIST frotz-2.55_pre20240518.tar.bz2 361873 BLAKE2B feffedec989adfda7e949ab4997dff6496e1d9fef4b55902cd8430556587e54996872107c70a1ecc6db4bc6e29357ec101df9f8f411043cddfbf03bc46d4fe4d SHA512 b18670d6360fff48c20e8d26cb5173784ea900128a8e08d39625297aeae6eb5ea5be7fe361785b3863f25667649d935f2b9edb9d92751388bfaaa00edf678ec2 +EBUILD frotz-2.55_pre20240518.ebuild 1877 BLAKE2B 60704545990e2c027c94a37bb9212fa60ccef9e79a665373175e5f050e19cead953aefaf01e6b4d3856379ca3dd8b105e091a765e8737cc48a891e456a5c4d7c SHA512 e389a38e992c895a74fef585eb979065fbd53e4587ce95975b881dab540e0bd06da77bf59079ac5dab091d8f1092bcbb004a36d4645017dc91a623479417ccdf MISC metadata.xml 338 BLAKE2B 811899ad96ae5e5b023d3cfdf11dc19de37b336dd7903bb63ec14c83ea0c96955ec1803a9954cff560c89bfb083a8f614e61bbe199e66d053125d4642c8be2aa SHA512 b72ccc452bb2d200f0c3b5cd3e361dadc4d80b248e0c8bef50fb264c85b0e0dd04639014c3b4d3f590ebcbcdd9bfe41c61c540514a272ee7ebb406bfbb337546 diff --git a/games-engines/frotz/files/frotz-2.53-uint32.patch b/games-engines/frotz/files/frotz-2.53-uint32.patch deleted file mode 100644 index 18e7d244c272..000000000000 --- a/games-engines/frotz/files/frotz-2.53-uint32.patch +++ /dev/null @@ -1,475 +0,0 @@ -Description: Use uint32_t instead of ulong -Author: Stephen Kitt <skitt@debian.org> - -When built with hardening enabled, there’s a ulong/uint32_t definition -conflict; since the type is supposed to be uint32_t, use that -directly. - ---- a/src/sdl/sf_frotz.h -+++ b/src/sdl/sf_frotz.h -@@ -12,13 +12,13 @@ - #include "../blorb/blorb.h" - - #include <stdint.h> -+#include <sys/types.h> - typedef uint8_t byte; - typedef uint16_t word; --#define ulong uint32_t - - typedef struct { - bb_result_t bbres; -- ulong type; -+ uint32_t type; - FILE *file; - } myresource; - -@@ -54,7 +54,7 @@ - #endif - - /* this assumes RGBA with lsb = R */ --static inline ulong RGB5ToTrue(word w) -+static inline uint32_t RGB5ToTrue(word w) - { - int _r = w & 0x001F; - int _g = (w & 0x03E0) >> 5; -@@ -62,10 +62,10 @@ - _r = (_r << 3) | (_r >> 2); - _g = (_g << 3) | (_g >> 2); - _b = (_b << 3) | (_b >> 2); -- return (ulong) (_r | (_g << 8) | (_b << 16)); -+ return (uint32_t) (_r | (_g << 8) | (_b << 16)); - } - --static inline word TrueToRGB5(ulong u) -+static inline word TrueToRGB5(uint32_t u) - { - return (word) (((u >> 3) & 0x001f) | ((u >> 6) & 0x03e0) | - ((u >> 9) & 0x7c00)); -@@ -81,10 +81,10 @@ - extern int m_v6scale; - extern double m_gfxScale_w; - extern double m_gfxScale_h; --extern ulong m_defaultFore; --extern ulong m_defaultBack; --extern ulong m_colours[11]; --extern ulong m_nonStdColours[NON_STD_COLS]; -+extern uint32_t m_defaultFore; -+extern uint32_t m_defaultBack; -+extern uint32_t m_colours[11]; -+extern uint32_t m_nonStdColours[NON_STD_COLS]; - extern int m_nonStdIndex; - extern bool m_exitPause; - extern bool m_lineInput; -@@ -118,7 +118,7 @@ - int number; /* 0 means unallocated */ - int width, height; - byte *pixels; -- ulong palette[16]; -+ uint32_t palette[16]; - int palette_entries; - int transparentcolor; - bool adaptive; -@@ -190,9 +190,9 @@ - - void sf_readsettings(); - --ulong sf_GetColour(int colour); --ulong sf_GetDefaultColour(bool fore); --int sf_GetColourIndex(ulong colour); -+uint32_t sf_GetColour(int colour); -+uint32_t sf_GetDefaultColour(bool fore); -+int sf_GetColourIndex(uint32_t colour); - - void sf_initvideo(int w, int h, int full); - -@@ -221,7 +221,7 @@ - - bool sf_IsInfocomV6(void); - --ulong sf_blend(int a, ulong s, ulong d); -+uint32_t sf_blend(int a, uint32_t s, uint32_t d); - - void sf_sleep(int millisecs); - -@@ -234,8 +234,8 @@ - - int sf_pkread(FILE * f, int foffs, void **out, int *size); - --ulong *sf_savearea(int x, int y, int w, int h); --void sf_restoreareaandfree(ulong * s); -+uint32_t *sf_savearea(int x, int y, int w, int h); -+void sf_restoreareaandfree(uint32_t * s); - #define SF_NOTIMP (-9999) - - zword sf_read_key(int timeout, bool cursor, bool allowed, bool text); -@@ -243,7 +243,7 @@ - int sf_user_fdialog(bool exist, const char *def, const char *filt, - const char *title, char **res); - extern int (*sf_osdialog)(bool ex, const char *def, const char *filt, -- const char *tit, char **res, ulong * sbuf, int sbp, -+ const char *tit, char **res, uint32_t * sbuf, int sbp, - int ew, int eh, int isfull); - - void sf_checksound(void); -@@ -255,13 +255,13 @@ - - char *sf_searchfile(char *, int, char *, char *); - --void sf_chline(int x, int y, ulong c, int n); --void sf_cvline(int x, int y, ulong c, int n); -+void sf_chline(int x, int y, uint32_t c, int n); -+void sf_cvline(int x, int y, uint32_t c, int n); - bool sf_flushdisplay(void); - void sf_getclip(int *x, int *y, int *w, int *h); - void sf_rect(unsigned long color, int x, int y, int w, int h); - void sf_setclip(int x, int y, int w, int h); --void sf_wpixel(int x, int y, ulong c); -+void sf_wpixel(int x, int y, uint32_t c); - - void sf_InitProfile(const char *fn); - void sf_FinishProfile(void); ---- a/src/sdl/sf_resource.c -+++ b/src/sdl/sf_resource.c -@@ -51,10 +51,10 @@ - int m_v6scale_y; - double m_gfxScale_w = 1.0; - double m_gfxScale_h = 1.0; --ulong m_defaultFore; --ulong m_defaultBack; --ulong m_colours[11]; --ulong m_nonStdColours[NON_STD_COLS]; -+uint32_t m_defaultFore; -+uint32_t m_defaultBack; -+uint32_t m_colours[11]; -+uint32_t m_nonStdColours[NON_STD_COLS]; - int m_nonStdIndex; - bool m_exitPause = 0; - bool m_lineInput = 0; -@@ -478,7 +478,7 @@ - - - /* Get a colour */ --ulong sf_GetColour(int colour) -+uint32_t sf_GetColour(int colour) - { - /* Standard colours */ - if ((colour >= BLACK_COLOUR) && (colour <= DARKGREY_COLOUR)) -@@ -500,7 +500,7 @@ - - - /* Get a default colour */ --ulong sf_GetDefaultColour(bool fore) -+uint32_t sf_GetDefaultColour(bool fore) - { - if (m_IsInfocomV6) - return sf_GetColour(fore ? WHITE_COLOUR : BLACK_COLOUR); -@@ -509,7 +509,7 @@ - - - /* Get an index for a non-standard colour */ --int sf_GetColourIndex(ulong colour) -+int sf_GetColourIndex(uint32_t colour) - { - int i, index = -1; - /* Is this a standard colour? */ -@@ -950,7 +950,7 @@ - int sf_getresource(int num, int ispic, int method, myresource * res) - { - int st; -- ulong usage; -+ uint32_t usage; - - res->bbres.data.ptr = NULL; - res->file = NULL; -@@ -981,7 +981,7 @@ - typedef struct { - void *next; - int num, ispic; -- ulong type; -+ uint32_t type; - char *name; - } LLENTRY; - -@@ -989,7 +989,7 @@ - - static int numlocal = 0, numlocalpic = 0, numlocalsnd = 0; - static int p_ispic, p_num; --static ulong p_type; -+static uint32_t p_type; - static char *p_name; - - ---- a/src/sdl/sf_video.c -+++ b/src/sdl/sf_video.c -@@ -31,7 +31,7 @@ - - static char banner[256]; - static int isfullscreen; --static ulong *sbuffer = NULL; -+static uint32_t *sbuffer = NULL; - static int sbpitch; /* in longs */ - static int dirty = 0; - static int ewidth, eheight; -@@ -45,7 +45,7 @@ - static void sf_quitconf(); - - static bool ApplyPalette(sf_picture *); --static ulong screen_palette[16]; -+static uint32_t screen_palette[16]; - - extern z_header_t z_header; - -@@ -99,7 +99,7 @@ - } - - --void sf_wpixel(int x, int y, ulong c) -+void sf_wpixel(int x, int y, uint32_t c) - { - if (x < xmin || x >= xmax || y < ymin || y >= ymax) - return; -@@ -108,7 +108,7 @@ - } - - --ulong sf_rpixel(int x, int y) -+uint32_t sf_rpixel(int x, int y) - { - if (x < 0 || x >= ewidth || y < 0 || y >= eheight) - return 0; -@@ -116,7 +116,7 @@ - } - - #define MAXCUR 64 --static ulong savedcur[MAXCUR]; -+static uint32_t savedcur[MAXCUR]; - - static void drawthecursor(int x, int y, int onoff) - { -@@ -156,9 +156,9 @@ - } - - --void sf_chline(int x, int y, ulong c, int n) -+void sf_chline(int x, int y, uint32_t c, int n) - { -- ulong *s; -+ uint32_t *s; - if (y < ymin || y >= ymax) - return; - if (x < xmin) { -@@ -176,9 +176,9 @@ - } - - --void sf_cvline(int x, int y, ulong c, int n) -+void sf_cvline(int x, int y, uint32_t c, int n) - { -- ulong *s; -+ uint32_t *s; - if (x < xmin || x >= xmax) - return; - if (y < xmin) { -@@ -198,9 +198,9 @@ - } - - --ulong sf_blendlinear(int a, ulong s, ulong d) -+uint32_t sf_blendlinear(int a, uint32_t s, uint32_t d) - { -- ulong r; -+ uint32_t r; - r = ((s & 0xff) * a + (d & 0xff) * (256 - a)) >> 8; - s >>= 8; - d >>= 8; -@@ -234,7 +234,7 @@ - int height = ts->font->height(ts->font); - int width; - -- ulong color, bc; -+ uint32_t color, bc; - - if ((ts->style & REVERSE_STYLE) != 0) { - bc = ts->fore; -@@ -262,7 +262,7 @@ - int t = *bmp++; - if (xx < byw) { - if (t) { -- ulong sval = color; -+ uint32_t sval = color; - if (t < 255) - sval = sf_blend((int) (t + (t >> 7)), sval, sf_rpixel(x + xx, y)); - sf_wpixel(x + xx, y, sval); -@@ -292,7 +292,7 @@ - - void sf_fillrect(unsigned long color, int x, int y, int w, int h) - { -- ulong *dst; -+ uint32_t *dst; - int i; - if (x < xmin) { - w += x - xmin; -@@ -380,7 +380,7 @@ - - static void scroll(int x, int y, int w, int h, int n) - { -- ulong *src, *dst; -+ uint32_t *src, *dst; - int nmove, step; - if (n > 0) { - dst = sbuffer + x + sbpitch * y; -@@ -397,7 +397,7 @@ - return; - if (nmove > 0) { - while (nmove--) { -- memmove(dst, src, w * sizeof(ulong)); -+ memmove(dst, src, w * sizeof(uint32_t)); - dst += step; - src += step; - } -@@ -414,7 +414,7 @@ - { - if (dirty) { - SDL_UpdateTexture(texture, NULL, sbuffer, -- sbpitch * sizeof(ulong)); -+ sbpitch * sizeof(uint32_t)); - myGrefresh(); - dirty = 0; - return true; -@@ -537,7 +537,7 @@ - SDL_TEXTUREACCESS_STREAMING, W, H))) - os_fatal("Failed to create texture: %s", SDL_GetError()); - -- sbuffer = calloc(W * H, sizeof(ulong)); -+ sbuffer = calloc(W * H, sizeof(uint32_t)); - if (!sbuffer) - os_fatal("Could not create gc"); - -@@ -564,7 +564,7 @@ - int ox, oy, ow, oh; - Zwindow *winpars; - sf_picture *pic = sf_getpic(picture); -- ulong *src, *dst, sval, dval, alpha; -+ uint32_t *src, *dst, sval, dval, alpha; - - sf_flushtext(); - -@@ -572,7 +572,7 @@ - return; - if (!pic->pixels) - return; -- src = (ulong *) pic->pixels; -+ src = (uint32_t *) pic->pixels; - - x--; - y--; -@@ -673,7 +673,7 @@ - } - - --static ulong mytimeout; -+static uint32_t mytimeout; - int mouse_button; - static int numAltQ = 0; - -@@ -1238,9 +1238,9 @@ - } - - --ulong *sf_savearea(int x, int y, int w, int h) -+uint32_t *sf_savearea(int x, int y, int w, int h) - { -- ulong *r, *p, *s; -+ uint32_t *r, *p, *s; - int i; - - if (x < 0) { -@@ -1261,7 +1261,7 @@ - if (h <= 0) - return NULL; - -- r = p = malloc((w * h + 4) * sizeof(ulong)); -+ r = p = malloc((w * h + 4) * sizeof(uint32_t)); - if (!r) - return NULL; - -@@ -1272,7 +1272,7 @@ - - s = sbuffer + x + y * sbpitch; - for (i = 0; i < h; i++) { -- memmove(p, s, w * sizeof(ulong)); -+ memmove(p, s, w * sizeof(uint32_t)); - p += w; - s += sbpitch; - } -@@ -1280,9 +1280,9 @@ - } - - --void sf_restoreareaandfree(ulong * s) -+void sf_restoreareaandfree(uint32_t * s) - { -- ulong *p, *d; -+ uint32_t *p, *d; - int i, x, y, w, h; - if (!s) - return; -@@ -1295,7 +1295,7 @@ - - d = sbuffer + x + y * sbpitch; - for (i = 0; i < h; i++) { -- memmove(d, p, w * sizeof(ulong)); -+ memmove(d, p, w * sizeof(uint32_t)); - p += w; - d += sbpitch; - } -@@ -1307,7 +1307,7 @@ - - - int (*sf_osdialog)(bool ex, const char *def, const char *filt, const char *tit, -- char **res, ulong * sbuf, int sbp, int ew, int eh, -+ char **res, uint32_t * sbuf, int sbp, int ew, int eh, - int isfull) = NULL; - - -@@ -1322,7 +1322,7 @@ - } - - --void sf_videodata(ulong ** sb, int *sp, int *ew, int *eh) -+void sf_videodata(uint32_t ** sb, int *sp, int *ew, int *eh) - { - *sb = sbuffer; - *sp = sbpitch; -@@ -1367,7 +1367,7 @@ - bool changed = FALSE; - int i, colors; - -- memset(&screen_palette, 0, sizeof(ulong)); -+ memset(&screen_palette, 0, sizeof(uint32_t)); - - if (graphic->usespalette) { - colors = graphic->palette_entries; ---- a/src/sdl/sf_images.c -+++ b/src/sdl/sf_images.c -@@ -38,9 +38,9 @@ - static byte fromLinear[256]; - extern bool m_adaptiveMode; - --ulong sf_blend(int a, ulong s, ulong d) -+uint32_t sf_blend(int a, uint32_t s, uint32_t d) - { -- ulong r; -+ uint32_t r; - r = fromLinear[(toLinear[s & 0xff] * a + - toLinear[d & 0xff] * (256 - a)) >> 8]; - s >>= 8; -@@ -186,7 +186,7 @@ - if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { - graphic->palette_entries = num_palette; - for (int i = 0; i < num_palette; i++) { -- ulong color = -+ uint32_t color = - palette[i].red | (palette[i]. - green << 8) | (palette[i]. - blue << diff --git a/games-engines/frotz/files/frotz-stray-dollar.patch b/games-engines/frotz/files/frotz-stray-dollar.patch new file mode 100644 index 000000000000..9cc2a4212741 --- /dev/null +++ b/games-engines/frotz/files/frotz-stray-dollar.patch @@ -0,0 +1,26 @@ +From 7c14d1bd6c129670869db0dc6c025c68f28944a4 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Tue, 21 May 2024 22:53:33 +0100 +Subject: [PATCH] Fix stray $ that breaks the frotz filename when specifying + LDFLAGS + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8860297..35d8246 100644 +--- a/Makefile ++++ b/Makefile +@@ -394,7 +394,7 @@ DOSVER = $(shell echo $(VERSION) | sed s/\\.//g) + curses: $(FROTZ_BIN) + ncurses: $(FROTZ_BIN) + $(FROTZ_BIN): $(FROTZ_LIBS) +- $(CC) $+ -o $@$ $(LDFLAGS) $(CURSES_LDFLAGS) $(CURSES_SOUND_LDFLAGS) ++ $(CC) $+ -o $@ $(LDFLAGS) $(CURSES_LDFLAGS) $(CURSES_SOUND_LDFLAGS) + @echo "** Done building Frotz with curses interface" + @echo "** Audio support $(CURSES_SOUND) (type $(SOUND_TYPE))" + @echo "** Blorb support $(BLORB_SUPPORT)" +-- +2.45.1 + diff --git a/games-engines/frotz/frotz-2.54.ebuild b/games-engines/frotz/frotz-2.55_pre20240518.ebuild index a3ebae18235c..23013101c44c 100644 --- a/games-engines/frotz/frotz-2.54.ebuild +++ b/games-engines/frotz/frotz-2.55_pre20240518.ebuild @@ -5,10 +5,11 @@ EAPI=8 inherit toolchain-funcs +COMMIT="f96e6b33d8b13f80258af49b4bb567428870291c" DESCRIPTION="Interpreter for Z-code based text games" HOMEPAGE="https://661.org/proj/if/frotz/" -SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2" - +SRC_URI="https://gitlab.com/DavidGriffith/frotz/-/archive/${COMMIT}/frotz-master.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~riscv ~x86" @@ -39,7 +40,7 @@ RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-2.53-uint32.patch + "${FILESDIR}"/${PN}-stray-dollar.patch ) src_compile() { @@ -67,7 +68,7 @@ src_install() { DESTDIR="${D}" dodoc \ - AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \ + AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README README.md \ doc/frotz.conf-{big,small} } diff --git a/games-engines/love/Manifest b/games-engines/love/Manifest index 043184e8cc10..b58fcb6d161c 100644 --- a/games-engines/love/Manifest +++ b/games-engines/love/Manifest @@ -10,4 +10,4 @@ EBUILD love-0.8.0-r100.ebuild 1054 BLAKE2B 1751b66810c9ee03901189844df23839af973 EBUILD love-11.4.ebuild 1500 BLAKE2B 79674a4063cc2bf1692486aeda110768cbfa233b7cab04eb3c6f060257192ba87788d6a794b8b89a8d4e2f014e6fc9b482b5475daf43dd02bdd287eef800dfe3 SHA512 a945f3c057847099b8a96accec7e983b8fb074c6e068dec76e7c53b6c7dfe660c8a52c2092c9fd8b7d69a048937f74df7c651f969ed2cf1da24bcff6b606b039 EBUILD love-11.5.ebuild 1500 BLAKE2B dcc479962226e190e1fce41310a89702fc2743982e2ee3cddc53cd4d54b9c44144d3e1b78d6158deb51bb4770269476ea68ab1996ed4f357cc24a0067e06dcde SHA512 77c5f51bb7e8f7805e10aaa3e7014b3a7173f6d65d0026d1e976fde672278ab0c9ef2a15251f87c6a9d44bc9423e90e368f6259fbc57963b2ae49989bb8bb9fd EBUILD love-9999.ebuild 1436 BLAKE2B d6ef7a3ed2cc25a0bd6531618d35ec343cb2af44313cfd77a49f3350590ff2471bc77886f793b36919405c34a28213c136193d7814012ce5bce80f10b3b5f38a SHA512 7ab80aac134ef54ce3bcf047a0b23975e25ac6a1f5b6e9775a6344475b39f7286b38c9fd986ef303730fc147e8d989db745b60284942fd6df0ea5c9592244224 -MISC metadata.xml 440 BLAKE2B a7588bf48fd3a4be19465dcff8732c9b587833add1c4b65b0ca5d2e69d805ec11bec0401dac16088bda622984ae629abf0230e23e271e4d91c305797d0dc2a8c SHA512 ccc3245e1f025a0b324c2fd165489c98ae46f8cec3d0661030711541b917956595159dd927a6b955e4d504ca3471e751eeb1c4e3a2f167aa35c5c064b006c41c +MISC metadata.xml 362 BLAKE2B 422341b5e9264868638f893b9d67a337a6e84ba37d75d2b0ccd9b0a444e23249b2d9b80a1bc93fbd737311076275b11cf6a5a427587b7d6ec811dc8e6dd5a313 SHA512 07668a32cac9dcf1479d5070b94e2d1fc1cb708aaa24b73c1dfe304023b2ca58e384d6c0687debff4eefdac1a6ce310b95cc50f35b741baf226dcee2fb2ef6f1 diff --git a/games-engines/love/metadata.xml b/games-engines/love/metadata.xml index e3aef72b5ad7..f345236b7262 100644 --- a/games-engines/love/metadata.xml +++ b/games-engines/love/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">love2d/love</remote-id> </upstream> diff --git a/games-engines/minetest/Manifest b/games-engines/minetest/Manifest index 96e063604c56..979b9f3e0a8f 100644 --- a/games-engines/minetest/Manifest +++ b/games-engines/minetest/Manifest @@ -1,12 +1,13 @@ AUX minetest-5.7.0-no_upstream_optflags.patch 442 BLAKE2B a76fca23eac81d26079b9d52a10988f31547389ce892575fc9ad6353a5bb42451ca3cbacb541fe33806c80779349b91f4581121bbf295884b76e9162802a6efd SHA512 af0a6ff30670d0f05b5edcb76b7c2204b5e714f22a6aafca7106630e7a8d7ca46edf7efdcb0a4b84475fe6bdaf56c517101814d2886d4b7470a3007631026233 AUX minetest-5.8.0-include_algorithm.patch 618 BLAKE2B 8e6ef91677bbee02e251071129b0f3bdd71a1c36917f1c2c16af1324ffa7a2a39076e178992a0db48cee36254dad7e9fe6fbd40963a836750c629b2a2116371f SHA512 a2c80e631b37e4b02de059f1c821267aeb88171c937782249eec9fe844c6e66d2a687d26976acafd6f34c881c690b2a803b7ca84f8258d59e82ff2d6b1b88ac6 +AUX minetest-5.9.1-no_upstream_optflags.patch 442 BLAKE2B 1972e20bcb2be4252d804bc113f81572a4828a614710f130b61d7d8840a92bfc3c09ba62c311d61bf275ef581424ca5afb2c8c1a780b2b1c4aa76791ef6e54bb SHA512 f11f250439924da010e6bd07ca75a60870c84a61fa42ede99456be9e623c6f9aaaacdcccf3d614a5b1fc8af154123f8860c20b669bdae2e3b3405f2d91cd8800 AUX minetestserver.confd 310 BLAKE2B b5af3f5e87622fc3e1739f3972b32a3f83fa720476d7398ce55657b2e4d2dc8693748720aa422724b40a1309f79158b37ba9628061db31db3e5757a73c122205 SHA512 4905fb8446d82bdd7ccffcd6f0c2f85de9843107f10d21d73814f54587aab5f6c7716a78bc32cd82c8b7d8443f0492a3a7b5e47d10f2900349047b6ba7ceb2f3 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1 AUX minetestserver.logrotate 71 BLAKE2B 9189610adc6e78be5249163e3daa02ebcb73822bed9939df3a807ec47e753e9952b3ac7932327164ae5dcf1ef149f55fdb898b1818412b994572f8ef6b4615e4 SHA512 82de44aa5670113d6a244c7cc662e6f4001510c6766490375f226d2abd4d7749310e8a21d282408a711478bf8449ab15036d9a914657e2ca4699395d32d8b21b AUX minetestserver_default.service 371 BLAKE2B a52989d01e7df20facac1796079e38d2145e72eb43868f19ba7ea573cf025d4aea346f7ddfc5e7001d70c6d43609d877be5af95956cc344df2b5c7e318bf07f1 SHA512 dbca1a2cc4b615310ff179f4fb803e05d856e04d8316c9d30807d12788b41e8f1ef87f510ff2db0114237a8d0640c3af3d31cc77a2bd23395e247d86710606e9 AUX minetestserver_template.service 353 BLAKE2B 8f4231481a23c1ef29523533955e373b50669d6a61a818fe5c36b29be54ec21669f6c0e17ea6675795eb2630be08dcb053ae1843789d615dddb1664ec96f6c55 SHA512 ff9584b709df5f8f6a8544954da7a6ef593ac0b8bad2352a459c6eb97c684104f47708952882bf6b7216b7636328a1ff533b97bbc08cd300f1a47d2af71ac895 -DIST minetest-5.7.0.tar.gz 10115973 BLAKE2B 0f7e8864188004d57115c83508706b1cf1d6db0cba1a3002d603d4665e6d014ea2ec31df0a77a65da014467e21c331e3a27762018483a5bf4b2e024e3f7bdfc3 SHA512 6a934db5fd2c7c14fcfa87fb306662fa1ccf20a0eee056aea5c4c863986875017a4fa58ddf14319d385ee0400d00fb6a90f68b8f34527c98a746c6410360a529 DIST minetest-5.8.0.tar.gz 10419348 BLAKE2B efe3edde2d3c57cc296b5f84359c24019583e4f70346eafd418da7cbfc334ecbb32c72df085052beaa28f8f4b4219d7431c150c20d511fc41c0809cdbad227f1 SHA512 0b376ecc051032ccb542f2f76e2b1f5c351b32f1c211027825b1538095f44cb1447cd0976cb85a4cde4ecb53873bcb9f3778799271ed65b038a031dc137c2aba -EBUILD minetest-5.7.0-r2.ebuild 3999 BLAKE2B 2b7675c86b083df37e75cc086e84b67878674fcea0ce7c1276dd3b4c43d8cee6016de68372332102ff3dbe320e5498d59fe7474e39d6a948d3202e03de27927a SHA512 13df39bae8217025b66a5702fb631fe96e548ebb2d17aea11b5bdb444d9a8c7d4b369e65eda0715caa92c31e31fb3a56e7bd51cfbd1cee4ddcae461748b42225 +DIST minetest-5.9.1.tar.gz 11957091 BLAKE2B a4bffdeb8e77761fa156ba646b75c216517055031f8437fef7faeb7693d51e5356927383bdb934c30b4bf6f546b7e65ce46e517456c8d55973c64f7e94227635 SHA512 e4a03cd7f0a745f0571dd3e9701ddf48e079c59dc0bf0c59ecf756151d03a82422213e7198f359e93852b83111430e2db8c2f5f92020b3244f64e197fd51c93c EBUILD minetest-5.8.0.ebuild 4031 BLAKE2B 6450918f26db0df4c3b9bdd569491623580fe788f822f3d293c3a5ee16de3c70a232d9aa735be5d50b9402df4c5fbb4098901421f991fddf9c8b269c133009c3 SHA512 36b19f05779ab3d221bd66c96afebad7d50e08aa6cf1261c2c439f2367550e7f82c38fdae8f5e8affbb84815795a94f5d22d645069e38d38e74ee2e36d2436a5 -MISC metadata.xml 2174 BLAKE2B ad72184bd3f52d94304fb316d325478b03a5751d564174deac0eec4d05dce67f55dabc0e7c0788f9221318ac453802be552a711e35c60cce7f8396afb5fc7a9c SHA512 e3d99fa37f56133a051d8369ee5c8bc60a8e7159683cf11fba95470ff2e00acd2c3987b3d261641e2508a9f8f409e2f7249167a4226f490152ac35e58b476b1b +EBUILD minetest-5.9.1.ebuild 3967 BLAKE2B 390df96898a9939bd3fb8f161f929d1a343ad687a9f73bf4479634b3b7765f88e5cba147077e4e62877786a93208b74ce2e1b61b2597323c822c72bb1f41b7be SHA512 5765eb89c145b59f1d4c232f1cd6ec98ae4af9df8c603953771cacfc9b7076192aa876f9b2094bea81f7c0f40a6aa9c7a0bd976af37b6dacc9175803609c387b +MISC metadata.xml 2068 BLAKE2B acd96863debf4f77728c966b6ea36c703cd29599d220d84f26eba4de2812930152479cb57c09c98d7183c757186f6153bc8f5cc1eab5470ecb8db267bf0c5489 SHA512 439cb2fde5b434d791ee058cffaeea76b25fed29ab36c533b707fab97a514eb9c58864a2da16577278a26ec3b99b868e297b97d9b074f0de7cc7adbda6744948 diff --git a/games-engines/minetest/files/minetest-5.9.1-no_upstream_optflags.patch b/games-engines/minetest/files/minetest-5.9.1-no_upstream_optflags.patch new file mode 100644 index 000000000000..e386bc6b2ba3 --- /dev/null +++ b/games-engines/minetest/files/minetest-5.9.1-no_upstream_optflags.patch @@ -0,0 +1,11 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -847,7 +847,7 @@ + endif() + endif() + +- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS} -pipe -funroll-loops -O3 -fomit-frame-pointer") ++ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS}") + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" + AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" + AND CMAKE_CXX_COMPILER_VERSION MATCHES "^9\\.") diff --git a/games-engines/minetest/metadata.xml b/games-engines/minetest/metadata.xml index 2dd1e78f7815..b4652d1b483a 100644 --- a/games-engines/minetest/metadata.xml +++ b/games-engines/minetest/metadata.xml @@ -29,10 +29,6 @@ * Runs natively on Windows, Linux, OS X and FreeBSD. * Supports multiple languages, translated by the community. </longdescription> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> diff --git a/games-engines/minetest/minetest-5.7.0-r2.ebuild b/games-engines/minetest/minetest-5.9.1.ebuild index 391372f68334..ed8fd75d30ab 100644 --- a/games-engines/minetest/minetest-5.7.0-r2.ebuild +++ b/games-engines/minetest/minetest-5.9.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~riscv" -IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test" +IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial +test" REQUIRED_USE="${LUA_REQUIRED_USE} || ( client server )" @@ -31,7 +31,6 @@ RDEPEND="lua_single_target_luajit? ( ${LUA_DEPS} ) dev-libs/jsoncpp:= sys-libs/zlib client? ( - ~dev-games/irrlicht-mt-1.9.0.10 media-libs/freetype:2 media-libs/libpng:0= media-libs/libjpeg-turbo @@ -53,7 +52,6 @@ RDEPEND="lua_single_target_luajit? ( ${LUA_DEPS} ) server? ( acct-group/minetest acct-user/minetest - ~dev-games/irrlicht-mt-headers-1.9.0.10 ) spatial? ( sci-libs/libspatialindex:= )" DEPEND="${RDEPEND}" @@ -65,7 +63,7 @@ BDEPEND=" nls? ( sys-devel/gettext )" PATCHES=( - "${FILESDIR}"/${PN}-5.7.0-no_upstream_optflags.patch + "${FILESDIR}"/${PN}-5.9.1-no_upstream_optflags.patch ) src_prepare() { @@ -89,7 +87,6 @@ src_configure() { -DENABLE_CURL=$(usex curl) -DENABLE_CURSES=$(usex ncurses) -DENABLE_GETTEXT=$(usex nls) - -DENABLE_GLES=no -DENABLE_LEVELDB=$(usex leveldb) -DENABLE_LUAJIT=$(usex lua_single_target_luajit) -DENABLE_POSTGRESQL=$(usex postgres) @@ -115,6 +112,10 @@ src_compile() { fi } +src_test() { + "${S}"/bin/./minetest --run-unittests || die +} + src_install() { cmake_src_install diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest index e2046dde2b97..5b6a01bf12e6 100644 --- a/games-engines/odamex/Manifest +++ b/games-engines/odamex/Manifest @@ -1,8 +1,4 @@ AUX odamex-10.3.0-unbundle-fltk.patch 3556 BLAKE2B 8aa1fd752c465a89566edab409c2df03ce1bae7a3ae1fdf3749fbce90cef81d1315f1f677f3090d676ad514df957a043cfd02c497d03673c248d55b02ee89768 SHA512 3facbcb43f0bc516e85c6030d66fc03c2c0b11d25ed30bac1947cbffd1f3123e173c46e02b198215dc5b4aac7fccbf1bfe9aeaf54db6c0d159d7bd6d3abd3797 -AUX odamex-10.4.0-backport-pr928.patch 2485 BLAKE2B 50219598fd899548148642b97af7cf228a28f0717b44c01fd0cad724a72a7183bbd223e4d65ab22b1581fef395b4dd5142e65787eec9748865e1d46681a4dbad SHA512 6a791b4736375e0cd3158a3c65a3f2ab83b96196fd3b4510bddf80aaedac1827f8914f528bdf5e520a891423edc5cdce72675f66a6dce0e50f4c3970c744fd8d -AUX odamex-lto.patch 1570 BLAKE2B 9284ff378e543b26a9871a21017ee93c5b0b426c1b3eb813fcc23b990ea1712993cf932a6c0beedbe2a6eddc9c908533470b7334c7167a265ef3170df6f5d995 SHA512 865b136f47f07ecebb94771435d9fba2b8768ad989713492242f71720a023863e71c23561afd101ff19075d8d5df0c6e4d30851a6a6366d77620b8ea30d4785c -AUX odamex-musl.patch 2693 BLAKE2B 3bb517aeeb7bb3ba38ad83f8cfb973c171a713874ca694b821ed0267da5d796ae3ab6f4d904b8dcf3c2d844e2fe71f4ba34a3d54dcf312fc2c23c8fb54e46fc0 SHA512 80065d86fc1f671baaa920a40c787158eba68fb218f164c810e3dcbd8b601aeb1da545de3b2da8a6a47927a3f4c83a5903898f3e87d06413adda8837ccf12775 -AUX odamex-odalaunch-prefix.patch 1890 BLAKE2B 948054a8b66aacc68b000635a15c17544cf745ba87c71a89b230e76e5b316d41c929fbe792904c76ca2d474d810ac6880a99ba28bed07b04b039b0496af0d7e7 SHA512 8de4a39999af6a1e1f040d26d2c0ed4f1bc100b6c5c407fd6b75408e21cdea3b94a7052432f3e1229816ed7094ce95a7b2f2b8467a2aa8df5a1cf4ccb8c0e7f4 -DIST odamex-src-10.4.0.tar.xz 17255540 BLAKE2B bdfb357424bd1712cf763f5e6109b67910e518703e8a29fa3b071f73302beea2d3e7ed63a4e7195c367a01947ad829a78967cc77acfe3455a6e2094ca33b6590 SHA512 bea6a2e70e6bdab6a1d6b5beccf981b7570142cdabc6e54935601c5fd966e1a0e7935aa6b492185165440b31899fa6240f038a75d4741a92520e6e9be935ef7b -EBUILD odamex-10.4.0-r3.ebuild 2413 BLAKE2B e2d8367bf2814037fbcc67c36991c5fe4b9eb2ed8ec78e96510c2f36a63ffa043e14d596c0f03ef2b671499d663ab36e652c8acd6f1d28deeb37807ce5f958b2 SHA512 4beb4ffb53c5f73f468f5282f7e37a5c5cb11fc296ee11cedb4d93fd19258daf9ae21a7e4ea5d86c9895c75c7516c9ca59220aa864839a045fe7b0961802574a +DIST odamex-src-10.6.0.tar.xz 17560572 BLAKE2B eeb9742b587a7e45fa5d33ae7a96b767a4d6517732ffc82a58c68557edfd43305413667fdcc24f7256613c05421da85a81db2c5d36d7ad09b91e4b2d76fa1693 SHA512 c1269a9047199af16c64aee5d0520070cfa36c7a2488628bb19744024f13e083a6841b65f8dc18b930d3b0ef39cdebddfcf028ea44af98b4418319c364e806c0 +EBUILD odamex-10.6.0.ebuild 2303 BLAKE2B 64c65fa0fd3dea072adfdd119513b39e60619e6a6743d97bfb900530016646f8469a2020d7372c8d72ea51abf7424b47eecda5fe451f424a2172e3196afa7b24 SHA512 b7a670c1bbe4bc8ab6b22e5958567e12f328935070ef3bd27035e4e718c39a7365def360928b3424325278bfbc62516d3312564a87e17e5a824a7d1e4546546b MISC metadata.xml 1438 BLAKE2B 2cd891e631cb9ee0182c30d9aa8a9e69089f32fb12b44f8e4a62372e40db8f89a9701411dcb3bb86937d50e035452359cb95d2bbd5b4a74d2057cb77872196ad SHA512 72f2858c111b40de8ba9da3b5d52f673ce0847fd4036e1582dc9ce56432b3e08a61ef650fc253072789a6d00167c8312158d8be374dbbfbdd5473ab75cb447af diff --git a/games-engines/odamex/files/odamex-10.4.0-backport-pr928.patch b/games-engines/odamex/files/odamex-10.4.0-backport-pr928.patch deleted file mode 100644 index 7d6871847814..000000000000 --- a/games-engines/odamex/files/odamex-10.4.0-backport-pr928.patch +++ /dev/null @@ -1,66 +0,0 @@ -https://bugs.gentoo.org/849866 -https://github.com/odamex/odamex/pull/928 - -From b952137ac487a6558e1796c86d8fd55b8b3c9025 Mon Sep 17 00:00:00 2001 -From: matoro <matoro@users.noreply.github.com> -Date: Wed, 6 Dec 2023 01:01:29 -0500 -Subject: [PATCH] Fix auto-SIMD for i386+sse2, ppc+altivec - -Only Darwin ever used -faltivec, gcc uses -maltivec since at least 2007: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=30254#c1 - -Similarly, recent versions of gcc define __APPLE_ALTIVEC__ for -compatibility, so just unconditionally include altivec.h. - -Canonical way to enable specific extensions is e.g. -msse2, use that -instead of optimizing for a specific CPU. - -Finally, cmake uses target_compile_options to add arbitrary flags. -target_compile_definitions assumes you want a preprocessor definition, -which was adding "-D-faltivec" to the command line which gcc doesn't -like; this is what originally prompted this change. ---- - client/CMakeLists.txt | 11 +++++++---- - client/src/r_drawt_altivec.cpp | 2 -- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt -index 646164916..56caf04f8 100644 ---- a/client/CMakeLists.txt -+++ b/client/CMakeLists.txt -@@ -169,14 +169,17 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL) - message(STATUS "Default SIMD flags not touched for AMD64") - elseif(ODAMEX_TARGET_ARCH STREQUAL "i386") - if(NOT MSVC) -- # Pentium M has SSE2. -- target_compile_definitions(odamex PRIVATE -march=pentium-m) -+ target_compile_options(odamex PRIVATE -msse2) - else() -- target_compile_definitions(odamex PRIVATE /arch:SSE2) -+ target_compile_options(odamex PRIVATE /arch:SSE2) - endif() - message(STATUS "Default SIMD flags set to SSE2") - elseif(ODAMEX_TARGET_ARCH MATCHES "ppc") -- target_compile_definitions(odamex PRIVATE -faltivec) -+ if(APPLE) -+ target_compile_options(odamex PRIVATE -faltivec) -+ else() -+ target_compile_options(odamex PRIVATE -maltivec) -+ endif() - message(STATUS "Default SIMD flags set to AltiVec") - endif() - else() -diff --git a/client/src/r_drawt_altivec.cpp b/client/src/r_drawt_altivec.cpp -index eea758733..5a0cdf95e 100644 ---- a/client/src/r_drawt_altivec.cpp -+++ b/client/src/r_drawt_altivec.cpp -@@ -36,9 +36,7 @@ - #include "r_main.h" - #include "i_video.h" - --#if !defined(__APPLE_ALTIVEC__) - #include <altivec.h> --#endif - - #define ALTIVEC_ALIGNED(x) x __attribute__((aligned(16))) - diff --git a/games-engines/odamex/files/odamex-lto.patch b/games-engines/odamex/files/odamex-lto.patch deleted file mode 100644 index 20d9d88c002b..000000000000 --- a/games-engines/odamex/files/odamex-lto.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://github.com/odamex/odamex/pull/942 - -diff --git a/client/src/cl_parse.cpp b/client/src/cl_parse.cpp -index cdadbbdf2..e15c45edc 100644 ---- a/client/src/cl_parse.cpp -+++ b/client/src/cl_parse.cpp -@@ -2354,7 +2354,7 @@ static void CL_SectorProperties(const odaproto::svc::SectorProperties* msg) - break; - } - case SPC_Gravity: -- *(int*)§or->gravity = msg->sector().gravity(); -+ *§or->gravity = msg->sector().gravity(); - break; - case SPC_Panning: - sector->ceiling_xoffs = msg->sector().ceiling_offs().x(); -diff --git a/common/p_spec.cpp b/common/p_spec.cpp -index df1a42a6a..d0a5af419 100644 ---- a/common/p_spec.cpp -+++ b/common/p_spec.cpp -@@ -465,7 +465,7 @@ void DPusher::Serialize (FArchive &arc) - else - { - arc >> m_Type; -- arc.ReadObject((DObject*&)m_Source, DPusher::StaticType()); -+ arc.ReadObject((DObject*&)*m_Source, DPusher::StaticType()); - arc >> m_Xmag >> m_Ymag >> m_Magnitude >> m_Radius >> m_X >> m_Y >> m_Affectee; - } - } -diff --git a/odalpapi/net_io.cpp b/odalpapi/net_io.cpp -index d6dd666fe..16f136374 100644 ---- a/odalpapi/net_io.cpp -+++ b/odalpapi/net_io.cpp -@@ -194,7 +194,7 @@ void BufferedSocket::SetRemoteAddress(const string& Address, const uint16_t& Por - - m_RemoteAddress.sin_family = PF_INET; - m_RemoteAddress.sin_port = htons(Port); -- m_RemoteAddress.sin_addr.s_addr = *((unsigned long*)&(((sockaddr_in*)result->ai_addr)->sin_addr)); -+ m_RemoteAddress.sin_addr = ((sockaddr_in*)result->ai_addr)->sin_addr; - memset(m_RemoteAddress.sin_zero, '\0', sizeof m_RemoteAddress.sin_zero); - - freeaddrinfo(result); diff --git a/games-engines/odamex/files/odamex-musl.patch b/games-engines/odamex/files/odamex-musl.patch deleted file mode 100644 index bf6f2999ba49..000000000000 --- a/games-engines/odamex/files/odamex-musl.patch +++ /dev/null @@ -1,119 +0,0 @@ -From deb113e672588879697ae3343c5d3f1616d13503 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Sat, 30 Mar 2024 22:39:14 +0000 -Subject: [PATCH] Include <ctime> wherever time_t is used to fix musl - ---- - client/src/m_menu.cpp | 2 ++ - client/src/v_screenshot.cpp | 2 ++ - common/c_dispatch.cpp | 1 + - common/cmdlib.h | 1 + - common/p_user.cpp | 2 ++ - server/src/c_console.cpp | 2 ++ - server/src/sv_banlist.cpp | 1 + - server/src/sv_banlist.h | 1 + - 8 files changed, 12 insertions(+) - -diff --git a/client/src/m_menu.cpp b/client/src/m_menu.cpp -index 6268e1819..f82cbf40d 100644 ---- a/client/src/m_menu.cpp -+++ b/client/src/m_menu.cpp -@@ -25,6 +25,8 @@ - - #include "odamex.h" - -+#include <ctime> -+ - #include "gstrings.h" - #include "c_console.h" - #include "c_dispatch.h" -diff --git a/client/src/v_screenshot.cpp b/client/src/v_screenshot.cpp -index 2f24cb184..375de5b9d 100644 ---- a/client/src/v_screenshot.cpp -+++ b/client/src/v_screenshot.cpp -@@ -24,6 +24,8 @@ - - #include "odamex.h" - -+#include <ctime> -+ - #include <SDL.h> - - #include <stdlib.h> -diff --git a/common/c_dispatch.cpp b/common/c_dispatch.cpp -index 504379aad..d30dd4e24 100644 ---- a/common/c_dispatch.cpp -+++ b/common/c_dispatch.cpp -@@ -26,6 +26,7 @@ - - #include <sstream> - #include <algorithm> -+#include <ctime> - - #include "cmdlib.h" - #include "c_console.h" -diff --git a/common/cmdlib.h b/common/cmdlib.h -index c7041837b..a20be7c4c 100644 ---- a/common/cmdlib.h -+++ b/common/cmdlib.h -@@ -24,6 +24,7 @@ - #pragma once - - #include <algorithm> -+#include <ctime> - - #ifdef _MSC_VER - #pragma warning(disable : 4244) // MIPS -diff --git a/common/p_user.cpp b/common/p_user.cpp -index d9a4bb965..461a3ef03 100644 ---- a/common/p_user.cpp -+++ b/common/p_user.cpp -@@ -26,6 +26,8 @@ - - #include "odamex.h" - -+#include <ctime> -+ - #include <limits.h> - - #include "cmdlib.h" -diff --git a/server/src/c_console.cpp b/server/src/c_console.cpp -index 34fcd19d9..57d7e71e2 100644 ---- a/server/src/c_console.cpp -+++ b/server/src/c_console.cpp -@@ -24,6 +24,8 @@ - - #include "odamex.h" - -+#include <ctime> -+ - #include <stdarg.h> - - #include "m_memio.h" -diff --git a/server/src/sv_banlist.cpp b/server/src/sv_banlist.cpp -index c271fe68c..36cdf9b63 100644 ---- a/server/src/sv_banlist.cpp -+++ b/server/src/sv_banlist.cpp -@@ -24,6 +24,7 @@ - - #include "odamex.h" - -+#include <ctime> - #include <sstream> - - #include "win32inc.h" -diff --git a/server/src/sv_banlist.h b/server/src/sv_banlist.h -index 6096f73fc..f4d686071 100644 ---- a/server/src/sv_banlist.h -+++ b/server/src/sv_banlist.h -@@ -23,6 +23,7 @@ - - #pragma once - -+#include <ctime> - #include <sstream> - - #include "json/json.h" --- -2.44.0 - diff --git a/games-engines/odamex/files/odamex-odalaunch-prefix.patch b/games-engines/odamex/files/odamex-odalaunch-prefix.patch deleted file mode 100644 index cf293e60f9e1..000000000000 --- a/games-engines/odamex/files/odamex-odalaunch-prefix.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 04e38b9fcb8a71a7b0b1b5bc1c1f229f2ff7a0a8 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Mon, 18 Mar 2024 22:54:16 +0000 -Subject: [PATCH] Always define INSTALL_PREFIX to fix paths for odalaunch - -Without INSTALL_PREFIX, it was falling back to the current directory and -failing to launch the game. ---- - CMakeLists.txt | 5 +++++ - client/CMakeLists.txt | 5 ----- - server/CMakeLists.txt | 5 ----- - 3 files changed, 5 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 147060cb1..97c447424 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,6 +26,11 @@ include(GNUInstallDirs OPTIONAL) - add_definitions(-DINSTALL_BINDIR="${CMAKE_INSTALL_BINDIR}")
- add_definitions(-DINSTALL_DATADIR="${CMAKE_INSTALL_DATADIR}")
-
-+# Set up FHS installation path
-+if(NOT APPLE AND NOT WIN32)
-+ add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
-+endif()
-+
- if(WIN32)
- set(USE_INTERNAL_LIBS 1)
- else()
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt -index 56caf04f8..0559564c7 100644 ---- a/client/CMakeLists.txt -+++ b/client/CMakeLists.txt -@@ -128,11 +128,6 @@ if(APPLE) - ${AUDIOUNIT_LIBRARY}) - endif() - --# Set up FHS installation path --if(NOT APPLE AND NOT WIN32) -- add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}") --endif() -- - # Client target - if(TARGET SDL2::SDL2 OR TARGET SDL::SDL) - -diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt -index e5b54d8de..9afc6c2c6 100644 ---- a/server/CMakeLists.txt -+++ b/server/CMakeLists.txt -@@ -37,11 +37,6 @@ if(WIN32 AND NOT MSVC) - add_definitions(-DWINVER=0x0500) - endif() - --# Set up FHS installation path --if(NOT APPLE AND NOT WIN32) -- add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}") --endif() -- - add_executable(odasrv - ${COMMON_SOURCES} ${SERVER_SOURCES} ${SERVER_WIN32_SOURCES}) - odamex_target_settings(odasrv) --- -2.43.2 - diff --git a/games-engines/odamex/odamex-10.4.0-r3.ebuild b/games-engines/odamex/odamex-10.6.0.ebuild index 8b0fd3fd1b7b..4a70b03acc25 100644 --- a/games-engines/odamex/odamex-10.4.0-r3.ebuild +++ b/games-engines/odamex/odamex-10.6.0.ebuild @@ -3,7 +3,9 @@ EAPI=8 -WX_GTK_VER="3.0-gtk3" # odalaunch crashes with 3.2. Check it before updating! +# odalaunch crashes with 3.2. Check it before updating! +# https://github.com/odamex/odamex/issues/879 +WX_GTK_VER="3.0-gtk3" inherit cmake desktop prefix wxwidgets xdg DESCRIPTION="Online multiplayer free software engine for DOOM" @@ -40,10 +42,6 @@ BDEPEND="games-util/deutex" PATCHES=( "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch - "${FILESDIR}"/${PN}-10.4.0-backport-pr928.patch - "${FILESDIR}"/${PN}-odalaunch-prefix.patch - "${FILESDIR}"/${PN}-lto.patch - "${FILESDIR}"/${PN}-musl.patch ) src_prepare() { diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest index 172bc4cd512f..60b65af152a8 100644 --- a/games-engines/openmw/Manifest +++ b/games-engines/openmw/Manifest @@ -1,4 +1,4 @@ -AUX openmw-0.48.0-gcc14.patch 320 BLAKE2B b7583eaa83716191649fbae4355645c6032b7850a5f4309ae91b64342ec4598030ea1ed84a70146b04e98b780bfe9fbf66a637a036493d3e430c843726803a78 SHA512 1e1421130f0a8f973282938e521fccc3b8141d870f8ff8ba9561c4c2b1c16249623a10e35761ea0c584a07d062fb57e60d53955970f951c0641de42e5fb28a41 +AUX openmw-0.48.0-gcc14.patch 593 BLAKE2B 775f8671ad303bf7ba1c630d4f86a8f7709d712e7f26de34a199fac42621df975671649e365b4f636904e1a23884dc073397a597f5905920c0042d5f418daaf3 SHA512 d66d9b6560c40b971cfc4100723bc1d7f5c8c262607d43781b311e4caa3e4d2b4700a269a106d12d64b34900439fb7cb427e42cbfc51477a4048891f28d08d7b DIST openmw-0.48.0.tar.gz 6020423 BLAKE2B 6a6f710f06efc0e844115018365db8148e9f6acefd453df74904144f53f5e896e9ab4d4f563ab95a3231500a2c1a5e1f8c5b6d6ac5c1315805c61657d13a7aa8 SHA512 969c10b285c039b54810c56f202f9c33bd03c83d87fec722c3389525e87fc7104760ea12527be5fb19a3f7ae2dc9aef0e4c6b7375d8bbcd6eb726e1d7859b833 DIST openmw-template-8966dab24692555eec720c854fb0f73d108070cd.omwgame 139730 BLAKE2B bf7f96912fd828078c62d112f3ff83e9a35298516135fb46b15ed01fc0260247cc0cba4aa3bbc55bf6a688f216384dbd9a5aa3328c4387b9b180b80f7463963e SHA512 6e38642bcf013c5f496a9cb0bf3ec7c9553b6e86b836e7844824c5a05f556c9391167214469b6318401684b702d7569896bf743c85aee4198612b3315ba778d6 EBUILD openmw-0.48.0.ebuild 4758 BLAKE2B c97ea1f81cabe9ed01d1c721b11ba55e38519a8b52c74d0d181e6b71f8728261ae1ad93fc1057be223b795580419436ccf9f360569ed007d3400fc5ebe973c14 SHA512 ba04b94881ba2c8684e2cae83bf997bf468cbc6060c95cfe2947b95d7db01c72f0018502a8f654e2bc5ea324791608120bbdf36d25064b199fb57f3a4d8a1436 diff --git a/games-engines/openmw/files/openmw-0.48.0-gcc14.patch b/games-engines/openmw/files/openmw-0.48.0-gcc14.patch index b352d0536c8b..423aea9734af 100644 --- a/games-engines/openmw/files/openmw-0.48.0-gcc14.patch +++ b/games-engines/openmw/files/openmw-0.48.0-gcc14.patch @@ -11,3 +11,14 @@ https://bugs.gentoo.org/925105 #include <boost/filesystem/path.hpp> #include <boost/filesystem/fstream.hpp> +--- a/apps/openmw/mwstate/charactermanager.hpp ++++ b/apps/openmw/mwstate/charactermanager.hpp +@@ -1,6 +1,8 @@ + #ifndef GAME_STATE_CHARACTERMANAGER_H + #define GAME_STATE_CHARACTERMANAGER_H + ++#include <list> ++ + #include <boost/filesystem/path.hpp> + + #include "character.hpp" diff --git a/games-engines/qtads/Manifest b/games-engines/qtads/Manifest index cdcd5786e050..2a7c241874a0 100644 --- a/games-engines/qtads/Manifest +++ b/games-engines/qtads/Manifest @@ -1,3 +1,5 @@ DIST qtads-3.3.0-source.tar.xz 6085960 BLAKE2B 516d9c38c1bed36d88f60ef746f1f8b7a82db14505e640c0d3024995a74c9efb68e7783111007db6ca7a2b6adbf7e5b96b6b1e7db1c0cce6441436e1ca81381b SHA512 7e2a647fc4bb81e9784a0b05b3fdee3e6306767aebd32466f6451dc8b2e0f61e01a5657d0bfb8ba091bdd8365c9fed4fd2ab5cd2a27bf5403a5192d42472f7b2 +DIST qtads-3.4.0-source.tar.xz 6059316 BLAKE2B 0aa1bd755aed6fe60a712754d5496a464296f990f99bb7fd3cf93e20ce86881837352739f77a0fe9b630cb67fc78f91fbabf3896e8105e2b51ffa7a46be90ce6 SHA512 b4d40ec3f757803beeb7e22afa7b2ae6a612970c11615378ed145870d577e30b5734cd316c4739e4a3726917654e268034e6ecf1132ebbe1e120dc56aa9a2e3b EBUILD qtads-3.3.0-r1.ebuild 950 BLAKE2B ecc4fb7f76301bbb08a6681b1d0ab000f2959a955f6d803bf0a6133e08dcc6f6e4d8875112f3e3d206a8a08e9a05b8b916cf5d1d25430b59ae4e12b494ac0b0d SHA512 fa922b43838f847d8bdf0af8aa4e48041e285c22b19bdc8ac3f8506c637e4b3ef12c11ab75b66130cda242ece1b6a6e64dccf42ce64127c7f62d4a156f2b23a6 +EBUILD qtads-3.4.0.ebuild 950 BLAKE2B 37113ae4f319ec403fe75066fa233d7cc984d3de6d9832c50861388a8e7884bc30b6dd689f115c6e762c74947ba2fd9ccf6879a3776981e0fbc1a58dde605d98 SHA512 59ef5cada0ebacf86bf08e5f81acf6b43c9f7648a6700cb4b2026ab24b46ca0363f16dd7eebd3967f79905ceb5fbc0a9b2eba34fb5967b0263a770ee3180826c MISC metadata.xml 600 BLAKE2B 7aa1de6bd8c9c4809e7775a692a69c6e413ed3062a20f89a952859f9b1a4fec9fd86530933edd9e9977df7fba093b1623f231fe8c010dea08d8fb1b89202ff7c SHA512 4d65532cb39d2c90870fbbc1ed038c48646f90f5c5037e69aa1f5b0f965f46a37bd51621aaeebc62f8360b18dbc37e12f605e057d071b6a3313d4a446a66a2c2 diff --git a/games-engines/qtads/qtads-3.4.0.ebuild b/games-engines/qtads/qtads-3.4.0.ebuild new file mode 100644 index 000000000000..63e98570846a --- /dev/null +++ b/games-engines/qtads/qtads-3.4.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils xdg + +DESCRIPTION="Multimedia interpreter for TADS text adventures" +HOMEPAGE="https://realnc.github.io/qtads" +SRC_URI="https://github.com/realnc/qtads/releases/download/v${PV}/${P}-source.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+sound" + +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5[jpeg,png] + dev-qt/qtimageformats:5[mng] + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5[png] + sound? ( + media-libs/libsdl2[sound] + media-libs/libsndfile + media-libs/libvorbis + media-sound/fluidsynth:0= + media-sound/mpg123 + ) +" +RDEPEND="${DEPEND}" + +src_configure() { + eqmake5 \ + PREFIX="${EPREFIX}/usr" \ + DOCDIR="${EPREFIX}/usr/share/${PF}" \ + $(usev !sound CONFIG+=disable-audio) \ + -after CONFIG-=silent +} + +src_install() { + emake INSTALL_ROOT="${D}" install +} diff --git a/games-engines/scrap-engine/Manifest b/games-engines/scrap-engine/Manifest index 1d4fff9a9eba..502ee567262e 100644 --- a/games-engines/scrap-engine/Manifest +++ b/games-engines/scrap-engine/Manifest @@ -1,4 +1,4 @@ AUX scrap-engine-tests.patch 365 BLAKE2B 2e412320782d2d5b66935fed5eaceae9b4a59e6b7bd36b8cc5d29b3fa86f002efcd60c1d202f6d2486ecc92e1b06ea619291d0583747524f5afda29a1f02e724 SHA512 d66afa79eb1a433920d6285fe0819fcb87726f3d20949966651f8af8eb99d378f4ddfa022009a98b2324429ae9fef1167922dda8ffc72dc5c03131c5765778e7 DIST scrap-engine-1.2.0.gh.tar.gz 381529 BLAKE2B a482bc45900a4294be69e22308114fcdaa4a8bcaa22bce96e3436080ca7dbd2a546253ed8d1faefe2fa5c2ec57a2c6b2a63cbd7b42de39d9990968f9b34614d7 SHA512 5d1ec65eed4515e07f3c3a32f0423bcf41d7ba594508391024d22623f27d052464b5a3dc887b0ff6bea6c8f7d7fe54c30373460449b9977f0f95a9e2b1f978da -EBUILD scrap-engine-1.2.0.ebuild 916 BLAKE2B 163524439aa8160c551c1dc2939247817e8c3bf7586475d7af89436dc1bee021aa4b72d97053ba686ea5d8132965e7f87f2d9de4c0d2051adcd8e87ede62ef77 SHA512 844339bdc412cf6bafc4e5bd1defc4c759cb8ba7d049072d3f6dbfaa24b2603f943daeba8c2b571a15bfd181fc87e59cf504834c1d7409c5108b5431ece03b53 +EBUILD scrap-engine-1.2.0.ebuild 917 BLAKE2B 58727ce3f1b52719694a3a3f97df82a7cd1df6ee334c13a028b74dff1121a0454c1f45a430f9dbb320eab1b1ce95a6e8655eb5dce7a0416f7cfbdc7a901a213c SHA512 ba2c77c1cab895f0a033f5512bef7afa5bc3801544f88b4df42584c3b1640aedaca9095653e1ac0e382a1ab0976fceac1ed9b7a1e4c18e3190dbdc65e575e445 MISC metadata.xml 392 BLAKE2B cb5d6dc8dacc8ae1f02acdced4ca0a08531451779da2e4d309367657b2a91c7c8eed0fa2faba58c16bd01324132e372516829f0f2a7a9570ce1a7bc7be418612 SHA512 61909625eb2c0923c9d41faf41841e161868277af02e43d5ddae3e75c452f21ce929bbf1059d3919a5c673f5dd0da418e00148f81ce94f0c40945261ccf615bb diff --git a/games-engines/scrap-engine/scrap-engine-1.2.0.ebuild b/games-engines/scrap-engine/scrap-engine-1.2.0.ebuild index 05b7700f5b2a..0b27cf9061a1 100644 --- a/games-engines/scrap-engine/scrap-engine-1.2.0.ebuild +++ b/games-engines/scrap-engine/scrap-engine-1.2.0.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 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest index 6ead6545d409..1d3c79f761b9 100644 --- a/games-engines/scummvm-tools/Manifest +++ b/games-engines/scummvm-tools/Manifest @@ -1,10 +1,6 @@ -AUX scummvm-tools-1.8.0-binprefix.patch 539 BLAKE2B 8c3ebc7202e209552fe2521e445a8a1dd025bfa872bd78cc31f05c01b2d559f619f3f1f15dd9f26a66d192410fc5404a5b0afee636cd33603112535500d07459 SHA512 4d2f06dcc3092dd5abab218b68c83dfc2353810b56e3a1d41fab1c7eb20b008ed2e54af486c4c4f2ecbd383ef0afa6f333ed90c694ed3b1733393a6f2ef6fbe3 -AUX scummvm-tools-2.2.0-strings.patch 559 BLAKE2B 44d3c40cd57293cc589a19b7e73f737e84cbbc88ece32e8b078dbf3ada0b4a9d8cafa0a96ad2c2020803da61172ae3f8dfadc66842cb773b2192091a71a3eeb7 SHA512 60e53a68acbab3ee983471f604a691eb66344f2f4a6a30a57d268c52d00cac05083606ec062f043bcf511edb32c27fce69d95c5a17229e94dd16af98806ac701 AUX scummvm-tools-2.7.0-endianess.patch 1811 BLAKE2B 78d852504e38ba61ea4cc4c979506931c2f6fc485ca0ac608c77dab5cc179a412784f81e0922cb3685777249bb86195a334e3e1c6113f2e719c4fc37e20e2229 SHA512 81413bea78af4c95b68cc623f91a563aabfc93850b2f8ba724214a7d6f90e36e6df6383a8818ff5c1f20e46c6424dcd4051957ad7b4d4a17c015d81eb374178e -DIST scummvm-tools-2.2.0.tar.xz 712048 BLAKE2B bb5307ee25476c9b4042fa0704f8b9bbfc4a57c09670bc699c83b9d5ebb0a7b9cda55f7267aafa6ae57e3ce53993740a1523616e39cf0a2c0c7249b23208372e SHA512 97d23a94772809b6fe6dcfc4d1bde9e1a12c124cb49b0a465456adbbd56358a1612b9797abb9577dc350e1150fb4a70d4b7451e794c436c8e91692b4a83deb89 DIST scummvm-tools-2.7.0.tar.xz 1286572 BLAKE2B bcb58267a9c04849ab3145f2d5a657b9e1ec6c2bb9e59bbf47ae6aae842385e70d0417f92ca4018786cf91f8c607a5fe1246f846dc496318b01ec51bd059358b SHA512 0f6541f86814a089b10969e8e0cc8c985ac4d3b5f15daf91869a9b9cc748d7b6c668ffd428c1f0726ff9a1fb5cc7b496098481778cbf41203a7eb3077a189ce7 DIST scummvm-tools_2.7.0-1.debian.tar.xz 10212 BLAKE2B 9805222166f30d1535642958ac74984968dd19bfa3b7a159b61509215fd29d370a9393d0a25e4dfd041ee83feb9fffb55f5f705d76ac03de95d925718166c263 SHA512 f7234e58312f7979b9f87940020d9815429a24be6083e8ed61ef14c342c83edfb00f2f9d130e2a18b34099c3a20df3093556b017f28a40a1f8d8037ad8d99bed DIST scummvm-tools_512.png 56989 BLAKE2B 8173b580a542d78a4dcb859f8ba008af8f5dcd707c6213a3fc961dc5f8bbe02f3e67beafbaceff8ffb75a26d0a1c441642a103c1607b7c776b6da6c803545a47 SHA512 94d0cd2ccb7ac7ea1ca20ba208908ac05e064470f260e3347aec2aa457f1cf281c6bc88056e14001a1f93422f9cdfb732c53262d8067a4c487a57396b510fd7f -EBUILD scummvm-tools-2.2.0-r1.ebuild 1354 BLAKE2B ded211f8bf10e151b868dd7085f3b1bba3620b0439b866355ad0407d0b3025bbfa0781ad09dab10caf4e4de54b173921048e2db63f85587169351731a4f83534 SHA512 57105b4312324cf77d90e714a7b11d75209f7c319fef12a3fcbc447896e7fa285ab95418d8a9b40aa1b3af49b8a4aa7bb4ac597002f55d1eedff3b611de920c5 EBUILD scummvm-tools-2.7.0_p1.ebuild 2079 BLAKE2B 49b6ebc34cae4a7144f370f5395fa9093f9a096c5154e8950b05428f372ce743f7689536ac6010b71c3bf36c1593f82dc6cd9522b4b06db1ebde9034e18eb6c0 SHA512 d2fc261a90c69badf9f8e8a40f915fbfdff53d906d29cbeada01a88bbc9d55ae90f0d0c10c0b6d0d13326c11cd179763c6b316e3c491679a0a4fd7363adb0e4a MISC metadata.xml 438 BLAKE2B f066a8163b876d4046f62ce8d40d00de386800b255208ae987bb0291770f1977d1df1b62e800e0a22abf735bbb8b043a43280d8fb3b92475609e5f2d1bd8ebae SHA512 19add2d688494acdccc4475d917098c4e96b17da0ceba2996a53be2bf5866ee3fba5527be21b1fc5fa2f92ed777ca615d9f49945ef2cfdd2e26165ed68674e3d diff --git a/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch b/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch deleted file mode 100644 index 604db075395c..000000000000 --- a/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scummvm-tools-1.7.0.orig/Makefile.common -+++ scummvm-tools-1.7.0/Makefile.common -@@ -312,7 +312,7 @@ - install: $(TARGETS) - $(INSTALL) -p -m 0755 -d $(DESTDIR)$(BINDIR) - $(INSTALL) -p -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools -- for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR) ; done -+ for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR)/$(EXEPREFIX)$$i ; done - $(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools - $(INSTALL) -p -m 0644 $(srcdir)/gui/media/*.* $(DESTDIR)$(DATADIR)/scummvm-tools - diff --git a/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch b/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch deleted file mode 100644 index 1bd3f9f399dc..000000000000 --- a/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix build without native symlinks -https://bugs.gentoo.org/744424 - ---- a/configure -+++ b/configure -@@ -1026,9 +1026,9 @@ void _ebcdic() { char* s = (char*) ebcdi - int main() { _ascii (); _ebcdic (); return 0; } - EOF - $CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp --if strings $TMPO.o | grep BIGenDianSyS >/dev/null; then -+if ${STRINGS} $TMPO.o | grep BIGenDianSyS >/dev/null; then - _endian=big --elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then -+elif ${STRINGS} $TMPO.o | grep LiTTleEnDian >/dev/null; then - _endian=little - fi - echo $_endian; diff --git a/games-engines/scummvm-tools/scummvm-tools-2.2.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.2.0-r1.ebuild deleted file mode 100644 index a11f5da1293a..000000000000 --- a/games-engines/scummvm-tools/scummvm-tools-2.2.0-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER=3.0-gtk3 -inherit wxwidgets toolchain-funcs - -DESCRIPTION="Utilities for the SCUMM game engine" -HOMEPAGE="https://www.scummvm.org/" -SRC_URI="https://www.scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="flac iconv mad png vorbis" -RESTRICT="test" # some tests require external files - -RDEPEND=" - dev-libs/boost:= - sys-libs/zlib - x11-libs/wxGTK:${WX_GTK_VER} - flac? ( media-libs/flac:= ) - iconv? ( virtual/libiconv media-libs/freetype:2 ) - mad? ( media-libs/libmad ) - png? ( media-libs/libpng:= ) - vorbis? ( media-libs/libvorbis ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-1.8.0-binprefix.patch" - "${FILESDIR}/${PN}-2.2.0-strings.patch" -) - -src_prepare() { - default - - rm -r *.bat dists/win32 || die -} - -src_configure() { - setup-wxwidgets - tc-export CXX STRINGS - - # Not an autoconf script - ./configure \ - --disable-tremor \ - --enable-verbose-build \ - --mandir="${EPREFIX}/usr/share/man" \ - --prefix="${EPREFIX}/usr" \ - $(use_enable flac) \ - $(use_enable iconv) \ - $(use_enable iconv freetype2) \ - $(use_enable mad) \ - $(use_enable png) \ - $(use_enable vorbis) || die -} - -src_install() { - EXEPREFIX="${PN}-" default -} diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest index fa3ee2933a01..fb7f719986e1 100644 --- a/games-engines/scummvm/Manifest +++ b/games-engines/scummvm/Manifest @@ -1,6 +1,7 @@ +AUX scummvm-2.8.1-freetype-2.13.3.patch 2206 BLAKE2B 37b72d1c12dd39fb6b8df294db3000ff677c9c367e059ffa312a31ddf54ade7eccce2bf81ee3aec4460cd9a6640c52eb054da1d78a5ca78cee50da09d11108a7 SHA512 f1945f818f18f2b78451cddfa0f4c0117c4be1b7ceeb4f4955d66dbd96766294794abc8ac6b4ae64c5262744c47d9da50ac471b66e21867a3588f246b06f4066 DIST scummvm-2.8.0.tar.xz 207362400 BLAKE2B 2e0354189bfa50b5af87c9019400c114c7fd3072afeb6cee50c230d27171ae109552c855b07f027769c10f6f325dafd77c56fa17b1c5a61b11ece3c1f54efe53 SHA512 e4e728a668fe3c1b161b56ff788011673766e7429bc27bafb2b4a7f724093b719f7fd47f0995f1db5dad42ecf3ee260fe51d549f85eb2a68862b799962c34632 DIST scummvm-2.8.1.tar.xz 207711376 BLAKE2B 716503fbbd736e522918203400ccf777bc24a8e43c8c030c0e86d9c4f3c3da3f0c580269781fe030901e06854d43e2ed2f6ec9bc4e269c4d4dde8d3e08f494f2 SHA512 aef6c7b83f087cf0742dcd1f896f5706e2408e54c4c902e75f03e69f4c5475b1d33a2149246646afb96c02aa2e85ba93995dff732b3aa84338b7bc96c62b802c -EBUILD scummvm-2.8.0.ebuild 3245 BLAKE2B 39f39fb661e75e49ffc5293608e44c3266f7fa30c1fa88ced8d8926d85336d6d43daf4440fcd546a13f90d405ad5bd5128099b63f7e8566279456c3b7df33b04 SHA512 1a232aafb336991a0ce76dfc4b6629049f9bcb87ea2e28b68d252f132c95124b5d824b8a11bcbad7a2a5167a758b1b43d85bde1654ee1aa269e68cb14dc9b19b -EBUILD scummvm-2.8.1.ebuild 3245 BLAKE2B cf66a0e76a979747f3bd327a30ad8870161390999c023473704bb61e2324ddd9dce4de860b3731f6d046f56432e69bc1a60d5e832a57218c7845b3310d68002c SHA512 487a9abcc1be5d1fac5a06311512bb4dc39fe8f1d36e14fa9c9df4c9a91491f686255db987a0af43f3a2961a212523c501b19bb5f2a25c0ddefb33fae38b553f -EBUILD scummvm-9999.ebuild 3245 BLAKE2B bb8852cff25a78313889a370d50eab4c830347e3d35a069ef78a2a06d97e063cb14628dc5ff276c402f9f2cf56a36fb2409e287ff4e8940ec77214af8145327b SHA512 60d5b76d8bd5b93fdc3ba6dc5f6a189253e3560f90821f60dabce4a412c0ef534a5819bcd8f87abd740647ddbc296aa596e8ad3c281d1e8c5ad5b23aef9454c2 +EBUILD scummvm-2.8.0-r1.ebuild 3216 BLAKE2B b8c5e62c9e658a3be02d7aa5ebdf7608b5e894a7ae38e830d180c27c99bdf4a6ccda106b4485f5da2a2253d872e7cad38c29a2952d33357642ddba38ada01acb SHA512 2d1ac02a7a7dff08bba47ef29f1ea86895ae28631217fc0a0fe5542f4b85afb351974ff86d414833518fe9832840c81ab4b3b6bc86de31827fdf359b551d7d22 +EBUILD scummvm-2.8.1-r1.ebuild 3271 BLAKE2B 45015b16784c174d874ee6a325f39a473285cf0ffbe7ea61e700b0e5aec4a2b9258ff298563b88fa881af83e81f81b64ad630875fa36f42aee2b1b534ecfdaee SHA512 8e22b221a5b0efc48ae3d50f41c1d4cf30c6743e67760aef8a3fd9078251cc3106a86abb1b47749993d5db326ccbe5d3f941d664bad69e4e8f9e001bbad2e1f5 +EBUILD scummvm-9999.ebuild 3216 BLAKE2B 88679a0b85c6e056267df0c7d8c3ba3a5eefdf33af24dbd05a358e605282034dfed6a41bf15051abbb1684834caf04c88b7db5a9468bb5d4d0e2010b102c5225 SHA512 e2bdbfa0f9b7b600386283d1ea0fdaac9f9a13d3c3da2c34d24156ad47cc27e0e7a293e179d4385eba9c869dbaccdfa45e22d8bfe88d2526a96387cf6672b5a8 MISC metadata.xml 988 BLAKE2B 66ced0459606e6037ec74c63fd71605461b8910e9c9376969bf3487e8fdde8b3c7f85cdf3c054f32abd5f72bfe53de028db8d81a3c4c3da220b306f4e2a6eb27 SHA512 2b523111571ecc650a2723c3bbdd2877a33d9380cd7e67e37c556ac1e0cc26aef07ad2c04fab69f012e59c3fab6dd7d7385125e13e200683c4abd85ec1899e92 diff --git a/games-engines/scummvm/files/scummvm-2.8.1-freetype-2.13.3.patch b/games-engines/scummvm/files/scummvm-2.8.1-freetype-2.13.3.patch new file mode 100644 index 000000000000..3498c17857e0 --- /dev/null +++ b/games-engines/scummvm/files/scummvm-2.8.1-freetype-2.13.3.patch @@ -0,0 +1,59 @@ +https://bugs.gentoo.org/938014 +https://github.com/scummvm/scummvm/pull/6046 + +From 391aa847c20bae4827fd8e868267a0cf4fc72df4 Mon Sep 17 00:00:00 2001 +From: antoniou79 <a.antoniou79@gmail.com> +Date: Wed, 14 Aug 2024 22:50:32 +0300 +Subject: [PATCH] AGS: Support for FreeType 2.13.3 changes to FT_Outline struct + +FreeType 2.13.3 changed a few types of the struct members for FT_Outline struct to unsigned + +This is the relevant commit from the FreeType source (github): +https://github.com/freetype/freetype/commit/2a7bb4596f566a34fd53932af0ef53b956459d25 +--- a/engines/ags/lib/freetype-2.1.3/autohint/ahglyph.cpp ++++ b/engines/ags/lib/freetype-2.1.3/autohint/ahglyph.cpp +@@ -296,7 +296,11 @@ void ah_outline_save(AH_Outline outline, AH_Loader gloader) { + AH_Point point = outline->points; + AH_Point point_limit = point + outline->num_points; + FT_Vector *vec = gloader->current.outline.points; ++#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003 + char *tag = gloader->current.outline.tags; ++#else ++ unsigned char *tag = gloader->current.outline.tags; ++#endif + + /* we assume that the glyph loader has already been checked for storage */ + for (; point < point_limit; point++, vec++, tag++) { +@@ -408,8 +412,11 @@ FT_Error ah_outline_load(AH_Outline outline, FT_Face face) { + + /* compute Bezier flags */ + { ++#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003 + char *tag = source->tags; +- ++#else ++ unsigned char *tag = source->tags; ++#endif + for (point = points; point < point_limit; point++, tag++) { + switch (FT_CURVE_TAG(*tag)) { + case FT_CURVE_TAG_CONIC: +@@ -457,12 +464,17 @@ FT_Error ah_outline_load(AH_Outline outline, FT_Face face) { + { + AH_Point *contour = outline->contours; + AH_Point *contour_limit = contour + outline->num_contours; ++#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003 + short *end = source->contours; + short idx = 0; ++#else ++ unsigned short *end = source->contours; ++ unsigned short idx = 0; ++#endif + + for (; contour < contour_limit; contour++, end++) { + contour[0] = points + idx; +- idx = (short)(end[0] + 1); ++ idx = end[0] + 1; + } + } + + diff --git a/games-engines/scummvm/scummvm-2.8.0.ebuild b/games-engines/scummvm/scummvm-2.8.0-r1.ebuild index 4f5504d6ddf4..9adbe73bf3b8 100644 --- a/games-engines/scummvm/scummvm-2.8.0.ebuild +++ b/games-engines/scummvm/scummvm-2.8.0-r1.ebuild @@ -48,8 +48,7 @@ DEPEND=" opengl? ( || ( virtual/opengl - media-libs/mesa[gles2] - media-libs/mesa[gles1] + media-libs/libglvnd ) ) png? ( media-libs/libpng:0 ) diff --git a/games-engines/scummvm/scummvm-2.8.1.ebuild b/games-engines/scummvm/scummvm-2.8.1-r1.ebuild index 3690afa59cdb..2d7c8e7c8b65 100644 --- a/games-engines/scummvm/scummvm-2.8.1.ebuild +++ b/games-engines/scummvm/scummvm-2.8.1-r1.ebuild @@ -48,8 +48,7 @@ DEPEND=" opengl? ( || ( virtual/opengl - media-libs/mesa[gles2] - media-libs/mesa[gles1] + media-libs/libglvnd ) ) png? ( media-libs/libpng:0 ) @@ -72,6 +71,10 @@ BDEPEND=" x86? ( dev-lang/nasm ) " +PATCHES=( + "${FILESDIR}"/${P}-freetype-2.13.3.patch +) + src_prepare() { default diff --git a/games-engines/scummvm/scummvm-9999.ebuild b/games-engines/scummvm/scummvm-9999.ebuild index d678e3432dbb..826f0cc2b782 100644 --- a/games-engines/scummvm/scummvm-9999.ebuild +++ b/games-engines/scummvm/scummvm-9999.ebuild @@ -48,8 +48,7 @@ DEPEND=" opengl? ( || ( virtual/opengl - media-libs/mesa[gles2] - media-libs/mesa[gles1] + media-libs/libglvnd ) ) png? ( media-libs/libpng:0 ) diff --git a/games-engines/zoom/Manifest b/games-engines/zoom/Manifest index 2f818f9d6004..cd7ff6cdc4b0 100644 --- a/games-engines/zoom/Manifest +++ b/games-engines/zoom/Manifest @@ -1,4 +1,4 @@ AUX zoom-1.1.5-gcc7.patch 1732 BLAKE2B 3e7ce92fc7804dabdcd37db32f8dbbdccd4716b52d5266507df01cec35db40b0cafd753c32c4fb7b341c7ee784d752968f99cf06a20d067055c796b175ac5cca SHA512 8b8e130cf889efa48c737145044b23a858419d03ffc7af90fdd875e54a6e3b2f5df148d7755cd325b798445d2190db38ee193a135cae46867a3be7971e346f49 DIST zoom-1.1.5.tar.gz 2185098 BLAKE2B 899ee9afef431d2cf5a36cbb8c8c5452b8a5a24ce705ed6a5cdba5a6331e4a86fe819a9309748d1f8b7faf9e1d3267a86bc65ded8a52d17d9d2a4cdd6ab600a2 SHA512 800b29e3517ce39000d8c05148d6af0d7c8666db20a06867e35076ffa1914b845e8fa0153571975e59842672572b80826ee8dbe3b2d4bc98c07394054e9bd7ca -EBUILD zoom-1.1.5-r1.ebuild 607 BLAKE2B 3efb543a603db1a97b2e335d22c4f5fece1345f7976673e857b4370ad9a1338a0fc3ca30e4db7d43f3c66cca47cbafe8558c08306baaf1e60d63cda38a38b137 SHA512 11900603e3f720b309dc9251052789e0a3db084dd21ce47aa02e727e27ee359662b8ea422bdd0785e4aa80f790ca01ead5bd0d6ddcbd45367e75d14012eb2ea4 +EBUILD zoom-1.1.5-r2.ebuild 624 BLAKE2B f95786406d497b6f6e137b656062070400408535e34d0c29b047e997875fe7c7fe24f71d2c5ac09bb371ce4ebcebd84100a74a6d976d2ed16eec5d9e27ff9480 SHA512 727eb7090cc7029b2ec1d0c2027d3a06f1bb901a7822b70d062dbe5bd8f1b3166c1ed39798b38c7d8bb8ef544ce69a06bc9af4ad9bcc5e2a503f2f2d1e95a077 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610 diff --git a/games-engines/zoom/zoom-1.1.5-r1.ebuild b/games-engines/zoom/zoom-1.1.5-r2.ebuild index f0d98a233a0e..c9571f5e7179 100644 --- a/games-engines/zoom/zoom-1.1.5-r1.ebuild +++ b/games-engines/zoom/zoom-1.1.5-r2.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 @@ -11,7 +11,7 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND="!net-im/zoom +RDEPEND="!net-im/zoom[zoom-symlink(+)] media-libs/fontconfig media-libs/libpng:0 >=media-libs/t1lib-5 |