diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-11-12 10:27:43 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-12 10:27:43 +0000 |
| commit | f1535b44d6fda761018ea432a180dcb482e97652 (patch) | |
| tree | 0c17b546154f9b91340a45d84b5dc42dc12c7713 /games-emulation/melonds-jg | |
| parent | cdc1eda9c1ad611dd737415be2790c8f44812f1c (diff) | |
gentoo auto-resync : 12:11:2023 - 10:27:42
Diffstat (limited to 'games-emulation/melonds-jg')
| -rw-r--r-- | games-emulation/melonds-jg/Manifest | 3 | ||||
| -rw-r--r-- | games-emulation/melonds-jg/files/melonds-jg-0.9.5-gcc14.patch | 29 | ||||
| -rw-r--r-- | games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild | 1 |
3 files changed, 32 insertions, 1 deletions
diff --git a/games-emulation/melonds-jg/Manifest b/games-emulation/melonds-jg/Manifest index d914d2949ab5..3063143eef56 100644 --- a/games-emulation/melonds-jg/Manifest +++ b/games-emulation/melonds-jg/Manifest @@ -1,6 +1,7 @@ AUX melonds-jg-0.9.5-format.patch 1078 BLAKE2B 00f471df8b8c6e622684cc4c3e925be1721cabd1dfa302e942a6f7f692aa842ccba5f5c13beb47bc184eee766a0dc71a8bfe1358e5f11cbedff36b9653b022a8 SHA512 1d72dc2d335ed68a894aaf686eaa7578d1332e647b3d65ab56b34dc90bc4d4c979a1c4a46d00759ba15ccfd88911f5cbc884c19a27c7f299af4bd94236018c5b +AUX melonds-jg-0.9.5-gcc14.patch 1080 BLAKE2B ebbaa5119d5790586afaa2a3c79d97b817a859a25bbc469e05645ea4e4df3ebe12d1a8fabd80c6811dd392f724f26bab2461fbf25cbf422d08659fd18ff767d8 SHA512 8980da22ce16007295f4994a4481fc7860f75d6207121856cd6d5d7d070cf3e671479e66ede8b56e7b7f1f3a9bf91ff2cf45809167f14f58bf90c3c4403a2e06 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 1107 BLAKE2B 150136cc293142bf9e53a3b2e512b68c993a87e4c61bee524d2f233644d90fb105cac64ce7c1f702a3f357ec83a8b3db72eb70568d9cde7b92121845f0545d2e SHA512 4aa1aa4c003cd17d641c7d9f24b45a3dd10e582114462bd15ef40b2036cbc1804036918acbb15b6924cdde2e1925d78b1a6b883d5171ce186b8732339af3622d +EBUILD melonds-jg-0.9.5.ebuild 1148 BLAKE2B 988f9039fb3fd599d76e9e045624e9a1da6d7626c825d123e4cf801d25e4cf0b40d98e30a493a0bcba5a6bf1d2f752abbc09bd70dd216b1a7fd6f67140ee1fd8 SHA512 6013a1324092bcd5a8dfd856579addf6dc4b75e535b3f9d02cd790afaba9c9ea70c07705cbb27ac28263c7c2dd1f194cedf207437b0dcc4f98d73587ece8026a 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-gcc14.patch b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-gcc14.patch new file mode 100644 index 000000000000..05da67488333 --- /dev/null +++ b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-gcc14.patch @@ -0,0 +1,29 @@ +Bug: https://bugs.gentoo.org/917164 +Upstream-PR: https://github.com/melonDS-emu/melonDS/pull/1874 +Upstream-Commit: https://github.com/melonDS-emu/melonDS/commit/e63e29ca91ba5fc1630634fbb9f064b9cce6cc1f +Upstream-Commit: https://gitlab.com/jgemu/melonds/-/commit/e63e29ca91ba5fc1630634fbb9f064b9cce6cc1f + +From e63e29ca91ba5fc1630634fbb9f064b9cce6cc1f Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sat, 11 Nov 2023 10:31:10 -0800 +Subject: [PATCH] DSi_Camera: fix gcc-14 build issue + +melonDS/src/DSi_Camera.cpp:190:23: error: 'clamp' is not a member of 'std' + 190 | r1 = std::clamp(r1, 0, 255); g1 = std::clamp(g1, 0, 255); b1 = std::clamp(b1, 0, 255); + | ^~~~~ +--- + src/DSi_Camera.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/DSi_Camera.cpp b/src/DSi_Camera.cpp +index 749162932..2b259c590 100644 +--- a/src/DSi_Camera.cpp ++++ b/src/DSi_Camera.cpp +@@ -16,6 +16,7 @@ + with melonDS. If not, see http://www.gnu.org/licenses/. + */ + ++#include <algorithm> + #include <stdio.h> + #include <string.h> + #include "DSi.h" 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 1ccecbcaaa0a..b55b19caed6b 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}-gcc14.patch # 917164 "${FILESDIR}"/${P}-teakra-no-test_generator.patch # 914196 ) |