diff options
author | Ionen Wolkens <ionen@gentoo.org> | 2022-10-27 17:30:34 -0400 |
---|---|---|
committer | Ionen Wolkens <ionen@gentoo.org> | 2022-10-27 18:17:21 -0400 |
commit | 9af2648cf253fc21104e174ed1d85171c11f477a (patch) | |
tree | 31240d06371aaf2b0663b33f5c7842d10c458ba8 /games-emulation/pcsx2/files | |
parent | dev-util/maturin: drop 0.13.3 (diff) | |
download | gentoo-9af2648cf253fc21104e174ed1d85171c11f477a.tar.gz gentoo-9af2648cf253fc21104e174ed1d85171c11f477a.tar.bz2 gentoo-9af2648cf253fc21104e174ed1d85171c11f477a.zip |
games-emulation/pcsx2: drop 1.7.3329
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'games-emulation/pcsx2/files')
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch | 41 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch | 9 |
2 files changed, 0 insertions, 50 deletions
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch deleted file mode 100644 index 450329522183..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch +++ /dev/null @@ -1,41 +0,0 @@ -Adjust to unbundle a few extras. - -zstd changes only needed because of https://bugs.gentoo.org/872254 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,3 +54,4 @@ - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -- add_subdirectory(3rdparty/gtest EXCLUDE_FROM_ALL) -+ find_package(GTest REQUIRED) -+ alias_library(gtest_main GTest::gtest_main) - add_subdirectory(tests/ctest) ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -177,3 +177,3 @@ - set(ACTUALLY_ENABLE_TESTS ${ENABLE_TESTS}) --if(ENABLE_TESTS) -+if(0) - if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt") -@@ -210,7 +210,4 @@ - find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.4.0) --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) - find_optional_system_library(libzip 3rdparty/libzip 1.8.0) -@@ -243,3 +240,4 @@ - add_subdirectory(3rdparty/lzma EXCLUDE_FROM_ALL) --add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL) -+pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr) -+alias_library(chdr-static PkgConfig::chdr) - -@@ -269,5 +267,3 @@ - if(CUBEB_API) -- add_subdirectory(3rdparty/cubeb EXCLUDE_FROM_ALL) -- target_compile_options(cubeb PRIVATE "-w") -- target_compile_options(speex PRIVATE "-w") -+ find_package(cubeb REQUIRED) - endif() diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch deleted file mode 100644 index d00f9553993d..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch +++ /dev/null @@ -1,9 +0,0 @@ -This check is unnecessary, bit dodgy (ldd+grep), and requires -DSDL2_API=1 -/only/ if wxGTK was built with USE=sdl or else get a cmake unused options -warning. Test code also fails with -Werror=strict-prototypes (clang16). ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -191,3 +191,2 @@ - if(NOT PCSX2_CORE) -- WX_vs_SDL() - endif() |