diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-07-01 13:45:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-07-01 13:45:28 +0100 |
commit | 676f73d9e2fbb9f03291bae80529ba45f541d3c8 (patch) | |
tree | 4dae0ba3eea1b25e109d944bde85f44e763c6441 /games-emulation/pcsx2 | |
parent | 910ec713340312b0b8437a7307c8effaa33fb410 (diff) |
gentoo auto-resync : 01:07:2023 - 13:45:28
Diffstat (limited to 'games-emulation/pcsx2')
-rw-r--r-- | games-emulation/pcsx2/Manifest | 14 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch | 43 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch | 21 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch | 10 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch | 39 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch | 7 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch | 6 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch | 15 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch | 13 | ||||
-rw-r--r-- | games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild | 246 | ||||
-rw-r--r-- | games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild | 253 | ||||
-rw-r--r-- | games-emulation/pcsx2/pcsx2-9999.ebuild | 9 |
12 files changed, 53 insertions, 623 deletions
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index f34da480dd15..0264f83a3f2f 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,15 +1,13 @@ AUX pcsx2-1.6.0-disable-setcap.patch 2783 BLAKE2B 8840d64feeb042c8442fae30c40fa05e5de19f0b5da9f383bb097e8f092bbabcaf529424e11eb99bb3af81ac8407cd207f846683cd359ac9ea11f8d40a4a72dd SHA512 463ef253a192d3531b1733c4006bd5870aaa31ae58e54d188edd889bb0c3e3eb7d2e76442461c68105ff51753b29add02a673aad4eb5ed27a0b9a66345fea08d AUX pcsx2-1.6.0-wx-config.patch 613 BLAKE2B e5ff17ae5bddde776990cace4735883e8869f6c125dcdf171bb67b9392921d7a006f4b96075086b3927ecede027ff0b2efa40982b10e121c2e1096e36fcbe8bc SHA512 14f0eddbd9c72600f47733a5137c171abf05723b55aedf37438ed89730a9684b67a20d79dea3864531521421c1436922a19667353d7e51253ad3449a99b7b21a -AUX pcsx2-1.7.0-crcs.patch 1456 BLAKE2B e4dc096bf863d5067816b2755ba84a6f7e6d9163b19e3517906c012a62bf35f5702f887c9f42ada87e23d6f10490e1d68d9d68864c96b40acb95c4ae7175f0be SHA512 2c283c38382983c2acc95ea369c1becf43266101edf5b4dd7824346a813061a3146cd3fdaad38936f3d208140dcf02ff02c1d43eac4e95cbcf5dcb3449a1a525 -AUX pcsx2-1.7.3329-lto.patch 516 BLAKE2B 84af170687a279a2f78188cff30ecc7ad68c11f4d5300b20fb06ac745770869c2c70f7ff43a069d225520ae56fe9d960706dc53f03890caeb46ce0efddea312e SHA512 c94a7b4c52ac9a4a7918f275dc7083b63c0a3992aa86d7ca424a229400893b1234381a3111249e3d5e88de9486e784d0a7e8977bbf853b215e2f6a4fc8bcb822 -AUX pcsx2-1.7.3329-qt6.patch 371 BLAKE2B 15a8e221ee4b6f19c5956269908e9d3bad6a8fbccdddadd3d5941057f163c064a1e3d81daff1a90c689fe1d4bb1e645081be9dae2aa63a88caa9b2b83b13cebf SHA512 65f3f241ccda684cee1d382a973ffbda09b290a4878f7c0b3aed279b2fa5aa1f188b7a5bf26a584d2aa4ed12aa9c1c5e15ecebb2c2bb6ae83a7622deba26bdd4 AUX pcsx2-1.7.3351-unbundle.patch 1276 BLAKE2B 26af7e54f63bed99075f8155d237092d536b9ef420032d766ef4e41b7953c329f70d2040ae6a99142e0bc307fa9a534bd5db4e363e4e64a4291dc7a5760149b9 SHA512 7068a214cae03579e83ce14a5b953807a4f536be93946e15b58a33ede2497a128508ac2727fd1f602444906bc1497182a3740a1613d39300c403e387adbaa332 AUX pcsx2-1.7.3468-cubeb-automagic.patch 1635 BLAKE2B 90581edb3ed95fb011ecbd446e529b48544a0c8090e7e40b4aba6fb153a73e53f8399a61ee1d9fce180ac2ee44185cf7dac1972e62dc43648496774a7a8cfca9 SHA512 d2b92cc6530c706e0219b6eab5c8b52a3e93bcc16269400afbcbb3ca23edf07f511fd4116b02e77f89eb7083b9bb64f8bec85950d9d7e98ffdbbe351d4c70387 -AUX pcsx2-1.7.3602-rapidyaml-0.5.0.patch 1519 BLAKE2B 97a54b242566ebb18fb2c19028fe22a8e9ffa3acc4a84e3d3a0e4199abb5dce29f9820ad1f118b3867239ca6cc046dea5b01f060d8917668e2dbea1e8b7def35 SHA512 00be997ac4a4ec1b7947afe78cf2494690ce94c060b4960eecf07e5e5307c4658061073e338f64ad4cb908bca080d61c221589218a7a3ab02e023f6257c8ff4d AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c969478d51b4e03a53df155796f363658e65d0160fd2e88f09a9334301e00658c238af0122b6f01be709efbfb992d6 SHA512 2c5277498a90766b799a777cae0699699c2cec1d09bd152e4eee53f59ef12c7c17d11c012740992c56b4fc2bf0d8a39213dc2c97ee98a1fdd7b6ead27346aff7 +AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb07306007edbb001fc44cab21d3c4356a46a1104fc77de9d7fbf4dd76147fd2e3e8695ff4abf6e984dbda1a832e610c1126 SHA512 35ae6f69f4c7ef0bac86b231e75438cf24f8c50cb72f03b4540164c87ced0a3c167cb911cd5d7949f9fad41895fe97fc775ff8f179601d73597d967c79029e83 +AUX pcsx2-1.7.4667-system-chdr.patch 239 BLAKE2B 7a761b2e800b0a5683f4c65f23730e02752502a0c1098422ffa37b0562a025cf8c533dfaa5bdd20811e0d643d32eeb8a5cc8028c7a02b146b37c7f22fdb511c4 SHA512 7d09e9707bd0d2d98b637f97b73afb83d3eb88a91e938215de5894b184ecdd3f0bb2c5486a03bc4b9767b4226c3e99fc0ac0a00797d03ac8850081dbe1a91211 +AUX pcsx2-1.7.4667-system-gtest.patch 504 BLAKE2B 23a15c765151fb25e54b5dfb4c948eea7b5258ae5cbcb68f214128301902c900b2e1882ae66b9a6a0838cc18eabe5c7889be29d396f6f6ba5b71e33f7cca17e4 SHA512 2571ed120173cbcd912e0d3f12afc79716c8ba791cc292b5b7f3ee133c040eed2769079a4f372b5eaa501d640498bb3781142af97447d055eac5ce10995fddf3 +AUX pcsx2-1.7.4667-system-zstd.patch 528 BLAKE2B 5539f8de26ee029d95199f3da1e5eea7f1b8a226b01ee53df8aa6ed3d514bb66e8c7ab5a4a44d8fccf4e7eb0dea058028db1c9509a0d9c67f48224d3385d4a9a SHA512 c3eb6e32c3b7b4384e438597d6bf3bae49309c0b9c7b38374edadbde2f6430c5583b2bec07daf14c8c71efa8b848af5ebe0e55f1df84f37ff98b854062644cec DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 -DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789 -DIST pcsx2-1.7.4534.tar.gz 8973035 BLAKE2B 203432185e77d5380a436d176c349f8557fff240d7cc507c5009b95b8572647ce77df3d4ca0a4420819e06f6e45216810304e9c883c35c9d82dff2152997deb1 SHA512 0c369263127b56f75632f306218068b7dbb3ca226c0150755831f16e28c3204525c579f4d05f8cb4d27b186b98c1bd4f08ffd2d6d326342bcd97084c7f8f8f27 DIST pcsx2-1.7.4624.tar.gz 11178711 BLAKE2B 539add6bf6b542b29c1ac61584dbfa549f9b866e56e72eaf9342d1e990576252c861542d4e397324efae73eda933756e14d871aaf6ece45edfb1e6e27d37b43a SHA512 af43136ffefe60e0adb85b930ec9da22a71e766a911e1a2ad37cfb1190338dee2a0a45ecd4c0de17ed5d0622b8b17d7c7ff9201ba8b2f9924d6b7d4b5804d6a1 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5 @@ -17,8 +15,6 @@ DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b -EBUILD pcsx2-1.7.3738-r1.ebuild 7645 BLAKE2B b4221e5efbd9dcf9453997909242c9ac505dd89e2e8ba92b3e9f3e006a01d6ae183bae1d9c2b4f7479130d66ed0bca7e2398882c71eca84b2ae71950a9ae1f95 SHA512 543fca97eb19b0b30a8dd3ff85bc8381ee13faddd1385a2258f5604d362580bbb65bec8326767ba320e9d1158d6fee18a3b7be80654ad444a1780fe7f835f8fb -EBUILD pcsx2-1.7.4534-r1.ebuild 7933 BLAKE2B 88db6f6f487dc9eb7c31e715df48103d2bbb0811a91db7781d6d144cc51ea06f4e15ce4924947a2a31818ec51e5531154a4868fac8c8a640ed7015cf54b47b39 SHA512 c1d599fa127b8eb0b2d8020da2b4d223148fc2a0458672fd825809ad623cc1639c4ddb9c3b39c21d9c0e5d9c93da57fdba394702e56889f2714b41848574142a EBUILD pcsx2-1.7.4624.ebuild 8162 BLAKE2B e8f234914b127a9d4f16fb12e0f805defc57fbd680120e457f88789ff2d6c9371f6b667669b259c89b66c280723008ab0c9824e37af9cd540936ea9bb7af781c SHA512 6c9125bd42e5dae7e6d5402cc320a28783e9d13d190589e182907459dd9d5a33f3d2cf0dff95be66620403211d4834694054ccded20db195d99afd4e39ceed83 -EBUILD pcsx2-9999.ebuild 8162 BLAKE2B e8f234914b127a9d4f16fb12e0f805defc57fbd680120e457f88789ff2d6c9371f6b667669b259c89b66c280723008ab0c9824e37af9cd540936ea9bb7af781c SHA512 6c9125bd42e5dae7e6d5402cc320a28783e9d13d190589e182907459dd9d5a33f3d2cf0dff95be66620403211d4834694054ccded20db195d99afd4e39ceed83 +EBUILD pcsx2-9999.ebuild 8397 BLAKE2B 32907a6501e3c27600021c215c18ba343e17e4fa72201f3c2f1fd85b6efb3b1a42f82bd8b6ec10719d7a8a1296975d551f235ef334596441bc67ff7bf0b8987e SHA512 50013210736443274d8d431e3b041ebbbbd581a0be80fc4fd8ada7b31480e4456e9e4964119d6f0e8891681469dac413cb1c3ab7602a278b4d5949d1aae56865 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426 diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch b/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch deleted file mode 100644 index aa647cd09c07..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-PR: https://github.com/PCSX2/pcsx2/pull/5082 -Upstream-Issue: https://github.com/PCSX2/pcsx2/issues/1762 -Upstream-Issue: https://github.com/PCSX2/pcsx2/issues/5062 - -From: orbea <orbea@riseup.net> -Date: Sun, 28 Nov 2021 16:18:48 -0800 -Subject: [PATCH] Revert "GS: Remove Unofficial CRCs (#4082)" - -These games hacks are still used and can be removed -again when a better solution is available. - -This reverts commit 6bcdb55f22d468b2eb8b95fd35bd071f9272a89c. - ---- a/pcsx2/GS/GSCrc.cpp -+++ b/pcsx2/GS/GSCrc.cpp -@@ -22,6 +22,8 @@ const CRC::Game CRC::m_games[] = - { - // Note: IDs 0x7ACF7E03, 0x7D4EA48F, 0x37C53760 - shouldn't be added as it's from the multiloaders when packing games. - {0x00000000, NoTitle, NoRegion, 0}, -+ {0xF46142D3, ArTonelico2, NoRegion, 0}, -+ {0xC38067F4, ArTonelico2, NoRegion, 0}, // project metafalica 1.0 - {0xF95F37EE, ArTonelico2, US, 0}, - {0x68CE6801, ArTonelico2, JP, 0}, - {0xCE2C1DBF, ArTonelico2, EU, 0}, -@@ -164,6 +166,8 @@ const CRC::Game CRC::m_games[] = - {0xBF6F101F, GiTS, EU, 0}, // same CRC as another US disc - {0xA616A6C2, TalesOfAbyss, US, 0}, - {0x14FE77F7, TalesOfAbyss, US, 0}, -+ {0x045D77E9, TalesOfAbyss, JPUNDUB, 0}, -+ {0x14FD77F7, TalesOfAbyss, JPUNDUB, 0}, - {0xAA5EC3A3, TalesOfAbyss, JP, 0}, - {0xFB236A46, SonicUnleashed, US, 0}, - {0x8C913264, SonicUnleashed, EU, 0}, ---- a/pcsx2/GS/GSCrc.h -+++ b/pcsx2/GS/GSCrc.h -@@ -91,6 +91,7 @@ public: - US, - EU, - JP, -+ JPUNDUB, - RU, - FR, - DE, diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch deleted file mode 100644 index 1047105d646a..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch +++ /dev/null @@ -1,21 +0,0 @@ -Lazy fix for -Werror=odr and don't rely on the CMAKE macro to -pass -fno-lto to the problematic FastJmp.cpp source with lto. ---- a/common/CMakeLists.txt -+++ b/common/CMakeLists.txt -@@ -268,3 +268,3 @@ - --if (USE_GCC AND CMAKE_INTERPROCEDURAL_OPTIMIZATION) -+if (USE_GCC) - # GCC LTO doesn't work with asm statements ---- a/pcsx2/PAD/Linux/Device.h -+++ b/pcsx2/PAD/Linux/Device.h -@@ -31,3 +31,3 @@ - --enum DeviceType -+enum PADDeviceType - { -@@ -101,3 +101,3 @@ - DeviceAPI api; -- DeviceType type; -+ PADDeviceType type; - diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch deleted file mode 100644 index 9ef82985dc99..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch +++ /dev/null @@ -1,10 +0,0 @@ -https://github.com/PCSX2/pcsx2/commit/6386be09c2e disabled PACKAGE_MODE -for reasons that make no sense as far as installing from an ebuild goes. - -Skip the error and handle the rest from the ebuild. ---- a/pcsx2-qt/CMakeLists.txt -+++ b/pcsx2-qt/CMakeLists.txt -@@ -7,3 +7,2 @@ - if (PACKAGE_MODE) -- message(FATAL_ERROR "Package mode is not supported for Qt builds.") - else() diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch deleted file mode 100644 index aee1608ea754..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://github.com/PCSX2/pcsx2/issues/7623 -https://github.com/PCSX2/pcsx2/pull/7847 ---- a/pcsx2/GameDatabase.cpp -+++ b/pcsx2/GameDatabase.cpp -@@ -151,5 +151,5 @@ - if (node.has_child("gameFixes") && node["gameFixes"].has_children()) - { -- for (const ryml::NodeRef& n : node["gameFixes"].children()) -+ for (const ryml::ConstNodeRef& n : node["gameFixes"].children()) - { - bool fixValidated = false; -@@ -182,5 +182,5 @@ - if (node.has_child("speedHacks") && node["speedHacks"].has_children()) - { -- for (const ryml::NodeRef& n : node["speedHacks"].children()) -+ for (const ryml::ConstNodeRef& n : node["speedHacks"].children()) - { - bool speedHackValidated = false; -@@ -212,5 +212,5 @@ - if (node.has_child("gsHWFixes")) - { -- for (const ryml::NodeRef& n : node["gsHWFixes"].children()) -+ for (const ryml::ConstNodeRef& n : node["gsHWFixes"].children()) - { - const std::string_view id_name(n.key().data(), n.key().size()); -@@ -233,5 +233,5 @@ - if (node.has_child("memcardFilters") && node["memcardFilters"].has_children()) - { -- for (const ryml::NodeRef& n : node["memcardFilters"].children()) -+ for (const ryml::ConstNodeRef& n : node["memcardFilters"].children()) - { - auto memcardFilter = std::string(n.val().str, n.val().len); -@@ -243,5 +243,5 @@ - if (node.has_child("patches") && node["patches"].has_children()) - { -- for (const ryml::NodeRef& n : node["patches"].children()) -+ for (const ryml::ConstNodeRef& n : node["patches"].children()) - { - // use a crc of 0 for default patches diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch new file mode 100644 index 000000000000..ad76cc99c6b6 --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch @@ -0,0 +1,7 @@ +If upstream believes -ffast-math is ok for this part then that is +fine, but we do not want to override users' -O. +--- a/3rdparty/soundtouch/CMakeLists.txt ++++ b/3rdparty/soundtouch/CMakeLists.txt +@@ -43 +43 @@ +- target_compile_options(pcsx2-soundtouch PRIVATE -Ofast) ++ target_compile_options(pcsx2-soundtouch PRIVATE -ffast-math) diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch new file mode 100644 index 000000000000..9787cd380337 --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch @@ -0,0 +1,6 @@ +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -164 +164,2 @@ +-add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL) ++pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr) ++alias_library(chdr-static PkgConfig::chdr) diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch new file mode 100644 index 000000000000..858efc3b3e47 --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch @@ -0,0 +1,15 @@ +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -96,6 +95,0 @@ +-if(ENABLE_TESTS) +- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt") +- message(WARNING "ENABLE_TESTS was on but gtest was not found, unit tests will not be enabled") +- set(ACTUALLY_ENABLE_TESTS Off) +- endif() +-endif() +--- a/tests/ctest/CMakeLists.txt ++++ b/tests/ctest/CMakeLists.txt +@@ -20 +20,2 @@ +-add_subdirectory(gtest) ++find_package(GTest REQUIRED) ++alias_library(gtest_main GTest::gtest_main) diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch new file mode 100644 index 000000000000..27b2e82852e8 --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch @@ -0,0 +1,13 @@ +This can use system zstd already but will not find it given +it does not install cmake files, so use pkg-config. +https://bugs.gentoo.org/872254 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -114,5 +114,2 @@ +-find_optional_system_library(zstd 3rdparty/zstd 1.4.5) +-if (${zstd_TYPE} STREQUAL System) +- alias_library(Zstd::Zstd zstd::libzstd_shared) +- alias_library(pcsx2-zstd zstd::libzstd_shared) +-endif() ++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd) ++alias_library(Zstd::Zstd PkgConfig::zstd) diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild deleted file mode 100644 index b0b340795652..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild +++ /dev/null @@ -1,246 +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 cmake fcaps flag-o-matic wxwidgets - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git" -else - HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1 - HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9 - HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96 - HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5 - HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f - SRC_URI=" - https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz - -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz - https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz - -> ${PN}-fmt-${HASH_FMT::10}.tar.gz - https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz - -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz - vulkan? ( - https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz - -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz - -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz - )" - KEYWORDS="-* ~amd64" -fi - -DESCRIPTION="PlayStation 2 emulator" -HOMEPAGE="https://pcsx2.net/" - -LICENSE=" - GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+ - ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain" -SLOT="0" -IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland" -REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support -RESTRICT="!test? ( test )" - -RDEPEND=" - app-arch/xz-utils - app-arch/zstd:= - >=dev-cpp/rapidyaml-0.5:= - dev-libs/libaio - dev-libs/libchdr - dev-libs/libzip:=[zstd] - media-libs/harfbuzz - media-libs/libglvnd - media-libs/libpng:= - >=media-libs/libsdl2-2.0.22[haptic,joystick] - media-libs/libsoundtouch:= - net-libs/libpcap - sys-libs/zlib:= - virtual/libudev:= - x11-libs/libX11 - x11-libs/libXrandr - alsa? ( media-libs/alsa-lib ) - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - net-misc/curl - ) - !qt6? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3[wayland?] - x11-libs/wxGTK:${WX_GTK_VER}[X] - ) - sndio? ( media-sound/sndio:= ) - vulkan? ( media-libs/vulkan-loader ) - wayland? ( dev-libs/wayland )" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - test? ( dev-cpp/gtest )" -BDEPEND=" - dev-lang/perl - qt6? ( dev-qt/qttools:6[linguist] ) - !qt6? ( sys-devel/gettext )" - -FILECAPS=( - -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 -) - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-crcs.patch - "${FILESDIR}"/${PN}-1.7.3329-lto.patch - "${FILESDIR}"/${PN}-1.7.3329-qt6.patch - "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch - "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch - "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - local EGIT_SUBMODULES=( - # libfmt is volatile and upstream is unlikely to make fixes for - # latest system copy punctually (may revisit this eventually) - 3rdparty/fmt/fmt - - # has no build system and is not really setup for unbundling - 3rdparty/rcheevos/rcheevos - - # system rapidyaml is still used, but this uses another part - # of the source directly (fast_float) and so allow the submodule - # https://github.com/PCSX2/pcsx2/commit/af646e449 - 3rdparty/rapidyaml/rapidyaml - 3rdparty/rapidyaml/rapidyaml/extern/c4core - 3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float - - # glslang can be troublesome to unbundle (bug #831217), - # also keep vulkan-headers to stay in sync - $(usev vulkan ' - 3rdparty/glslang/glslang - 3rdparty/vulkan-headers') - ) - - git-r3_src_unpack - else - default - - mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die - mv fast_float-${HASH_FASTFLOAT} \ - "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die - - rmdir "${S}"/3rdparty/fmt/fmt || die - mv fmt-${HASH_FMT} "${S}"/3rdparty/fmt/fmt || die - - rmdir "${S}"/3rdparty/rcheevos/rcheevos || die - mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die - - if use vulkan; then - rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die - mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die - mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die - fi - fi -} - -src_prepare() { - cmake_src_prepare - - # qt6 build doesn't support PACKAGE_MODE and need to set resources location - sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \ - -i pcsx2/Frontend/CommonHost.cpp || die - - if [[ ${PV} != 9999 ]]; then - sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \ - -i cmake/Pcsx2Utils.cmake || die - - # delete all 3rdparty/* except known-used ones in non-live - local keep=( - # TODO?: rapidjson and xbyak are packaged and could be unbundlable - # w/ patch, and discord-rpc be optional w/ dependency on rapidjson - cpuinfo cubeb discord-rpc fmt glad imgui include jpgd lzma - rapidjson rapidyaml rcheevos simpleini xbyak zydis - $(usev vulkan 'glslang vulkan-headers') - ) - find 3rdparty -mindepth 1 -maxdepth 1 -type d \ - -not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die - fi -} - -src_configure() { - use qt6 || setup-wxwidgets - - # for bundled glslang (bug #858374) - use vulkan && append-flags -fno-strict-aliasing - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=no - -DDISABLE_BUILD_DATE=yes - -DDISABLE_PCSX2_WRAPPER=yes - -DDISABLE_SETCAP=yes - -DENABLE_TESTS=$(usex test) - -DPACKAGE_MODE=yes - -DQT_BUILD=$(usex qt6) - -DUSE_VTUNE=no - -DUSE_VULKAN=$(usex vulkan) - -DWAYLAND_API=$(usex wayland) - -DXDG_STD=yes - - # note that the current upstream is somewhat hostile to using system - # libs, system installs, or any modifications and may disregard any - # bugs that is not reproducible with the appimage using bundled libs - -DUSE_SYSTEM_LIBS=yes - -DUSE_SYSTEM_FMT=no # volatile, keep bundled at least "for now" - - # sse4.1 is the bare minimum required, -m is required at build time - # (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp) - # https://github.com/PCSX2/pcsx2/pull/4329 - -DARCH_FLAG=-msse4.1 - - # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch - -DCHECK_ALSA=$(usex alsa) - -DCHECK_JACK=$(usex jack) - -DCHECK_PULSE=$(usex pulseaudio) - -DCHECK_SNDIO=$(usex sndio) - -DLAZY_LOAD_LIBS=no - ) - - cmake_src_configure -} - -src_test() { - cmake_build unittests -} - -src_install() { - cmake_src_install - - use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2 -} - -pkg_postinst() { - fcaps_pkg_postinst - - local replacing_old - if [[ ${REPLACING_VERSIONS##* } ]] && - ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1 - then - replacing_old= - elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case" - elog "it is recommended to backup your save states and memory cards before use." - elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'." - fi - - if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then - [[ -v replacing_old ]] && elog - elog "${PN}-1.7.x is a development branch where .x increments every changes." - elog "Stable 1.6.0 is getting old and lacks many notable features (e.g. native" - elog "64bit builds). Given it may be a long time before there is a new stable," - elog "Gentoo will carry and update 1.7.x roughly every months." - elog - elog "Please report an issue if feel a picked version needs to be updated ahead" - elog "of time or masked (notably for handling regressions)." - fi -} diff --git a/games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild deleted file mode 100644 index d2af26b4d0ef..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop fcaps flag-o-matic - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git" -else - HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1 - HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9 - HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96 - HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5 - HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f - SRC_URI=" - https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz - -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz - https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz - -> ${PN}-fmt-${HASH_FMT::10}.tar.gz - https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz - -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz - vulkan? ( - https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz - -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz - -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz - )" - KEYWORDS="-* ~amd64" -fi - -DESCRIPTION="PlayStation 2 emulator" -HOMEPAGE="https://pcsx2.net/" - -LICENSE=" - GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+ - ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain" -SLOT="0" -IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland" -REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support -RESTRICT="!test? ( test )" - -# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland -RDEPEND=" - app-arch/xz-utils - app-arch/zstd:= - dev-cpp/rapidyaml:= - dev-libs/libaio - dev-libs/libchdr - dev-libs/libzip:=[zstd] - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - media-libs/libglvnd - media-libs/libpng:= - >=media-libs/libsdl2-2.0.22[haptic,joystick] - media-libs/libsoundtouch:= - media-video/ffmpeg:= - net-libs/libpcap - net-misc/curl - sys-libs/zlib:= - virtual/libudev:= - x11-libs/libXrandr - alsa? ( media-libs/alsa-lib ) - dbus? ( sys-apps/dbus ) - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - sndio? ( media-sound/sndio:= ) - vulkan? ( media-libs/vulkan-loader ) - wayland? ( dev-libs/wayland )" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - test? ( dev-cpp/gtest )" -BDEPEND="dev-qt/qttools:6[linguist]" - -FILECAPS=( - -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 -) - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch - "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch - "${FILESDIR}"/${PN}-1.7.3773-lto.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - local EGIT_SUBMODULES=( - # libfmt is volatile and upstream is unlikely to make fixes for - # latest system copy punctually (may revisit this eventually) - 3rdparty/fmt/fmt - - # has no build system and is not really setup for unbundling - 3rdparty/rcheevos/rcheevos - - # system rapidyaml is still used, but this uses another part - # of the source directly (fast_float) and so allow the submodule - # https://github.com/PCSX2/pcsx2/commit/af646e449 - 3rdparty/rapidyaml/rapidyaml - 3rdparty/rapidyaml/rapidyaml/extern/c4core - 3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float - - # glslang can be troublesome to unbundle (bug #831217), - # also keep vulkan-headers to stay in sync - $(usev vulkan ' - 3rdparty/glslang/glslang - 3rdparty/vulkan-headers') - ) - - git-r3_src_unpack - else - default - - mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die - mv fast_float-${HASH_FASTFLOAT} \ - "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die - - rmdir "${S}"/3rdparty/fmt/fmt || die - mv fmt-${HASH_FMT} "${S}"/3rdparty/fmt/fmt || die - - rmdir "${S}"/3rdparty/rcheevos/rcheevos || die - mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die - - if use vulkan; then - rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die - mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die - mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die - fi - fi -} - -src_prepare() { - cmake_src_prepare - - sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \ - -i pcsx2/Pcsx2Config.cpp || die - - if [[ ${PV} != 9999 ]]; then - sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \ - -i cmake/Pcsx2Utils.cmake || die - - # delete all 3rdparty/* except known-used ones in non-live - local keep=( - # TODO?: rapidjson and xbyak are packaged and could be unbundlable - # w/ patch, and discord-rpc be optional w/ dependency on rapidjson - cpuinfo cubeb demangler discord-rpc fmt glad imgui include jpgd - lzma rapidjson rapidyaml rcheevos simpleini xbyak zydis - $(usev vulkan 'glslang vulkan-headers') - ) - find 3rdparty -mindepth 1 -maxdepth 1 -type d \ - -not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die - fi -} - -src_configure() { - if use vulkan; then - # for bundled glslang (bug #858374) - append-flags -fno-strict-aliasing - - # odr violations in pcsx2's vulkan code, disabling as a safety for now - # (vulkan support tend to receive major changes, is more on WIP side) - filter-lto - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=no - -DDBUS_API=$(usex dbus) - -DDISABLE_BUILD_DATE=yes - -DENABLE_TESTS=$(usex test) - -DUSE_VTUNE=no - -DUSE_VULKAN=$(usex vulkan) - -DWAYLAND_API=$(usex wayland) - -DX11_API=yes # fails if X libs are missing even if disabled - - # note that the current upstream is somewhat hostile to using system - # libs, system installs, or any modifications and may disregard any - # bugs that is not reproducible with the appimage using bundled libs - -DUSE_SYSTEM_LIBS=yes - -DUSE_SYSTEM_FMT=no # volatile, keep bundled at least "for now" - - # sse4.1 is the bare minimum required, -m is required at build time - # (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp) - # https://github.com/PCSX2/pcsx2/pull/4329 - -DARCH_FLAG=-msse4.1 - - # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch - -DCHECK_ALSA=$(usex alsa) - -DCHECK_JACK=$(usex jack) - -DCHECK_PULSE=$(usex pulseaudio) - -DCHECK_SNDIO=$(usex sndio) - -DLAZY_LOAD_LIBS=no - ) - - cmake_src_configure -} - -src_test() { - cmake_build unittests -} - -src_install() { - newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN} - - insinto /usr/share/${PN} - doins -r "${BUILD_DIR}"/bin/resources - - dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt} - - newicon bin/resources/icons/AppIconLarge.png ${PN}.png - make_desktop_entry ${PN} ${PN^^} -} - -pkg_postinst() { - fcaps_pkg_postinst - - local replacing= - if [[ ${REPLACING_VERSIONS##* } ]]; then - if ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1; then - replacing=old - elif ver_test ${REPLACING_VERSIONS##* } -lt 1.7.3773; then - replacing=wx - else - replacing=any - fi - fi - - if [[ ${replacing} == old ]]; then - elog - elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, notably" - elog "it is now a 64bit build using Qt6. Just-in-case it is recommended to" - elog "backup your configs, save states, and memory cards before use." - elog "The executable was also renamed from 'PCSX2' to 'pcsx2'." - fi - - if [[ ${replacing} == @(|old) && ${PV} != 9999 ]]; then - elog - elog "${PN}-1.7.x is a development branch where .x increments every changes." - elog "Stable 1.6.0 is getting old and lacks many notable features (e.g. native" - elog "64bit builds). Given it may be a long time before there is a new stable," - elog "Gentoo will carry and update 1.7.x roughly every months." - elog - elog "Please report an issue if feel a picked version needs to be updated ahead" - elog "of time or masked (notably for handling regressions)." - fi - - if [[ ${replacing} == wx ]]; then - ewarn - ewarn "Note that wxGTK support been dropped upstream since >=${PN}-1.7.3773," - ewarn "and so USE=qt6 is gone and Qt6 is now always used." - fi -} diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 0837cde0069d..63f79eb0b691 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -55,7 +55,6 @@ COMMON_DEPEND=" media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] - media-libs/libsoundtouch:= media-video/ffmpeg:= net-libs/libpcap net-misc/curl @@ -85,9 +84,12 @@ FILECAPS=( ) PATCHES=( - "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch "${FILESDIR}"/${PN}-1.7.3773-lto.patch + "${FILESDIR}"/${PN}-1.7.4667-flags.patch + "${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch + "${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch + "${FILESDIR}"/${PN}-1.7.4667-system-zstd.patch ) src_unpack() { @@ -191,6 +193,9 @@ src_configure() { # https://github.com/PCSX2/pcsx2/pull/4329 -DARCH_FLAG=-msse4.1 + # not packaged due to bug #885471, but still disable for no automagic + -DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes + # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch -DCHECK_ALSA=$(usex alsa) -DCHECK_JACK=$(usex jack) |