diff options
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/Manifest.gz | bin | 12075 -> 12075 bytes | |||
| -rw-r--r-- | games-emulation/ppsspp/Manifest | 3 | ||||
| -rw-r--r-- | games-emulation/ppsspp/files/ppsspp-1.18.1-sdl2-ttf.patch | 74 | ||||
| -rw-r--r-- | games-emulation/ppsspp/ppsspp-1.18.1-r2.ebuild (renamed from games-emulation/ppsspp/ppsspp-1.18.1-r1.ebuild) | 2 |
4 files changed, 78 insertions, 1 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz Binary files differindex 46815f191d2b..045264783691 100644 --- a/games-emulation/Manifest.gz +++ b/games-emulation/Manifest.gz diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest index 0880dea7af52..2ecfa5c076e7 100644 --- a/games-emulation/ppsspp/Manifest +++ b/games-emulation/ppsspp/Manifest @@ -2,8 +2,9 @@ AUX ppsspp-1.17.1-SpvBuilder-cstdint.patch 627 BLAKE2B f9f87b5f46a3435bcd63c7e14 AUX ppsspp-1.17.1-avcodec-18825.patch 5521 BLAKE2B 162218675d1f4d87caa7a66d17a8d589b24d55b5966087548fc1dbd50fef5cdb36415393274741e7eb5da875c367da74821c1be25b0d3b92763707bd37b54bb0 SHA512 f5c1c496945ed4e3c717f470372f9e15f421821b745a7c1e4dc9b56442263ba122ac0ebd5025c81c70a2319094ea411f513cc280786a2d0d87260a7fae3128ba AUX ppsspp-1.17.1-ccache-18826.patch 1110 BLAKE2B 243a9bf36da743a4e147355703976a2acd2e6b8f82186ff87f70cf99acb72cbb5cabe9042a829d3f8746c59776680d74d88ef2401b549b2d74e3955160d9f292 SHA512 e550ac21041572a20a1ae900256093a8b7a7cca183ca057fa8a81e35cd913b934098c5c432e02489a742b13f96b486dfab457db282663c224f0e2d8c1d3be0e3 AUX ppsspp-1.17.1-cmake-cxx.patch 252 BLAKE2B 4d20d67c111e9992a2a728c5d294034a3385181079d00e886aa24bb60f9bf861485d11c2292dcaee2a03c4c434cf0713664a44865bc081968369c48733b0df68 SHA512 3c122bf12349b51fbda0a86ffa3f46afad6e5a766e0ff4ea4ceda2acda90a7a758e78732fb7dc20fc8a297f3eb71e0c5d2e2de69d566268a0bbfee16490c0c79 +AUX ppsspp-1.18.1-sdl2-ttf.patch 2209 BLAKE2B e6632aad5077f353e30bf11d0d72d7a2d27cbd58f3658c4bfe82f0eb596927e3c269ff333a67eb1ebcab05e70e4aa45510ec14541ce881cd2d6d264977b29946 SHA512 a885cd3b5787ec5afb1acb8d1dfb8ef24afcb29d120405aad305752eb0e6a43e1efe1e4cdc2cc9e5dd90894307fd6b02be51e376496053bfcbc1e1c879ca648d AUX ppsspp-CMakeLists-flags.patch 913 BLAKE2B 7bd5df94b51dad35325586f7ad23284436ba670a8c2218a4a6bfb28fb5a055240aeb0543fe331310a0d86d3661cbdf418689a592139ff832802ba1fabbd10fc3 SHA512 5b2ee899b2fbed7229d4abc027e2a010327be4d334e343f977319c475feaf2d180bd74d3640022d0175b11e8256035c828dd4cf03c8a5b9240c989b2d7f72fb7 DIST ppsspp-1.18.1.tar.xz 54239412 BLAKE2B c0a59b63be4fdf8db1bb4c30192adc37874f1976baa0876a21722d8b86dac5a245cd5dbcea2f9ca89fef2035338c1786bbcf9b3c379d48d5a633ddd263b6e8d3 SHA512 00531109d67a35fe252b1af7d41a41ec85950f5d7c818bcdfb713d74b2b94f81f5af12e3e68d49ab0f7c7d29ccc42ca3ae7956f438964a205004293bb7e07510 -EBUILD ppsspp-1.18.1-r1.ebuild 2087 BLAKE2B 220b254bafa01ea74e317d9b75e7b65adce97a86d47e826172187c6d509c96929daa6c5093bd4936010c159b4aaaa0b43ea15bc626f285938ad9a90350f1ff3b SHA512 87bf04c631c09208efe5e9f6ce0d5d6cc6944df3712e3206c92c202ac9b15ee761bb658825896b39decaf0e91010ebe0236a6ddf84f08704ab77acd538e4a6f1 +EBUILD ppsspp-1.18.1-r2.ebuild 2160 BLAKE2B 58b812c41a4e7c77f6f061f38b76c7dc862ad191a254380d5dcaa710f1f66514fd7f3c84587faf6e77cff6f64c799a2814d4212b2b7ee818e67cbaa9b9577f93 SHA512 6be2c2c9a0ce23b1af70356dad035df1b99e4abf8816db2f8fb06e6ee338a37e6bc3ddd349273ff0b2b32163212e61c63a85b9445b80cabe71364e1759639cfa EBUILD ppsspp-1.18.1.ebuild 1821 BLAKE2B b6e1daced3534cdf2809b0e9605a81ba09b85069d7941073477325c803429a7149dd1204ad94052c8d1624b4f873cb6d51ec22a3d023c7848a31323b7873cb49 SHA512 7e66051fff1cd8179bd29a4b442823689de525218c1ef66fe02ccd1bf790be53bd8ccbc76e684bf6388ad5599502dec544b8e3ca37c6235c617ed4055322bf76 MISC metadata.xml 526 BLAKE2B 19d0378d36d2b1d81ce404a95d98488b54f4368c72a7397b6d7c9a444edec9c19d146295cfc247a75aca1e1b5d1643161a627b80ea76aa8d43189a5eb14380c2 SHA512 7a8c8a7c05acdc110422d7c38552c8106d1886a672e6bda1212ce9cba737ae5e89e6624010d5bc3149b8da7c061b10295a721c74e7377587ec52ec7be2237855 diff --git a/games-emulation/ppsspp/files/ppsspp-1.18.1-sdl2-ttf.patch b/games-emulation/ppsspp/files/ppsspp-1.18.1-sdl2-ttf.patch new file mode 100644 index 000000000000..b59090e13187 --- /dev/null +++ b/games-emulation/ppsspp/files/ppsspp-1.18.1-sdl2-ttf.patch @@ -0,0 +1,74 @@ +From bd84c7bf7dcefc991aa2af14ca1f42f2c842c54b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com> +Date: Thu, 9 Jan 2025 20:58:50 +0100 +Subject: [PATCH 1/2] Buildfix for new SDL. + +Fixes #19839 +--- + Common/Render/Text/draw_text_sdl.h | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Common/Render/Text/draw_text_sdl.h b/Common/Render/Text/draw_text_sdl.h +index 267028638f87..7e0ddd9b422f 100644 +--- a/Common/Render/Text/draw_text_sdl.h ++++ b/Common/Render/Text/draw_text_sdl.h +@@ -9,8 +9,7 @@ + #include <fontconfig/fontconfig.h> + #endif + +-// SDL2_ttf's TTF_Font is a typedef of _TTF_Font. +-struct _TTF_Font; ++struct TTF_Font; + + class TextDrawerSDL : public TextDrawer { + public: +@@ -32,9 +31,9 @@ class TextDrawerSDL : public TextDrawer { + uint32_t CheckMissingGlyph(std::string_view text); + int FindFallbackFonts(uint32_t missingGlyph, int ptSize); + +- std::map<uint32_t, _TTF_Font *> fontMap_; ++ std::map<uint32_t, TTF_Font *> fontMap_; + +- std::vector<_TTF_Font *> fallbackFonts_; ++ std::vector<TTF_Font *> fallbackFonts_; + std::vector<std::pair<std::string, int>> fallbackFontPaths_; // path and font face index + + std::map<int, int> glyphFallbackFontIndex_; + +From 1ba304d83f5b3154928cff4169e812f4eedc3b6e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com> +Date: Thu, 9 Jan 2025 21:12:00 +0100 +Subject: [PATCH 2/2] Alternate buildfix + +--- + Common/Render/Text/draw_text_sdl.h | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/Common/Render/Text/draw_text_sdl.h b/Common/Render/Text/draw_text_sdl.h +index 7e0ddd9b422f..7c073a8290f7 100644 +--- a/Common/Render/Text/draw_text_sdl.h ++++ b/Common/Render/Text/draw_text_sdl.h +@@ -5,12 +5,15 @@ + #include <map> + #include "Common/Render/Text/draw_text.h" + ++#if defined(USE_SDL2_TTF) ++ ++#include "SDL2/SDL.h" ++#include "SDL2/SDL_ttf.h" ++ + #if defined(USE_SDL2_TTF_FONTCONFIG) + #include <fontconfig/fontconfig.h> + #endif + +-struct TTF_Font; +- + class TextDrawerSDL : public TextDrawer { + public: + TextDrawerSDL(Draw::DrawContext *draw); +@@ -42,3 +45,5 @@ class TextDrawerSDL : public TextDrawer { + FcConfig *config; + #endif + }; ++ ++#endif diff --git a/games-emulation/ppsspp/ppsspp-1.18.1-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.18.1-r2.ebuild index 79a7ae0733b7..ad007a340549 100644 --- a/games-emulation/ppsspp/ppsspp-1.18.1-r1.ebuild +++ b/games-emulation/ppsspp/ppsspp-1.18.1-r2.ebuild @@ -27,6 +27,7 @@ IUSE="discord qt5 test wayland" RESTRICT="!test? ( test )" RDEPEND=" + >=media-libs/sdl2-ttf-2.24.0 app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= @@ -57,6 +58,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.17.1-SpvBuilder-cstdint.patch" "${FILESDIR}/${PN}-1.17.1-cmake-cxx.patch" + "${FILESDIR}/${PN}-1.18.1-sdl2-ttf.patch" "${FILESDIR}/${PN}-CMakeLists-flags.patch" ) |