diff options
Diffstat (limited to 'games-util')
18 files changed, 166 insertions, 473 deletions
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz Binary files differindex dfc5015ae44a..7b3348787ed1 100644 --- a/games-util/Manifest.gz +++ b/games-util/Manifest.gz diff --git a/games-util/antimicrox/Manifest b/games-util/antimicrox/Manifest index 947c00643b51..3d72eaee5b60 100644 --- a/games-util/antimicrox/Manifest +++ b/games-util/antimicrox/Manifest @@ -1,4 +1,6 @@ AUX antimicrox-man_gz.patch 600 BLAKE2B 70f3837a4d3b2e4a5e64dd710eb710c1ea09bfdeea8a4000e976c1d3f0fcd451d0030aba22aa904308cf2aead9d1881757fd3b2fe4f703d8727ad132513bb24b SHA512 d30604d5615b00dd1b4ac03bd063a271c346ea8f13568b37c1af9f0bbdf8ad8ef8df604441b79e467742310433cc121aaee7c773cac7f3ec5e2547013fca16a8 DIST antimicrox-3.5.0.tar.gz 2312246 BLAKE2B 5385873236bcd245a87ce9081f666ca8060b2af1631d205a64ec1fac2d6a543a573f65fe01540b725e4fca9167755de4e1d03aadfef791d9e3b86892fac2f9f8 SHA512 66578a60ea485f8becb6b81bedfb3f6ea1c58ac6e2c3a9890cd64d7443ac4244bca8138f20b2ca490d0ba54c968df1995aeb79a5b9a632b85d43072b8709af4d +DIST antimicrox-3.5.1.tar.gz 2479077 BLAKE2B c86e76996a3d3b7a87c6f01d967f7807cdb2c2bab256493816f8a32a6539f44e73346a2fbc3f715fa793546e139b71201d401b355768985dd56b858dc0c63324 SHA512 c2363b7c8a33b413e5d92b0e8cf9781ab4aa27fd13850ac4374b5fe0ae2b3d6b6396d8dc3a84277cacf4a5c0c8b982d37d10a729babdd3ffca0d9e169ef34cff EBUILD antimicrox-3.5.0.ebuild 1589 BLAKE2B e1af3bb2c5bff37cde306c0f040b88270204a9a72a3d5f3c2539903fbdf618ab3ba7ca4bf3c8929fac28f69173ef85c68129bc6d8da00916f7273bd339b66fb9 SHA512 ca599f548e7e0853d268c32d283ab595b29f6e6fd8fbd1f28d5c97d2e75baf3e48c4c8db14f816afa14e28a579248f2863659a80d8646b2f38d7dcde7e92a4de +EBUILD antimicrox-3.5.1.ebuild 1627 BLAKE2B 07f6578bfe507cd61b7474fd61c061db998c863ac788b7cc57311dd64b674c6f2f3d8d7c944147cad64d83a1c52639dc83ecbd7c292dd584e0a8b7c72c0e5ad6 SHA512 11d1be516d524ff07c14453dd0859d7bf7a8325808fda3c555dbc10daa8b07eab9f1b5e2195b8a8da26d5a8ad2a4668a23721550fed0a9b493a5f3a8f9a0d048 MISC metadata.xml 412 BLAKE2B 9a75236478dfbb26649e3ab3355953ecb2d32739c0338d4fe2e8e0f4eddd0c5aa444fd13c02ff2740ef10077c56a40ab0a48d02670273ec831f24d50fae9cb83 SHA512 bcb066386dcc22038e8a9f2f42b03149dce3421ad545ebb9c7ef8df2f996970442219f40dbc82e232d7cf71ec9b421c6966b01801c46ca7a0322a8717cce4d87 diff --git a/games-util/antimicrox/antimicrox-3.5.1.ebuild b/games-util/antimicrox/antimicrox-3.5.1.ebuild new file mode 100644 index 000000000000..29210bf7c271 --- /dev/null +++ b/games-util/antimicrox/antimicrox-3.5.1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit udev xdg cmake + +DESCRIPTION="Graphical program used to map keyboard buttons and mouse controls to a gamepad" +HOMEPAGE="https://github.com/AntiMicroX/antimicrox/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/AntiMicroX/${PN}.git" +else + SRC_URI="https://github.com/AntiMicroX/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="doc" + +# Tests fail to build. +# https://github.com/AntiMicroX/antimicrox/issues/530 +RESTRICT="test" + +RDEPEND=" + dev-qt/qtbase:6[concurrent,gui,network,widgets] + media-libs/libsdl2[X,joystick] + virtual/udev + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXtst +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-qt/qttools:6[linguist] + kde-frameworks/extra-cmake-modules + doc? ( + app-text/doxygen[dot] + ) +" + +PATCHES=( "${FILESDIR}/${PN}-man_gz.patch" ) + +DOCS=( CHANGELOG.md README.md ) + +src_configure() { + local -a mycmakeargs=( + -DAPPDATA="OFF" + -DCHECK_FOR_UPDATES="OFF" + -DINSTALL_UINPUT_UDEV_RULES="OFF" # Install in "src_install". + -DUSE_QT6_BY_DEFAULT="ON" + -DWITH_TESTS="OFF" + -DWITH_UINPUT="ON" + -DWITH_X11="ON" + -DWITH_XTEST="ON" + + -DBUILD_DOCS="$(usex doc ON OFF)" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + udev_dorules "${S}/other/60-${PN}-uinput.rules" + + if use doc ; then + dodoc -r "${S}/docs"/{html,latex} + fi + + rm -r "${ED}/usr/share/doc/${PN}" || die +} + +pkg_postinst() { + udev_reload + xdg_pkg_postinst +} + +pkg_postrm() { + udev_reload + xdg_pkg_postrm +} diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest index 76778e80d2ff..8917922a89bc 100644 --- a/games-util/grfcodec/Manifest +++ b/games-util/grfcodec/Manifest @@ -1,12 +1,6 @@ -AUX 6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch 3501 BLAKE2B 2132586124cfe2232c655f5041a2ef28b46cac8e72acecd2cb9004bece074c915c0f9609455e73f2ce8d95b28c5d1ac7d4739c4264e90e1a570f33d136bd4f9d SHA512 68a7a2329dfeee4ad28562b088948ddd6457e0f6b14a63e6be376041897070c5acc756b14e158dc4631a4fb1e0197f523d8bb76272d7d39c093e49259efa700f -AUX 6.0.6_p20210310/0002-Fix-ODR-violations.patch 1722 BLAKE2B 941c2c95b7876b8b2be39e623cbff969b0609e50a3c798acd34052f0c13bf048971fe2b07885bcdc2921e66a928ce6d11c2bee71e26602116f104725acf3d04c SHA512 e73f4ee685230128489d47f3d10f296456debd3e6a85b6ccdbecb6ceb550a59cb95cbd37b2a222883b058b15aa319221e9040c4bdda4511e74c05e26a778ea50 -AUX grfcodec-6.0.6_p20230811-action-5.patch 1114 BLAKE2B c71b3e752623872b82e6a3c52df35e8ffc92400389ec1b35fa7af0e1288c5f5607600761be0bf89515248a1e9c976228a2c964bcb570d2f6afe24e87666916e6 SHA512 ac67e720c2ed37bd0db8323c7ac93315aaea03ebe528d52eba67aaaedfae2a6c53d35628da6ca1771dc50598338ac25875c380df819b072f42e6f64c7aecdabf AUX grfcodec-6.0.6_p20230811-no-fortify-source.patch 585 BLAKE2B 62b2ec66f6cfffd26bc69c1489d10b9bc568b5343d186300728e641ab1b2a54b13658045f8dc45a331792a204a71d5e6dbf5fbc84f3e1e1cec53ee165a2525b9 SHA512 1155b81eefe3e299907bdfc19d170b17e28c44b67554e71b21a501b6e84d4e889c354f3ab0b3e29ebb1210edede41d6b73c9a24e8b241dd6af419547b22bd298 AUX grfcodec-6.1.0-cmake-install.patch 493 BLAKE2B 6df0603c520b9148ef8bbddd8cb14030d8c653ddcac1834d1feed381b2e6e7d0f41965f644eb46d01557e914a09ca8d9d0158593ad7b1668c3e43365e6a18dbe SHA512 69b20eb9997dd85d8d27d4ec443d73c038dfdb91c51adcd8a6280f1fa454cf3e07f1efa532b8475df7a236bc7cdcea4816574d91119fb06d266cba242bbeaef7 -DIST grfcodec-6.0.6_p20210310.tar.gz 205795 BLAKE2B 24d803e208b2fc465ae71611c0c0fb2737bfa8c5a28375bc08a6220581d7b07bb2f2a390e2ddb7f4beb8a80951862473919d41bce83364af70b6dc646f0f3f8e SHA512 10f4ec28c69d87e397f0fb5b497dbefce8fcd826731d3a0a864cbbd333b7df188ab0087445644ad245aeff65a8b6563dfdfa657ac1a2248e56e296c01f7d58a8 -DIST grfcodec-6.0.6_p20230811.tar.gz 205324 BLAKE2B 00d36b6785d00edec061cc0f0a695225a78c487bc66c4521f0f3da1050304bc382ed78d1df8dff8602b35b167505388ad993c46f01ac39960c131a6f5c7264eb SHA512 95a883636720ad1fdd0a2e17cba60b6cde15b5fe0337cfe2330db75d60e9a2bdb1dea3c06bb8f8acace8989b6abaf6d1845b30c5bc5f6c76f34e5aa76f36ddd4 DIST grfcodec-6.1.0-source.tar.xz 170688 BLAKE2B e9ce6ca4984e319abd5c1fd53473b1257b2b98b0948b5bef5e6275e29b50243981bf7fc837b190b37b2bb12d2ac9aecbb8595150eedb029f1d7ae64053668475 SHA512 9129e0f38b151e11c90585e0fe966e042ad08ec90f800ee80f749865aed6c72c733639b8d02ecd613409f2a0ae6d1f72fa1d3524f7c450a0f06ff42ee170f16f -EBUILD grfcodec-6.0.6_p20210310-r1.ebuild 993 BLAKE2B 1cb3e7064e2f72b373c4b0dd83d8c3f16a017dddd7a3351328e8ffdddb84f70e3aba7937eb49b47230d74684240cd91873f1434b1bc18bb7c24d08dbaabcb464 SHA512 c69963730921fe1260bb24a90ea78b9b2ea6db788f057586d12eae09f6943144ae6dca2cfec5318ea13fd45b0c83984549f941224af5b0ea23fda8ddd051ff26 -EBUILD grfcodec-6.0.6_p20230811-r1.ebuild 1083 BLAKE2B 37eb930403c15423cb87ac926825b4a7deb7731d35e6c340c13c57045b0ace5e5baba21030320435776bdc8c4923bdc076783fbc60e2216a094c5e6803feab47 SHA512 2ef328d4219b951d06cde84ee03f313a3aa8955f30bd6e01d59872141ace5b1207132d063d6fe3628caf53e46ab61dcc638353b7a26c660932b4832db218ca88 -EBUILD grfcodec-6.1.0-r1.ebuild 630 BLAKE2B 94c978bbb4a11c379217f1d561da2a2d462f79290b882343500a02dd445bad1024219583f6bc4f71e136e56c74dbe5daa614fb58daea738a899eb8ebe928b57a SHA512 f24784095fd73e46a2e48a89da5088817eb08aeeb5f51356dac789d1ab674263be8d0daee3b333a4cd1a1da7badd6c4dec8b80fb83de305ba302b91c1277f8c7 +EBUILD grfcodec-6.1.0-r1.ebuild 742 BLAKE2B 6166eca4a27e5f31d83bcb14bee48547aea16baec0af515a4cae1435eea42e96e59b17715e018ff32b5b0e3d4a5696d9f8b643ae7b282037d49d1ed58308fd10 SHA512 ce43fe65c6f2e06ded532e092d698fb8902ec4cdb3560fb6468bb0544400e2c8439c8392a3056ab5bba3515662a639d258e3163f1ff33447793fd98c6ae57228 +EBUILD grfcodec-9999.ebuild 780 BLAKE2B 5b63118670cb5df9fbc1f18555efe3165697dc3846d88fc360997a71ee6b1e66ac95d269670901b5804f7a881b758d6f0ac895271cf1c489423aac07125d0273 SHA512 921829d953fa61fcdbd05a3d349544b9c9f31816c246e4399336e9a256ee7108f2fcc016adf08ce005cbbdad3eb7ae1ed1ee35442d8e8bc6116ac9ba02f729cb MISC metadata.xml 335 BLAKE2B 32e45cd9e4b4e6a0ae59d41d18ef90ca9a39389016247b71b6b1b7069a6fd1b73c92bc331d10059942aa57693a2405d90915249393e2ee9b515027f97b5fadf4 SHA512 36a58b8b3e9b793b7cc62def166dc87f24c3df029916c3226fe66f5213dcf156038a31707e81c52defbacd0a7e40fc3c5df476c93d9f1380556ac02140ef0fc2 diff --git a/games-util/grfcodec/files/6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch b/games-util/grfcodec/files/6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch deleted file mode 100644 index e702f00160ce..000000000000 --- a/games-util/grfcodec/files/6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 9e928c98c8ad0767607bc421b14ac289cdc6e536 Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Sat, 8 Oct 2022 16:29:43 +0200 -Subject: [PATCH 1/2] Remove brittle `apWrapper` code - -* This causes issues on musl, and generally doesn't make the - code any simpler, while also creating lots of opportunities - for undefined behavior. - -Bug: https://bugs.gentoo.org/715910 ---- - src/messages.cpp | 14 ++++++++++---- - src/sanity.cpp | 4 +++- - src/sanity_defines.h | 23 ----------------------- - src/strings.cpp | 9 +++++---- - 4 files changed, 18 insertions(+), 32 deletions(-) - -diff --git a/src/messages.cpp b/src/messages.cpp -index 385f217..3794f66 100644 ---- a/src/messages.cpp -+++ b/src/messages.cpp -@@ -60,8 +60,11 @@ void ManualConsoleMessages(){ - } - - string mysprintf(const char*str,...){ -- WrapAp(str); -- return myvsprintf(str,ap); -+ va_list ap; -+ va_start(ap, str); -+ string result = myvsprintf(str,ap); -+ va_end(ap); -+ return result; - } - - #if defined DEBUG || defined _DEBUG -@@ -69,8 +72,11 @@ static RenumMessageId curMessage; - #endif - - string IssueMessage(int minSan,RenumMessageId id,...){ -- WrapAp(id); -- return vIssueMessage(minSan,id,ap); -+ va_list ap; -+ va_start(ap, id); -+ string result = vIssueMessage(minSan,id,ap); -+ va_end(ap); -+ return result; - } - - string vIssueMessage(int minSan,RenumMessageId id,va_list& arg_ptr){ -diff --git a/src/sanity.cpp b/src/sanity.cpp -index 844d840..0793a63 100644 ---- a/src/sanity.cpp -+++ b/src/sanity.cpp -@@ -151,13 +151,15 @@ void Before8(int action){ - } - - bool CheckLength(int alen,int elen,RenumMessageId message,...){ -- WrapAp(message); -+ va_list ap; -+ va_start(ap, message); - if(alen<elen){ - vIssueMessage(FATAL,message,ap); - return true; - } - if(alen>elen) - vIssueMessage(WARNING2,message,ap); -+ va_end(ap); - return false; - } - -diff --git a/src/sanity_defines.h b/src/sanity_defines.h -index d094f21..47f9c5f 100644 ---- a/src/sanity_defines.h -+++ b/src/sanity_defines.h -@@ -22,7 +22,6 @@ - #ifndef _RENUM_SANITY_DEFS_H_INCLUDED_ - #define _RENUM_SANITY_DEFS_H_INCLUDED_ - --#include <cstdarg> - #include "message_mgr.h" - - bool CheckLength(int,int,RenumMessageId,...); -@@ -70,26 +69,4 @@ typedef auto_array<uint> Guintp; - type&operator[](uint x){return _p[x];}\ - type operator[](uint x)const{return _p[x];}\ - --class apWrapper{ --private: -- va_list _ap; --public: -- ~apWrapper(){va_end(_ap);} -- operator va_list&(){return _ap;} -- operator const va_list&()const{return _ap;} --#ifdef __va_copy -- va_list&operator=(va_list&ap){ -- __va_copy(_ap,ap); -- return _ap; -- } --#else -- va_list const&operator=(va_list const&ap){ -- return _ap=ap; -- } --#endif --}; --#define WrapAp(v)\ -- apWrapper ap;\ -- va_start((va_list&)ap,v); -- - #endif//_RENUM_SANITY_DEFS_H_INCLUDED_ -diff --git a/src/strings.cpp b/src/strings.cpp -index 2512734..e184825 100644 ---- a/src/strings.cpp -+++ b/src/strings.cpp -@@ -23,6 +23,7 @@ - #include<string> - #include<cerrno> - #include<cstdlib> -+#include<cstdarg> - - using namespace std; - -@@ -396,15 +397,15 @@ static const uchar stackSize[]={0,1,2,2,4,2,8}; - - string MakeStack(int items,...){ - string ret; -- WrapAp(items); -+ va_list ap; -+ va_start(ap, items); - uint item; - for(int i=0;i<items;i++){ -- item=va_arg(ap.operator va_list&(),uint); -- // ^^^^^^^^^^^^^^^^^^^ -- // gcc complains without that call. -+ item=va_arg(ap, uint); - VERIFY(item&&item<STACK_INVALID,item); - ret+=string(stackSize[item],char(item|i<<4)); - } -+ va_end(ap); - return ret; - } - --- -2.38.0 - diff --git a/games-util/grfcodec/files/6.0.6_p20210310/0002-Fix-ODR-violations.patch b/games-util/grfcodec/files/6.0.6_p20210310/0002-Fix-ODR-violations.patch deleted file mode 100644 index d76a904efd9a..000000000000 --- a/games-util/grfcodec/files/6.0.6_p20210310/0002-Fix-ODR-violations.patch +++ /dev/null @@ -1,63 +0,0 @@ -From f2e16cca87e8a324ce7ccc9cc2d82235b1e490c1 Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Sat, 8 Oct 2022 16:29:44 +0200 -Subject: [PATCH 2/2] Fix ODR violations -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* When compiling with `-flto`, ODR violations pop up: - - src/escapes.h:98:1: error: type ‘struct esc’ violates the C++ One Definition Rule [-Werror=odr] - 98 | START_ESCAPES() - | ^ - src/escapes.h:98:1: note: a different type is defined in another translation unit - 98 | START_ESCAPES() - | ^ - src/escapes.h:98:1: note: the first difference of corresponding definitions is field ‘additional’ - 98 | START_ESCAPES() - | ^ - src/escapes.h:98:1: note: a type with different number of fields is defined in another translation unit - 98 | START_ESCAPES() - | ^ - - by wrapping the `struct esc` definitions in unnamed namespaces, we can avoid running afoul of ODR. - -Bug: https://bugs.gentoo.org/859310 ---- - src/escapes.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/escapes.h b/src/escapes.h -index 91da82f..d3d2bea 100644 ---- a/src/escapes.h -+++ b/src/escapes.h -@@ -8,6 +8,7 @@ - #ifndef GRFCODEC - - #define START_ESCAPES()\ -+ namespace {\ - const struct esc{\ - char byte;\ - char*str;\ -@@ -30,6 +31,7 @@ - #else /* GRFCODEC */ - - #define START_ESCAPES()\ -+ namespace {\ - const struct esc{\ - char byte;\ - char*str;\ -@@ -59,7 +61,8 @@ - #endif /* GRFCODEC */ - - #define END_ESCAPES() };\ -- static const unsigned int num_esc=sizeof(escapes)/sizeof(escapes[0]); -+ static const unsigned int num_esc=sizeof(escapes)/sizeof(escapes[0]);\ -+ } - - #ifdef GRFCODEC - --- -2.38.0 - diff --git a/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch deleted file mode 100644 index 333c9f5ed2e9..000000000000 --- a/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch +++ /dev/null @@ -1,30 +0,0 @@ -Bug: https://bugs.gentoo.org/912189 -Upstream: https://github.com/OpenTTD/grfcodec/pull/23 - -From de32367a6896c9f310fa48929e29643beaa08af4 Mon Sep 17 00:00:00 2001 -From: Matthew Smith <matthew@gentoo.org> -Date: Sun, 13 Aug 2023 09:30:01 +0100 -Subject: [PATCH] data: Fix Action5 table - -The alternative sprite counts were added into the action 5 table, but -the counts were not updated. This caused all of the types defined after -type 0x09 to be mis-read. - -Fixes: d5a7b850bcef30c0bfd17ceeb4a18c431770f468 ---- a/src/data.cpp -+++ b/src/data.cpp -@@ -170,9 +170,9 @@ NDF_HEADER(0x04, 17), - /*06*/ OFFSET, OPTIONS(2), 0x4A, 0x5A, - /*07*/ OPTIONS(1), 0x5D, - /*08*/ OFFSET, OPTIONS(1), 0x41, --/*09*/ OFFSET, OPTIONS(1), 0x06, 0x12, -+/*09*/ OFFSET, OPTIONS(2), 0x06, 0x12, - /*0A*/ OFFSET | RECOLOUR | WORD, OPTIONS(1), W(0x100), --/*0B*/ OFFSET, OPTIONS(1), 0x71, 0x77, -+/*0B*/ OFFSET, OPTIONS(2), 0x71, 0x77, - /*0C*/ OPTIONS(1), 0x85, - /*0D*/ OPTIONS(2), 0x10, 0x12, - /*0E*/ MIXED, OPTIONS(1), 0x00, --- -2.41.0 - diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20210310-r1.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20210310-r1.ebuild deleted file mode 100644 index 90d01d7a6794..000000000000 --- a/games-util/grfcodec/grfcodec-6.0.6_p20210310-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake vcs-snapshot - -COMMIT=045774dee7cab1a618a3e0d9b39bff78a12b6efa - -DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" -HOMEPAGE="https://github.com/OpenTTD/grfcodec" -SRC_URI="https://github.com/OpenTTD/grfcodec/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -RDEPEND="media-libs/libpng:=" -DEPEND="${RDEPEND} - dev-libs/boost" - -PATCHES=( "${FILESDIR}"/${PV} ) - -src_configure() { - local mycmakeargs=( - # Make sure we don't use git by accident. - # Build system does not care much if it's - # executed successfully and populates - # YEARS / VERSION with empty values. - -DGIT_EXECUTABLE=/bin/do-not-use-git-executable - ) - - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum} - doman docs/*.1 - dodoc changelog.txt docs/*.txt -} diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild deleted file mode 100644 index 600aa5d3e4a8..000000000000 --- a/games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake vcs-snapshot - -COMMIT=d5a7b850bcef30c0bfd17ceeb4a18c431770f468 - -DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" -HOMEPAGE="https://github.com/OpenTTD/grfcodec" -SRC_URI="https://github.com/OpenTTD/grfcodec/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -RDEPEND="media-libs/libpng:=" -DEPEND="${RDEPEND} - dev-libs/boost" - -PATCHES=( - # Bug #894648 - "${FILESDIR}"/${P}-no-fortify-source.patch - - # Bug #912189 - "${FILESDIR}"/${P}-action-5.patch -) - -src_configure() { - local mycmakeargs=( - # Make sure we don't use git by accident. - # Build system does not care much if it's - # executed successfully and populates - # YEARS / VERSION with empty values. - -DGIT_EXECUTABLE=/bin/do-not-use-git-executable - ) - - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum} - doman docs/*.1 - dodoc changelog.txt docs/*.txt -} diff --git a/games-util/grfcodec/grfcodec-6.1.0-r1.ebuild b/games-util/grfcodec/grfcodec-6.1.0-r1.ebuild index ce2b664d42de..a84ac889ed7d 100644 --- a/games-util/grfcodec/grfcodec-6.1.0-r1.ebuild +++ b/games-util/grfcodec/grfcodec-6.1.0-r1.ebuild @@ -1,21 +1,30 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit cmake -DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" +DESCRIPTION="Suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" HOMEPAGE="https://github.com/OpenTTD/grfcodec" -SRC_URI="https://github.com/OpenTTD/grfcodec/releases/download/${PV}/${P}-source.tar.xz" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/OpenTTD/grfcodec" + inherit git-r3 +else + SRC_URI="https://github.com/OpenTTD/grfcodec/releases/download/${PV}/${P}-source.tar.xz" + + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +fi LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" RDEPEND="media-libs/libpng:=" -DEPEND="${RDEPEND} - dev-libs/boost" +DEPEND=" + ${RDEPEND} + dev-libs/boost +" PATCHES=( "${FILESDIR}"/${PN}-6.1.0-cmake-install.patch diff --git a/games-util/grfcodec/grfcodec-9999.ebuild b/games-util/grfcodec/grfcodec-9999.ebuild new file mode 100644 index 000000000000..fec48e34967f --- /dev/null +++ b/games-util/grfcodec/grfcodec-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" +HOMEPAGE="https://github.com/OpenTTD/grfcodec" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/OpenTTD/grfcodec" + inherit git-r3 +else + SRC_URI="https://github.com/OpenTTD/grfcodec/releases/download/${PV}/${P}-source.tar.xz" + + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND="media-libs/libpng:=" +DEPEND=" + ${RDEPEND} + dev-libs/boost +" + +PATCHES=( + # Bug #894648 + "${FILESDIR}"/${PN}-6.0.6_p20230811-no-fortify-source.patch +) + +src_install() { + cmake_src_install + + rm "${ED}"/usr/share/doc/${PF}/COPYING || die +} diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest index e2c0342066ad..a018a2e1cff0 100644 --- a/games-util/nml/Manifest +++ b/games-util/nml/Manifest @@ -1,8 +1,5 @@ AUX nml-0.7.5-regex-py313.patch 566 BLAKE2B fa515bd2ac16b10ed10b61453fd1ee1e38f741314c4c3db82adc7656fbf57da9d5a01624313c12a016026ab9153d27e5b1beabbd185473e94f4db8e5374f0d3e SHA512 64a2b0bc7e4a057f896b41474a34d3f6df8d36abca6eaf20458cd46a14a0e48ef20d20881236fd358c618fbefeca1932d530f6229265b0e379d0c3238cee29d3 -DIST nml-0.7.1.tar.gz 562101 BLAKE2B 3c29bde63048ea276d868df8aa3e13c4f1d3949c1e2c4a973e6f5f5bff7a6e57ce5c56d6605f44d91602209967cbe732f7f9031b471de3104d6c04a41582541f SHA512 a123680f89243f29ad88f2c0bc50fe7c801bd70d7cd49d71d3e5d199b1f4042e4143b71340aea3c47d938f838647016cebc0b56e39ede627497139755c9b829e -DIST nml-0.7.4.tar.gz 569348 BLAKE2B 620f6100627d7c1cd67bbf481c96abb8be4574e0ec70cf529502980c9d8aca3660f1469fbdce99d5736d21287053b6c199a5a390f56f3704d7ceb16e6ba6582e SHA512 78a0961db3a56684fbc999f69bc5e02b9f002ba7b7a2afd39c7d4c9695b3306339ee55c4b9d711d85ca7c4c0e4d53abc71c9e0720904d44a0c388a793a28fc4b DIST nml-0.7.5.tar.gz 578976 BLAKE2B 630afc4b532a76ff7dea84b231636cbf8fa50197e43c11eaa1fdaa80b2acadb61d35dc07119f57417d7cdae88d39d516f52bac49aa56fa3177e287ab11bd07b2 SHA512 6c92ce5124e2c4bc641ff8c14a2e88e2576ef06dccce8fb5ffee1b1dbcee2b9640fa51410bfb7aa6b800b00274020b38161617aa41712d4d358612493ea8fe26 -EBUILD nml-0.7.1.ebuild 729 BLAKE2B 37347f335b5e23c6be93eab68aba73b23f2c97615f14e1660af38818fa96f335edf232058e9a3b0d8e60fea853f9911738daff4015f294b8d7bbf2081ba178d4 SHA512 806b43f83de1c0623baf34031dcb76956f874e4e3f3a9d700e566dba484251640c51ff6c3cf952607c9e5daf6365f3874dd2487badcd37040e4d3206ca670f70 -EBUILD nml-0.7.4.ebuild 921 BLAKE2B d2203e5c78bf8d31fa16bea92aab496a4dfbbaed7401a57371e624fc63646720f422423325ca027390974a11fdb819b5a792de39d3e7bf2937f848bd04db185d SHA512 b4a678194f78f0de4fe95a2da36c6c7a16cb542ea805baacb8f4b96cd9ec4250d137dd8ba6609794b83428c3b2dfbaa6ccedd4ab32c8e42efd2fd261e5774a12 -EBUILD nml-0.7.5.ebuild 980 BLAKE2B e411af31055111c4583273997857bb12f14da298cc1904ca5116dad471dea83228835eed0c2eededd2a567dc21962451faa2498fd4a7b601a4cc58d2e9cf1397 SHA512 3850e277e8ef62e2b8291182b3665b2a8f5ccdf4d89da32e4c6cd3298363119611a0deb09a0edf11a358c225aa652f41bcfc294bee74a6188720137221f71615 +EBUILD nml-0.7.5.ebuild 1085 BLAKE2B 8d58a91b7149fdeab7e1bfd9c6febb0cb38aa6eccdbd1bf965fb2f4c990ec1d930f70a79fe4cc1c68aff36d45437216dde93f8bf46481db019b2e4dd593bad51 SHA512 76c515c1e9f6740edf6d2d7f803e739e8831605e6e3d44d394cfb1caaef10e5817b58b1979e2a77820a9ac5d6575f389cce925c4800b6182fba7e3d594bdb45f +EBUILD nml-9999.ebuild 999 BLAKE2B d6c1dcc834211e0f03bafa148adafb953e639c23cbdc9d875eea03c81486d66c6809ca63d01a4bf7bf245407fa3ef379e66d1c09da90e3e7d295750f6ac95300 SHA512 7cec205c6c105105c2942d22da7f70c0222f944b529dffcb585ae37d37f012916aa879dfc0ecf2648dc972f9e20d4682c62c044358c8c82f3faeb930984bac62 MISC metadata.xml 330 BLAKE2B 81477cebc8e9113ac32bce37688a891827538b302fc8ffd29f551440d488b8b55e7ec0f0e45a2476f3e156ebb02a80f44c413a44a9a03de82c0ab994831cb57e SHA512 bc2460a21cc905ebbec7ad13f803bb239616b4da8100c0c1bd939f7be3d1efe9560010af271e382d08caa632382547220aa249f40212c2966ffce5dc7713d632 diff --git a/games-util/nml/nml-0.7.1.ebuild b/games-util/nml/nml-0.7.1.ebuild deleted file mode 100644 index f4ed77cc0974..000000000000 --- a/games-util/nml/nml-0.7.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="Compiler of NML files into GRF/NFO files" -HOMEPAGE="https://github.com/OpenTTD/nml/" -SRC_URI="https://github.com/OpenTTD/nml/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_USEDEP},zlib] - dev-python/ply[${PYTHON_USEDEP}] - ') -" - -python_test() { - emake regression -} - -src_install() { - local DOCS=( README.md docs/changelog.txt ) - distutils-r1_src_install - - doman docs/nmlc.1 -} diff --git a/games-util/nml/nml-0.7.5.ebuild b/games-util/nml/nml-0.7.5.ebuild index 6754dea0b4c2..83230f125d58 100644 --- a/games-util/nml/nml-0.7.5.ebuild +++ b/games-util/nml/nml-0.7.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,11 +11,17 @@ inherit distutils-r1 DESCRIPTION="Compiler of NML files into GRF/NFO files" HOMEPAGE="https://github.com/OpenTTD/nml/" -SRC_URI="https://github.com/OpenTTD/nml/releases/download/${PV}/${P}.tar.gz" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/OpenTTD/nml" + inherit git-r3 +else + SRC_URI="https://github.com/OpenTTD/nml/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" RDEPEND=" $(python_gen_cond_dep ' diff --git a/games-util/nml/nml-0.7.4.ebuild b/games-util/nml/nml-9999.ebuild index 103717df9f3b..7003f3d9bf97 100644 --- a/games-util/nml/nml-0.7.4.ebuild +++ b/games-util/nml/nml-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,16 +6,22 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 DESCRIPTION="Compiler of NML files into GRF/NFO files" HOMEPAGE="https://github.com/OpenTTD/nml/" -SRC_URI="https://github.com/OpenTTD/nml/releases/download/${PV}/${P}.tar.gz" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/OpenTTD/nml" + inherit git-r3 +else + SRC_URI="https://github.com/OpenTTD/nml/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" RDEPEND=" $(python_gen_cond_dep ' @@ -24,10 +30,6 @@ RDEPEND=" ') " -src_prepare() { - default -} - python_test() { # the tests involving sprites seem to fail when running in the ebuild, # unless --no-cache is passed. diff --git a/games-util/xpadneo/Manifest b/games-util/xpadneo/Manifest index 4818be3b9997..352f3c2c3fc4 100644 --- a/games-util/xpadneo/Manifest +++ b/games-util/xpadneo/Manifest @@ -1,7 +1,4 @@ -AUX xpadneo-0.9.6-kernel-6.12.patch 754 BLAKE2B 061ae8fd13b11aee70138ce46848cf3c58c5167e115d81fd1b58af37c8f9448678b3a9853893c7f4b957635204438419da45ba88a473d097163c6689b5bc6f49 SHA512 605f1f60ddb250079c5411ffc8c7269ee88ba347ff6e3ad2e31d13ab2ae89c0e96a1a5c408a64e9e9d640fc4692cbc6ccc8b2880f368e13a503239e00c205e2c -DIST xpadneo-0.9.6.tar.gz 1344171 BLAKE2B 22a85732de2894d310e0994c101ed62b7358f1b6b8ba5b389fc273bfd48a1ce619ebc04f3699818290f61833234d4c444fff25ea852d9dcf420b99ab28687a03 SHA512 f423fb89cf911c727917591d79909acaecc9fdb68ca10c5cc2a128bd66174799f3efb2b9a87e43bb315ab92ddb7513f79300f06d347fabc9de11e63fc1d25689 DIST xpadneo-0.9.7.tar.gz 1348791 BLAKE2B 6715e684d046ad3162db65196896d23f0c70046d02adbf5886d849818120fb731acb86da0a9e18e54b56b31220911ea25c296f1b8473eb0f0fca4fe96b98712b SHA512 c5a3438fef6215f3dd733099f8d5fc86b55b092f3d808969040eb38b29c4fd786f5d3ee547cfc403e6f2c0af90106f91c4d4cf3954295f2e5b11e12949ca3069 -EBUILD xpadneo-0.9.6.ebuild 1272 BLAKE2B 16b2cbf209b8f8b481ec6a1698aea9bb4ab63f5bd5467d55314ede0637021ace0527fb5406363404a0b31dae74ce3ca8b6f1fb13afbb9efb970ff61a35fe72be SHA512 ec7093cac6f1de8e23e2770d85e32c72e43aa381ee8d91a8de7acf7016e3063cea4a09d182f9d929232bf7c795dda9472d5d235295b90921fc494c57cc3e285d EBUILD xpadneo-0.9.7.ebuild 1214 BLAKE2B 578760566fa80e6f16d298832aadc9cfff3d1fc347fb466ed58b294cabb940666e642493fadcc639c7c44b05174f574e27ca2f26b3b6cd445616b33b47397b0e SHA512 66f374aaa79871451bfe406c6afe3cd97e6feaadd72fb7d7d23d2f50d761807f91b400b80cc26f685470e870ced18fa7acfff4823be02271a4e86c158b1ef814 EBUILD xpadneo-9999.ebuild 1164 BLAKE2B 512704055ba034ea30c26fe4954608f14fb72a78ba86e3445f39e2999e6c679e445c49f5bca83e22b20f15329ceaba77325bd5485d48b408f3cc0de04b6f65dd SHA512 b2bdb6e320e53f801d713a59ea87eb7ab62b2bb4a92ac984acd746abd8afa34dd79428c2c072806a7284dbb5743de41a3ace7de7ed51a814afd6d8a04d9676e2 MISC metadata.xml 328 BLAKE2B 6511430d43b855d83d42dc94ea83bf20867568e9dbf642240ac279179d9f26d0a315f3fb90bebd4a564d4bc63beefcb8aa24af7acf25a60f9b25f732265de41b SHA512 defbfc601b6b61d10edf8947e2251f96416787a1141fccff1e017a6110eb4d8e8801fcd72cc678f816064eb5a5dc796c9c895ca9f74ad288f1338ccaaf3ee5c8 diff --git a/games-util/xpadneo/files/xpadneo-0.9.6-kernel-6.12.patch b/games-util/xpadneo/files/xpadneo-0.9.6-kernel-6.12.patch deleted file mode 100644 index 9e5115345111..000000000000 --- a/games-util/xpadneo/files/xpadneo-0.9.6-kernel-6.12.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/943776 -https://github.com/atar-axis/xpadneo/issues/498 -https://github.com/atar-axis/xpadneo/commit/4bfe0a1c35 -(+ include required linux/version.h from 242e9b46bb) ---- a/hid-xpadneo/src/hid-xpadneo.c -+++ b/hid-xpadneo/src/hid-xpadneo.c -@@ -713,5 +713,9 @@ - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,12,0) - static u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize) -+#else -+static const u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize) -+#endif - { - struct xpadneo_devdata *xdata = hid_get_drvdata(hdev); ---- a/hid-xpadneo/src/xpadneo.h -+++ b/hid-xpadneo/src/xpadneo.h -@@ -13,4 +13,5 @@ - - #include <linux/hid.h> -+#include <linux/version.h> - - #include "hid-ids.h" diff --git a/games-util/xpadneo/xpadneo-0.9.6.ebuild b/games-util/xpadneo/xpadneo-0.9.6.ebuild deleted file mode 100644 index 02e62e777f88..000000000000 --- a/games-util/xpadneo/xpadneo-0.9.6.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-mod-r1 udev - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/atar-axis/xpadneo.git" - EGIT_MIN_CLONE_TYPE="single" -else - SRC_URI="https://github.com/atar-axis/xpadneo/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~x86" -fi - -DESCRIPTION="Advanced Linux Driver for Xbox One Wireless Controller" -HOMEPAGE="https://atar-axis.github.io/xpadneo/" - -LICENSE="GPL-3" -SLOT="0" - -CONFIG_CHECK="INPUT_FF_MEMLESS" - -PATCHES=( - "${FILESDIR}"/${P}-kernel-6.12.patch -) - -src_compile() { - local modlist=( hid-${PN}=kernel/drivers/hid:hid-${PN}:hid-${PN}/src ) - local modargs=( KERNEL_SOURCE_DIR="${KV_OUT_DIR}" ) - - linux-mod-r1_src_compile -} - -src_install() { - local DOCS=( docs/{[^i]*.md,descriptors,reports} NEWS.md ) - linux-mod-r1_src_install - - insinto /etc/modprobe.d - doins hid-${PN}/etc-modprobe.d/${PN}.conf - - udev_dorules hid-${PN}/etc-udev-rules.d/60-${PN}.rules -} - -pkg_postinst() { - linux-mod-r1_pkg_postinst - udev_reload - - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog "To pair the gamepad and view module options, see documentation in:" - elog " ${EROOT}/usr/share/doc/${PF}/" - fi -} - -pkg_postrm() { - udev_reload -} |