diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-09-15 10:49:51 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-15 10:49:51 +0100 |
| commit | ea3e1bbf643d1d8892f4df05e4f05c1b2a2125d8 (patch) | |
| tree | 60dac1902fc2665fd22fc2e4e4a60186cc7e361b /games-emulation/melonds-jg | |
| parent | efca79f216bfeffd55e7731fbf24126d093e1084 (diff) | |
gentoo auto-resync : 15:09:2023 - 10:49:51
Diffstat (limited to 'games-emulation/melonds-jg')
3 files changed, 41 insertions, 1 deletions
diff --git a/games-emulation/melonds-jg/Manifest b/games-emulation/melonds-jg/Manifest index 8e06fb116ec9..97258cba273d 100644 --- a/games-emulation/melonds-jg/Manifest +++ b/games-emulation/melonds-jg/Manifest @@ -1,5 +1,6 @@ AUX melonds-jg-0.9.5-format.patch 1078 BLAKE2B 00f471df8b8c6e622684cc4c3e925be1721cabd1dfa302e942a6f7f692aa842ccba5f5c13beb47bc184eee766a0dc71a8bfe1358e5f11cbedff36b9653b022a8 SHA512 1d72dc2d335ed68a894aaf686eaa7578d1332e647b3d65ab56b34dc90bc4d4c979a1c4a46d00759ba15ccfd88911f5cbc884c19a27c7f299af4bd94236018c5b +AUX melonds-jg-0.9.5-teakra-no-test_generator.patch 1692 BLAKE2B 87ca4fef1e64501bee7d10d7095262b7eac6085a2c33a34401debd226b2a383aa7066129288df75758e71faedcde14e391206114725fec73e26465b38c77022b SHA512 301ccf85f735f21fe007c113b71680a208ac5680b928fc542d5ff8d85a66dc64f15369b915c14441042bd6dd3d46cf97ce6271f4d17f4176ea1432c627efa67d DIST melonds-0.9.5.tar.bz2 5396317 BLAKE2B 4f834c1037b0a1f2e6acdc52bc0b974107343485cdfeff35d16520afb46895abec3046fa9c91c53b6c02855b19af39a64bfc98722887e5090eb0b051ae0d106b SHA512 11a0a71b20e516f426f6fa6dbb46418c5afdd34997d2943a91149f527ca81c7c9a76db8460439e7593e245df92799a69a76dc426eea14a01383ce0a8c1a4b473 -EBUILD melonds-jg-0.9.5.ebuild 1042 BLAKE2B b22acf6fb266f4a6d0f6d767be26665447aef139d36fff7cfc3b5b26d7d8891c5192a1c935b82a656ace716ee277f4bd5fa2ac13db3b993d713374b669dc2cb8 SHA512 4c4a3aea07838debf7c09de2d29cd243496cad5dc8369a6455dca78fce6650a4ecd0f37226c86c03b8afc3ed60c97746b124c4727ccf4e892df5c8178674d6f3 +EBUILD melonds-jg-0.9.5.ebuild 1102 BLAKE2B 88eb1d3057aa998cd068b27d677bdb6b2f8e8c872d5d1ac31f70a1dc83272e1927ebceda7f40b14f3fabd8c93882ef64f78b590f9e6793c0642566715fdb28e1 SHA512 ad06eb850e78d835622337ca93831c50a52cf1b20f055ed271040e7e002c1046ea00206a6fd569466fb9be0546350d86c15056e7d7e702c436c063f72f3b74ca EBUILD melonds-jg-9999.ebuild 984 BLAKE2B 3d4412792e177b4265bb37f4bdab7f8b8f45843dbd11af306dc4fc0941bc98220151a771ee0be806d1c3fdf9465dc512c40a5ac6dc6cc5a9fab8a3ca5ec796c1 SHA512 29c4899b8b4e5720fa69e74497bd27de50c3053864bdbb5bcfbb9cccedd1fae6efe58fcab4d808379476fe303a84c04910e4985a6504a307d7bc8415b7000062 MISC metadata.xml 684 BLAKE2B 05ae692b17183419eb6fa4dfea12b474da812062f69bcedd5a19074e5ff4c9423453081b6ba311b49344120fd1248c96bcefa45d9a1eb8c5004932365d7cc87d SHA512 f70aba91228dabcad4b9d299513277bdad7ddc398bd97334a76699940ff05bd424b7116cd9ed265bfa5ad4a97fa9572e04da37936a680b5e3bf9b161e38bc6fe diff --git a/games-emulation/melonds-jg/files/melonds-jg-0.9.5-teakra-no-test_generator.patch b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-teakra-no-test_generator.patch new file mode 100644 index 000000000000..a482e93a52fe --- /dev/null +++ b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-teakra-no-test_generator.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/914196 +https://gitlab.com/jgemu/melonds/-/merge_requests/9 +https://gitlab.com/jgemu/melonds/-/commit/0953b8874187bfdd35a0bf787c3bdbb6cc65dc9d + +From 0953b8874187bfdd35a0bf787c3bdbb6cc65dc9d Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Thu, 14 Sep 2023 09:58:18 -0700 +Subject: [PATCH] jollygood: don't build teakra's test_generator.cpp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is unused in the jollygood core and causes build failures for i686. + +As reproduced on Gentoo: + +In file included from /usr/i686-pc-linux-musl/tmp/portage/games-emulation/melonds-jg-0.9.5/work/melonds-0.9.5/jollygood/../src/teakra/src/test_generator.cpp:10: +/usr/i686-pc-linux-musl/tmp/portage/games-emulation/melonds-jg-0.9.5/work/melonds-0.9.5/jollygood/../src/teakra/src/test.h:37:32: error: static assertion failed + 37 | static_assert(sizeof(TestCase) == 4312); + | ~~~~~~~~~~~~~~~~~^~~~~~~ +/usr/i686-pc-linux-musl/tmp/portage/games-emulation/melonds-jg-0.9.5/work/melonds-0.9.5/jollygood/../src/teakra/src/test.h:37:32: note: the comparison reduces to ‘(4308 == 4312)’ +make: *** [Makefile:169: objs/src/teakra/src/test_generator.o] Error 1 +--- + jollygood/Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/jollygood/Makefile b/jollygood/Makefile +index 03f34a1..c206f05 100644 +--- a/jollygood/Makefile ++++ b/jollygood/Makefile +@@ -68,7 +68,6 @@ CXXSRCS := src/teakra/src/ahbm.cpp \ + src/teakra/src/parser.cpp \ + src/teakra/src/processor.cpp \ + src/teakra/src/teakra.cpp \ +- src/teakra/src/test_generator.cpp \ + src/teakra/src/timer.cpp \ + src/ARCodeFile.cpp \ + src/AREngine.cpp \ diff --git a/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild b/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild index 56734daea220..b7c9f13cf065 100644 --- a/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild +++ b/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild @@ -35,6 +35,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-format.patch + "${FILESDIR}"/${P}-teakra-no-test_generator.patch # 914196 ) src_compile() { |