* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2016-01-13 14:23 Patrice Clement
0 siblings, 0 replies; 20+ messages in thread
From: Patrice Clement @ 2016-01-13 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 3eff83a2311a0f593a79bff174e6e9e29da45942
Author: Yuri Konotopov <ykonotopov <AT> gmail <DOT> com>
AuthorDate: Fri Jan 8 13:30:23 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jan 8 13:34:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eff83a2
games-emulation/pcsx2: Version bump, drop old
games-emulation/pcsx2/Manifest | 2 +-
.../pcsx2/files/pcsx2-1.3.1-cflags.patch | 776 ---------------------
.../pcsx2/files/pcsx2-1.3.1-egl-optional.patch | 169 -----
.../pcsx2/files/pcsx2-1.3.1-packaging.patch | 148 ----
.../{pcsx2-1.3.1.ebuild => pcsx2-1.4.0.ebuild} | 30 +-
5 files changed, 16 insertions(+), 1109 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 21e18f3..2fc312d 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1 +1 @@
-DIST pcsx2-1.3.1.tar.gz 20719203 SHA256 60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9 SHA512 d09364841d8122abc33619b66c6a5bfac7c3979442a257fe6967e516289b6584546e5b512ab8987c04563beb68a587bd44ddc4fac122633598fe89447c4025c3 WHIRLPOOL ec97823c0642a5fa2e0829465b864c09c4596d0c8eebc477b4db463ff6a3af6493480fbce5586b0e085e7d96b6d2837a087f7ceea77b45ed5a2ddefa683c99ba
+DIST pcsx2-1.4.0.tar.gz 15108326 SHA256 2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb WHIRLPOOL e185d7f310e23f261065e30ed139c3d84b6c2418cff5c4b3af47475ffd074b0fbb69f34eb80c598cfd720f18a0a93dc0580b0807599b861a86d1d7f8a595bf97
diff --git a/games-emulation/pcsx2/files/pcsx2-1.3.1-cflags.patch b/games-emulation/pcsx2/files/pcsx2-1.3.1-cflags.patch
deleted file mode 100644
index f041be5..0000000
--- a/games-emulation/pcsx2/files/pcsx2-1.3.1-cflags.patch
+++ /dev/null
@@ -1,776 +0,0 @@
-From 683b871c320ec14b777ec3937dc609b69b3cf5a5 Mon Sep 17 00:00:00 2001
-From: nE0sIghT <ykonotopov@gmail.com>
-Date: Sat, 8 Aug 2015 19:12:37 +0300
-Subject: [PATCH 3/3] Use global compiler optimization flags instead of
- defining them for every plugin/binary
-
----
- cmake/BuildParameters.cmake | 35 ++++++++++-------
- common/src/Utilities/CMakeLists.txt | 45 +---------------------
- common/src/x86emitter/CMakeLists.txt | 45 +---------------------
- pcsx2/CMakeLists.txt | 45 +---------------------
- plugins/CDVDiso/src/CMakeLists.txt | 16 +-------
- plugins/CDVDlinuz/Src/CMakeLists.txt | 21 +---------
- plugins/CDVDnull/CMakeLists.txt | 16 +-------
- plugins/FWnull/CMakeLists.txt | 16 +-------
- plugins/GSdx/CMakeLists.txt | 9 +----
- plugins/GSnull/CMakeLists.txt | 16 +-------
- plugins/PadNull/CMakeLists.txt | 16 +-------
- plugins/SPU2null/CMakeLists.txt | 16 +-------
- plugins/USBnull/CMakeLists.txt | 16 +-------
- plugins/dev9null/CMakeLists.txt | 16 +-------
- plugins/onepad/CMakeLists.txt | 16 +-------
- plugins/spu2-x/src/CMakeLists.txt | 16 +-------
- plugins/zerogs/opengl/CMakeLists.txt | 8 +---
- plugins/zerospu2/CMakeLists.txt | 16 +-------
- plugins/zzogl-pg/opengl/CMakeLists.txt | 8 +---
- .../zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt | 8 +---
- tools/bin2cpp/CMakeLists.txt | 6 +--
- 21 files changed, 51 insertions(+), 355 deletions(-)
-
-diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
-index 48b167c..82e4ded 100644
---- a/cmake/BuildParameters.cmake
-+++ b/cmake/BuildParameters.cmake
-@@ -117,14 +117,17 @@ if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386")
- # - Only plugins. No package will link to them.
- set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
-
-- if (DISABLE_ADVANCE_SIMD)
-- set(ARCH_FLAG "-msse -msse2 -march=i686")
-- else()
-- # AVX requires some fix of the ABI (mangling) (default 2)
-- # Note: V6 requires GCC 4.7
-- #set(ARCH_FLAG "-march=native -fabi-version=6")
-- set(ARCH_FLAG "-march=native")
-+ if(NOT DEFINED ARCH_FLAG)
-+ if (DISABLE_ADVANCE_SIMD)
-+ set(ARCH_FLAG "-msse -msse2 -march=i686")
-+ else()
-+ # AVX requires some fix of the ABI (mangling) (default 2)
-+ # Note: V6 requires GCC 4.7
-+ #set(ARCH_FLAG "-march=native -fabi-version=6")
-+ set(ARCH_FLAG "-march=native")
-+ endif()
- endif()
-+
- add_definitions(-D_ARCH_32=1 -D_M_X86=1 -D_M_X86_32=1)
- set(_ARCH_32 1)
- set(_M_X86 1)
-@@ -136,11 +139,13 @@ elseif(${PCSX2_TARGET_ARCHITECTURES} MATCHES "x86_64")
- # SuperVU will not be ported
- set(DISABLE_SVU TRUE)
-
-- if (DISABLE_ADVANCE_SIMD)
-- set(ARCH_FLAG "-msse -msse2")
-- else()
-- #set(ARCH_FLAG "-march=native -fabi-version=6")
-- set(ARCH_FLAG "-march=native")
-+ if(NOT DEFINED ARCH_FLAG)
-+ if (DISABLE_ADVANCE_SIMD)
-+ set(ARCH_FLAG "-msse -msse2")
-+ else()
-+ #set(ARCH_FLAG "-march=native -fabi-version=6")
-+ set(ARCH_FLAG "-march=native")
-+ endif()
- endif()
- add_definitions(-D_ARCH_64=1 -D_M_X86=1 -D_M_X86_64=1)
- set(_ARCH_64 1)
-@@ -256,8 +261,12 @@ else()
- set(ASAN_FLAG "")
- endif()
-
-+if(NOT DEFINED OPTIMIZATION_FLAG)
-+ set(OPTIMIZATION_FLAG -O2)
-+endif()
-+
- # Note: -DGTK_DISABLE_DEPRECATED can be used to test a build without gtk deprecated feature. It could be useful to port to a newer API
--set(DEFAULT_GCC_FLAG "${ARCH_FLAG} ${COMMON_FLAG} ${DEFAULT_WARNINGS} ${AGGRESSIVE_WARNING} ${HARDENING_FLAG} ${DEBUG_FLAG} ${ASAN_FLAG}")
-+set(DEFAULT_GCC_FLAG "${ARCH_FLAG} ${COMMON_FLAG} ${DEFAULT_WARNINGS} ${AGGRESSIVE_WARNING} ${HARDENING_FLAG} ${DEBUG_FLAG} ${ASAN_FLAG} ${OPTIMIZATION_FLAG}")
- # c++ only flags
- set(DEFAULT_CPP_FLAG "${DEFAULT_GCC_FLAG} -Wno-invalid-offsetof")
-
-diff --git a/common/src/Utilities/CMakeLists.txt b/common/src/Utilities/CMakeLists.txt
-index 8f97604..f4b6e27 100644
---- a/common/src/Utilities/CMakeLists.txt
-+++ b/common/src/Utilities/CMakeLists.txt
-@@ -14,47 +14,6 @@ set(CommonFlags
- -fno-strict-aliasing
- )
-
--# set optimization flags
--set(OptimizationFlags
-- -falign-functions
-- -falign-jumps
-- -falign-labels
-- -falign-loops
-- -fcaller-saves
-- -fcprop-registers
-- -fcrossjumping
-- -fcse-follow-jumps
-- -fcse-skip-blocks
-- -fdefer-pop
-- -fdelete-null-pointer-checks
-- -fgcse
-- -fgcse-lm
-- -fif-conversion
-- -fif-conversion2
-- -fmerge-constants
-- -foptimize-sibling-calls
-- -fpeephole2
-- -fregmove
-- -freorder-blocks
-- -freorder-functions
-- -frerun-cse-after-loop
-- -fsched-interblock
-- -fsched-spec
-- -fstrict-overflow
-- -fthread-jumps
-- -ftree-ccp
-- -ftree-ch
-- -ftree-copyrename
-- -ftree-dce
-- -ftree-dominator-opts
-- -ftree-fre
-- -ftree-lrs
-- -ftree-pre
-- -ftree-sra
-- -ftree-ter
-- -ftree-vrp
-- -funit-at-a-time)
--
- #Clang doesn't support a few common flags that GCC does.
- if(NOT USE_CLANG)
- set(UtilitiesFinalFlags
-@@ -79,7 +38,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Devel)
- # add defines
- set(UtilitiesFinalFlags
- ${UtilitiesFinalFlags}
-- ${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD
-+ ${CommonFlags} -DPCSX2_DEVBUILD
- )
- endif(CMAKE_BUILD_TYPE STREQUAL Devel)
-
-@@ -89,7 +48,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Release)
- # add defines
- set(UtilitiesFinalFlags
- ${UtilitiesFinalFlags}
-- ${CommonFlags} ${OptimizationFlags}
-+ ${CommonFlags}
- )
- endif(CMAKE_BUILD_TYPE STREQUAL Release)
-
-diff --git a/common/src/x86emitter/CMakeLists.txt b/common/src/x86emitter/CMakeLists.txt
-index b37e22a..a8217fc 100644
---- a/common/src/x86emitter/CMakeLists.txt
-+++ b/common/src/x86emitter/CMakeLists.txt
-@@ -14,47 +14,6 @@ set(CommonFlags
- -fno-strict-aliasing
- )
-
--# set optimization flags
--set(OptimizationFlags
-- -falign-functions
-- -falign-jumps
-- -falign-labels
-- -falign-loops
-- -fcaller-saves
-- -fcprop-registers
-- -fcrossjumping
-- -fcse-follow-jumps
-- -fcse-skip-blocks
-- -fdefer-pop
-- -fdelete-null-pointer-checks
-- -fgcse
-- -fgcse-lm
-- -fif-conversion
-- -fif-conversion2
-- -fmerge-constants
-- -foptimize-sibling-calls
-- -fpeephole2
-- -fregmove
-- -freorder-blocks
-- -freorder-functions
-- -frerun-cse-after-loop
-- -fsched-interblock
-- -fsched-spec
-- -fstrict-overflow
-- -fthread-jumps
-- -ftree-ccp
-- -ftree-ch
-- -ftree-copyrename
-- -ftree-dce
-- -ftree-dominator-opts
-- -ftree-fre
-- -ftree-lrs
-- -ftree-pre
-- -ftree-sra
-- -ftree-ter
-- -ftree-vrp
-- -funit-at-a-time)
--
- #Clang doesn't support a few common flags that GCC does.
- if(NOT USE_CLANG)
- set(x86emitterFinalFlags
-@@ -77,7 +36,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Devel)
- # add defines
- set(x86emitterFinalFlags
- ${x86emitterFinalFlags}
-- ${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD
-+ ${CommonFlags} -DPCSX2_DEVBUILD
- )
- endif(CMAKE_BUILD_TYPE STREQUAL Devel)
-
-@@ -87,7 +46,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Release)
- # add defines
- set(x86emitterFinalFlags
- ${x86emitterFinalFlags}
-- ${CommonFlags} ${OptimizationFlags}
-+ ${CommonFlags}
- )
- endif(CMAKE_BUILD_TYPE STREQUAL Release)
-
-diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
-index 871713e..a98843d 100644
---- a/pcsx2/CMakeLists.txt
-+++ b/pcsx2/CMakeLists.txt
-@@ -27,47 +27,6 @@ set(CommonFlags
- -DWX_PRECOMP
- )
-
--# set optimization flags
--set(OptimizationFlags
-- -falign-functions
-- -falign-jumps
-- -falign-labels
-- -falign-loops
-- -fcaller-saves
-- -fcprop-registers
-- -fcrossjumping
-- -fcse-follow-jumps
-- -fcse-skip-blocks
-- -fdefer-pop
-- -fdelete-null-pointer-checks
-- -fgcse
-- -fgcse-lm
-- -fif-conversion
-- -fif-conversion2
-- -fmerge-constants
-- -foptimize-sibling-calls
-- -fpeephole2
-- -fregmove
-- -freorder-blocks
-- -freorder-functions
-- -frerun-cse-after-loop
-- -fsched-interblock
-- -fsched-spec
-- -fstrict-overflow
-- -fthread-jumps
-- -ftree-ccp
-- -ftree-ch
-- -ftree-copyrename
-- -ftree-dce
-- -ftree-dominator-opts
-- -ftree-fre
-- -ftree-lrs
-- -ftree-pre
-- -ftree-sra
-- -ftree-ter
-- -ftree-vrp
-- -funit-at-a-time)
--
- #Clang doesn't support a few common flags that GCC does.
- if(NOT USE_CLANG)
- set(pcsx2FinalFlags ${CommonFlags} -fno-guess-branch-probability -fno-dse -fno-tree-dse)
-@@ -80,11 +39,11 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
-
- elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
- set(Output pcsx2-dev)
-- set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD)
-+ set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags} -DPCSX2_DEVBUILD)
-
- elseif(CMAKE_BUILD_TYPE STREQUAL Release)
- set(Output pcsx2)
-- set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags} ${OptimizationFlags})
-+ set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags})
-
- endif()
-
-diff --git a/plugins/CDVDiso/src/CMakeLists.txt b/plugins/CDVDiso/src/CMakeLists.txt
-index 519c92a..97cb832 100644
---- a/plugins/CDVDiso/src/CMakeLists.txt
-+++ b/plugins/CDVDiso/src/CMakeLists.txt
-@@ -8,21 +8,7 @@ endif()
-
- # plugin name
- set(Output CDVDiso)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(CDVDisoFinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(CDVDisoFinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(CDVDisoFinalFlags ${OptimizationFlags})
--
--endif()
-+set(CDVDisoFinalFlags "")
-
- # CDVDiso sources
- set(CDVDisoSources
-diff --git a/plugins/CDVDlinuz/Src/CMakeLists.txt b/plugins/CDVDlinuz/Src/CMakeLists.txt
-index 943780f..f02198d 100644
---- a/plugins/CDVDlinuz/Src/CMakeLists.txt
-+++ b/plugins/CDVDlinuz/Src/CMakeLists.txt
-@@ -2,26 +2,7 @@
-
- # plugin name
- set(Output CDVDlinuz)
--
--set(CommonFlags
-- -D_LARGEFILE64_SOURCE
-- )
--
--set(OptimizationFlags
-- -O2
-- -fomit-frame-pointer
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(CDVDlinuzFinalFlags ${CommonFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(CDVDlinuzFinalFlags ${CommonFlags} ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(CDVDlinuzFinalFlags ${CommonFlags} ${OptimizationFlags})
--
--endif()
-+set(CDVDlinuzFinalFlags -D_LARGEFILE64_SOURCE)
-
- # CDVDlinuz sources
- set(CDVDlinuzSources
-diff --git a/plugins/CDVDnull/CMakeLists.txt b/plugins/CDVDnull/CMakeLists.txt
-index 4fde2f7..5c84959 100644
---- a/plugins/CDVDnull/CMakeLists.txt
-+++ b/plugins/CDVDnull/CMakeLists.txt
-@@ -8,21 +8,7 @@ endif()
-
- # plugin name
- set(Output CDVDnull)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(CDVDnullFinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(CDVDnullFinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(CDVDnullFinalFlags ${OptimizationFlags})
--
--endif()
-+set(CDVDnullFinalFlags "")
-
- # CDVDnull sources
- set(CDVDnullSources
-diff --git a/plugins/FWnull/CMakeLists.txt b/plugins/FWnull/CMakeLists.txt
-index fd5a45e..aaf9e4e 100644
---- a/plugins/FWnull/CMakeLists.txt
-+++ b/plugins/FWnull/CMakeLists.txt
-@@ -8,21 +8,7 @@ endif()
-
- # plugin name
- set(Output FWnull-0.7.0)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(FWnullFinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(FWnullFinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(FWnullFinalFlags ${OptimizationFlags})
--
--endif()
-+set(FWnullFinalFlags "")
-
- # FWnull sources
- set(FWnullSources
-diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
-index 13b30c7..6fd6253 100644
---- a/plugins/GSdx/CMakeLists.txt
-+++ b/plugins/GSdx/CMakeLists.txt
-@@ -18,19 +18,14 @@ set(CommonFlags
- -Wunused-variable # __dummy variable need to be investigated
- )
-
--set(OptimizationFlags
-- -O2
-- )
--
--
- if(CMAKE_BUILD_TYPE STREQUAL Debug)
- set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} -D_DEBUG)
-
- elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -D_DEVEL)
-+ set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} -D_DEVEL)
-
- elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -W)
-+ set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} -W)
-
- endif()
-
-diff --git a/plugins/GSnull/CMakeLists.txt b/plugins/GSnull/CMakeLists.txt
-index 2216e17..3bde988 100644
---- a/plugins/GSnull/CMakeLists.txt
-+++ b/plugins/GSnull/CMakeLists.txt
-@@ -8,21 +8,7 @@ endif()
-
- # plugin name
- set(Output GSnull)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(GSnullFinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(GSnullFinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(GSnullFinalFlags ${OptimizationFlags})
--
--endif()
-+set(GSnullFinalFlags "")
-
- # GSnull sources
- set(GSnullSources
-diff --git a/plugins/PadNull/CMakeLists.txt b/plugins/PadNull/CMakeLists.txt
-index acbe758..18b1b6c 100644
---- a/plugins/PadNull/CMakeLists.txt
-+++ b/plugins/PadNull/CMakeLists.txt
-@@ -7,21 +7,7 @@ endif()
-
- # plugin name
- set(Output PADnull)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(PadNullFinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(PadNullFinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(PadNullFinalFlags ${OptimizationFlags})
--
--endif()
-+set(PadNullFinalFlags "")
-
- # PadNull sources
- set(PadNullSources
-diff --git a/plugins/SPU2null/CMakeLists.txt b/plugins/SPU2null/CMakeLists.txt
-index 5409543..620a521 100644
---- a/plugins/SPU2null/CMakeLists.txt
-+++ b/plugins/SPU2null/CMakeLists.txt
-@@ -8,21 +8,7 @@ endif()
-
- # plugin name
- set(Output SPU2null)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(SPU2nullFinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(SPU2nullFinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(SPU2nullFinalFlags ${OptimizationFlags})
--
--endif()
-+set(SPU2nullFinalFlags "")
-
- # SPU2null sources
- set(SPU2nullSources
-diff --git a/plugins/USBnull/CMakeLists.txt b/plugins/USBnull/CMakeLists.txt
-index c84890e..7892d03 100644
---- a/plugins/USBnull/CMakeLists.txt
-+++ b/plugins/USBnull/CMakeLists.txt
-@@ -8,21 +8,7 @@ endif()
-
- # plugin name
- set(Output USBnull-0.7.0)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(USBnullFinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(USBnullFinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(USBnullFinalFlags ${OptimizationFlags})
--
--endif()
-+set(USBnullFinalFlags "")
-
- # USBnull sources
- set(USBnullSources
-diff --git a/plugins/dev9null/CMakeLists.txt b/plugins/dev9null/CMakeLists.txt
-index 09d8bee..b819985 100644
---- a/plugins/dev9null/CMakeLists.txt
-+++ b/plugins/dev9null/CMakeLists.txt
-@@ -8,21 +8,7 @@ endif()
-
- # plugin name
- set(Output dev9null-0.5.0)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(dev9nullFinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(dev9nullFinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(dev9nullFinalFlags ${OptimizationFlags})
--
--endif()
-+set(dev9nullFinalFlags "")
-
- # dev9null sources
- set(dev9nullSources
-diff --git a/plugins/onepad/CMakeLists.txt b/plugins/onepad/CMakeLists.txt
-index 6a12cd7..68ffb82 100644
---- a/plugins/onepad/CMakeLists.txt
-+++ b/plugins/onepad/CMakeLists.txt
-@@ -8,21 +8,7 @@ endif()
-
- # plugin name
- set(Output onepad-1.1.0)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(onepadFinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(onepadFinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(onepadFinalFlags ${OptimizationFlags})
--
--endif()
-+set(onepadFinalFlags "")
-
- # onepad sources
- set(onepadSources
-diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt
-index 720c4ac..0180704 100644
---- a/plugins/spu2-x/src/CMakeLists.txt
-+++ b/plugins/spu2-x/src/CMakeLists.txt
-@@ -14,21 +14,7 @@ endif()
-
- # plugin name
- set(Output spu2x-2.0.0)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(spu2xFinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(spu2xFinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(spu2xFinalFlags ${OptimizationFlags})
--
--endif()
-+set(spu2xFinalFlags "")
-
- # spu2x sources
- set(spu2xSources
-diff --git a/plugins/zerogs/opengl/CMakeLists.txt b/plugins/zerogs/opengl/CMakeLists.txt
-index fd33949..79716c6 100644
---- a/plugins/zerogs/opengl/CMakeLists.txt
-+++ b/plugins/zerogs/opengl/CMakeLists.txt
-@@ -7,10 +7,6 @@ set(CommonFlags
- -Wall
- )
-
--set(OptimizationFlags
-- -O2
-- )
--
- # Debug - Build
- if(CMAKE_BUILD_TYPE STREQUAL Debug)
- # add defines
-@@ -20,13 +16,13 @@ endif(CMAKE_BUILD_TYPE STREQUAL Debug)
- # Devel - Build
- if(CMAKE_BUILD_TYPE STREQUAL Devel)
- # add defines
-- add_definitions(${CommonFlags} ${OptimizationFlags})
-+ add_definitions(${CommonFlags})
- endif(CMAKE_BUILD_TYPE STREQUAL Devel)
-
- # Release - Build
- if(CMAKE_BUILD_TYPE STREQUAL Release)
- # add defines
-- add_definitions(${CommonFlags} ${OptimizationFlags})
-+ add_definitions(${CommonFlags})
- endif(CMAKE_BUILD_TYPE STREQUAL Release)
-
- # zerogs sources
-diff --git a/plugins/zerospu2/CMakeLists.txt b/plugins/zerospu2/CMakeLists.txt
-index c3e3243..9291706 100644
---- a/plugins/zerospu2/CMakeLists.txt
-+++ b/plugins/zerospu2/CMakeLists.txt
-@@ -8,21 +8,7 @@ endif()
-
- # plugin name
- set(Output zerospu2)
--
--set(OptimizationFlags
-- -O2
-- )
--
--if(CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(zerospu2FinalFlags "")
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-- set(zerospu2FinalFlags ${OptimizationFlags})
--
--elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-- set(zerospu2FinalFlags ${OptimizationFlags})
--
--endif(CMAKE_BUILD_TYPE STREQUAL Release)
-+set(zerospu2FinalFlags "")
-
- # zerospu2 sources
- set(zerospu2Sources
-diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt
-index fe93246..4798097 100644
---- a/plugins/zzogl-pg/opengl/CMakeLists.txt
-+++ b/plugins/zzogl-pg/opengl/CMakeLists.txt
-@@ -26,10 +26,6 @@ set(CommonFlags
- -Wunused-variable
- )
-
--set(OptimizationFlags
-- -O2
-- )
--
- #Clang doesn't support a few common flags that GCC does.
- if(NOT USE_CLANG)
- set(zzoglFinalFlags
-@@ -46,12 +42,12 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
- elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
- set(zzoglFinalFlags
- ${zzoglFinalFlags}
-- ${CommonFlags} ${OptimizationFlags} -g -W -DZEROGS_DEVBUILD
-+ ${CommonFlags} -g -W -DZEROGS_DEVBUILD
- )
- elseif(CMAKE_BUILD_TYPE STREQUAL Release)
- set(zzoglFinalFlags
- ${zzoglFinalFlags}
-- ${CommonFlags} ${OptimizationFlags} -W
-+ ${CommonFlags} -W
- )
- endif()
-
-diff --git a/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt b/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt
-index 156189c..ad1eb49 100644
---- a/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt
-+++ b/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt
-@@ -17,21 +17,17 @@ set(CommonFlags
- -DNVIDIA_CG_API
- )
-
--set(OptimizationFlags
-- -O2
-- )
--
- if(CMAKE_BUILD_TYPE STREQUAL Debug)
- set(zerogsshadersFinalFlags
- ${CommonFlags} -D_DEBUG
- )
- elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
- set(zerogsshadersFinalFlags
-- ${CommonFlags} ${OptimizationFlags} -g -W -DZEROGS_DEVBUILD
-+ ${CommonFlags} -g -W -DZEROGS_DEVBUILD
- )
- elseif(CMAKE_BUILD_TYPE STREQUAL Release)
- set(zerogsshadersFinalFlags
-- ${CommonFlags} ${OptimizationFlags} -W
-+ ${CommonFlags} -W
- )
- endif(CMAKE_BUILD_TYPE STREQUAL Release)
-
-diff --git a/tools/bin2cpp/CMakeLists.txt b/tools/bin2cpp/CMakeLists.txt
-index 1689620..1e3e45c 100644
---- a/tools/bin2cpp/CMakeLists.txt
-+++ b/tools/bin2cpp/CMakeLists.txt
-@@ -7,7 +7,7 @@ set(bin2cppName bin2cpp)
- if(CMAKE_BUILD_TYPE STREQUAL Debug)
- # add defines
- set(bin2cppFinalFlags
-- -O2 -s -Wall -fexceptions
-+ -s -Wall -fexceptions
- )
- endif(CMAKE_BUILD_TYPE STREQUAL Debug)
-
-@@ -15,7 +15,7 @@ endif(CMAKE_BUILD_TYPE STREQUAL Debug)
- if(CMAKE_BUILD_TYPE STREQUAL Devel)
- # add defines
- set(bin2cppFinalFlags
-- -O2 -s -Wall -fexceptions
-+ -s -Wall -fexceptions
- )
- endif(CMAKE_BUILD_TYPE STREQUAL Devel)
-
-@@ -23,7 +23,7 @@ endif(CMAKE_BUILD_TYPE STREQUAL Devel)
- if(CMAKE_BUILD_TYPE STREQUAL Release)
- # add defines
- set(bin2cppFinalFlags
-- -O2 -s -Wall -fexceptions
-+ -s -Wall -fexceptions
- )
- endif(CMAKE_BUILD_TYPE STREQUAL Release)
-
---
-2.4.6
-
diff --git a/games-emulation/pcsx2/files/pcsx2-1.3.1-egl-optional.patch b/games-emulation/pcsx2/files/pcsx2-1.3.1-egl-optional.patch
deleted file mode 100644
index 9bdf231..0000000
--- a/games-emulation/pcsx2/files/pcsx2-1.3.1-egl-optional.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 9cd13ca5b5a6a90c21abf1f41725e52efe4774c0 Mon Sep 17 00:00:00 2001
-From: nE0sIghT <ykonotopov@gmail.com>
-Date: Mon, 10 Aug 2015 19:11:00 +0300
-Subject: [PATCH 1/3] gsdx-linux: Don't enable EGL by default
-
-I was hoping that EGL become a standard much more faster. Currently it is an useless dep
-so let's disable it by default.
-
-Only check for EGL if using EGL_API.
----
- cmake/SearchForStuff.cmake | 5 +++--
- cmake/SelectPcsx2Plugins.cmake | 2 +-
- plugins/GSdx/CMakeLists.txt | 27 ++++++++++-----------------
- plugins/GSdx/GS.cpp | 8 ++++----
- plugins/GSdx/GSWndEGL.cpp | 2 +-
- plugins/GSdx/GSWndEGL.h | 21 +--------------------
- 6 files changed, 20 insertions(+), 45 deletions(-)
-
-diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
-index 8c8918e..b43a547 100644
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -69,8 +69,9 @@ include(CheckLib)
- if(Linux)
- check_lib(AIO aio libaio.h)
- endif()
--check_lib(EGL EGL EGL/egl.h)
--check_lib(GLESV2 GLESv2 GLES3/gl3ext.h) # NOTE: looking for GLESv3, not GLESv2
-+if(EGL_API)
-+ check_lib(EGL EGL EGL/egl.h)
-+endif()
- check_lib(PORTAUDIO portaudio portaudio.h pa_linux_alsa.h)
- check_lib(SOUNDTOUCH SoundTouch soundtouch/SoundTouch.h)
-
-diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake
-index 726dc2d..ee8138b 100644
---- a/cmake/SelectPcsx2Plugins.cmake
-+++ b/cmake/SelectPcsx2Plugins.cmake
-@@ -144,7 +144,7 @@ endif()
- # requires: -OpenGL
- # -X11
- #---------------------------------------
--if(OPENGL_FOUND AND X11_FOUND AND EGL_FOUND AND GTKn_FOUND)
-+if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND (EGL_FOUND OR NOT EGL_API))
- set(GSdx TRUE)
- elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx")
- set(GSdx FALSE)
-diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
-index 8859044..13b30c7 100644
---- a/plugins/GSdx/CMakeLists.txt
-+++ b/plugins/GSdx/CMakeLists.txt
-@@ -38,8 +38,8 @@ if(XDG_STD)
- set(GSdxFinalFlags ${GSdxFinalFlags} -DXDG_STD)
- endif()
-
--if(GLES_API AND GLESV2_FOUND)
-- set(GSdxFinalFlags ${GSdxFinalFlags} -DENABLE_GLES)
-+if(EGL_API AND EGL_FOUND)
-+ set(GSdxFinalFlags ${GSdxFinalFlags} -DEGL_SUPPORTED)
- endif()
-
- #Clang doesn't support a few common flags that GCC does.
-@@ -198,25 +198,18 @@ set(GSdxFinalLibs
- ${X11_LIBRARIES}
- )
-
--if(GLES_API AND GLESV2_FOUND)
-- set(GSdxFinalLibs
-- ${GSdxFinalLibs}
-- ${GLESV2_LIBRARIES}
-- )
--else()
-- set(GSdxFinalLibs
-- ${GSdxFinalLibs}
-- ${OPENGL_LIBRARIES}
-- )
--endif()
--
--set(GSdxFinalLibs
-- ${GSdxFinalLibs}
-- ${EGL_LIBRARIES}
-+set(GSdxFinalLibs ${GSdxFinalLibs}
-+ ${OPENGL_LIBRARIES}
- ${GTK2_LIBRARIES}
- ${LIBC_LIBRARIES}
- )
-
-+if(EGL_API AND EGL_FOUND)
-+ set(GSdxFinalLibs ${GSdxFinalLibs}
-+ ${EGL_LIBRARIES}
-+ )
-+endif()
-+
- # Generate Glsl header file. Protect with REBUILD_SHADER to avoid build-dependency on PERL
- if (REBUILD_SHADER)
- add_custom_command(OUTPUT res/glsl_source.h COMMAND perl ${CMAKE_SOURCE_DIR}/linux_various/glsl2h.pl)
-diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp
-index 3ffb5e8..4836192 100644
---- a/plugins/GSdx/GS.cpp
-+++ b/plugins/GSdx/GS.cpp
-@@ -291,12 +291,12 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
- break;
- }
- #else
--#ifdef ENABLE_GLES
-- wnd[0] = NULL;
--#else
- wnd[0] = new GSWndOGL();
--#endif
-+#ifdef EGL_SUPPORTED
- wnd[1] = new GSWndEGL();
-+#else
-+ wnd[1] = NULL;
-+#endif
- #endif
- }
- }
-diff --git a/plugins/GSdx/GSWndEGL.cpp b/plugins/GSdx/GSWndEGL.cpp
-index 491f34f..f69ff0c 100644
---- a/plugins/GSdx/GSWndEGL.cpp
-+++ b/plugins/GSdx/GSWndEGL.cpp
-@@ -22,7 +22,7 @@
- #include "stdafx.h"
- #include "GSWndEGL.h"
-
--#if defined(__linux__)
-+#if defined(__linux__) && defined(EGL_SUPPORTED)
-
- GSWndEGL::GSWndEGL()
- : m_NativeWindow(0), m_NativeDisplay(NULL)
-diff --git a/plugins/GSdx/GSWndEGL.h b/plugins/GSdx/GSWndEGL.h
-index c5a2573..17804bb 100644
---- a/plugins/GSdx/GSWndEGL.h
-+++ b/plugins/GSdx/GSWndEGL.h
-@@ -21,30 +21,11 @@
-
- #include "GSWnd.h"
-
--#if defined(__linux__)
-+#if defined(__linux__) && defined(EGL_SUPPORTED)
- #include <X11/Xlib.h>
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-
--// Need at least MESA 9.0 (plan for october/november 2012)
--// So force the destiny to at least check the compilation
--#ifndef EGL_KHR_create_context
--#define EGL_KHR_create_context 1
--#define EGL_CONTEXT_MAJOR_VERSION_KHR EGL_CONTEXT_CLIENT_VERSION
--#define EGL_CONTEXT_MINOR_VERSION_KHR 0x30FB
--#define EGL_CONTEXT_FLAGS_KHR 0x30FC
--#define EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR 0x30FD
--#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR 0x31BD
--#define EGL_NO_RESET_NOTIFICATION_KHR 0x31BE
--#define EGL_LOSE_CONTEXT_ON_RESET_KHR 0x31BF
--#define EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR 0x00000001
--#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR 0x00000002
--#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR 0x00000004
--#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR 0x00000001
--#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR 0x00000002
--#endif
--
--
- class GSWndEGL : public GSWndGL
- {
- EGLNativeWindowType m_NativeWindow;
---
-2.4.6
-
diff --git a/games-emulation/pcsx2/files/pcsx2-1.3.1-packaging.patch b/games-emulation/pcsx2/files/pcsx2-1.3.1-packaging.patch
deleted file mode 100644
index 6c009e6..0000000
--- a/games-emulation/pcsx2/files/pcsx2-1.3.1-packaging.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 8e625d61b0a895074d35d6d227008664360e8458 Mon Sep 17 00:00:00 2001
-From: nE0sIghT <ykonotopov@gmail.com>
-Date: Mon, 10 Aug 2015 19:15:40 +0300
-Subject: [PATCH 2/3] cmake: fatal error if miss dependencies in package mode
- Moved zzogl to extra plugins
-
----
- cmake/SelectPcsx2Plugins.cmake | 56 +++++++++++++++++++++---------------------
- 1 file changed, 28 insertions(+), 28 deletions(-)
-
-diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake
-index ee8138b..bb7307e 100644
---- a/cmake/SelectPcsx2Plugins.cmake
-+++ b/cmake/SelectPcsx2Plugins.cmake
-@@ -15,6 +15,14 @@ else(GLSL_API)
- set(msg_dep_zzogl "check these libraries -> glew (>=1.6), jpeg (>=6.2), opengl, X11, nvidia-cg-toolkit (>=2.1), pcsx2 common libs")
- endif()
-
-+macro(print_dep str dep)
-+ if (PACKAGE_MODE)
-+ message(FATAL_ERROR "${str}:${dep}")
-+ else()
-+ message(STATUS "${str}:${dep}")
-+ endif()
-+endmacro(print_dep)
-+
- #-------------------------------------------------------------------------------
- # Pcsx2 core & common libs
- #-------------------------------------------------------------------------------
-@@ -43,8 +51,7 @@ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/common/src")
- set(common_libs FALSE)
- else()
- set(common_libs FALSE)
-- message(STATUS "Skip build of common libraries: miss some dependencies")
-- message(STATUS "${msg_dep_common_libs}")
-+ print_dep("Skip build of common libraries: miss some dependencies" "${msg_dep_common_libs}")
- endif()
-
- #---------------------------------------
-@@ -62,14 +69,12 @@ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/pcsx2")
- set(pcsx2_core FALSE)
- else()
- set(pcsx2_core FALSE)
-- message(STATUS "Skip build of pcsx2 core: miss some dependencies")
-- message(STATUS "${msg_dep_pcsx2}")
-+ print_dep("Skip build of pcsx2 core: miss some dependencies" "${msg_dep_pcsx2}")
- endif()
- # Linux need also gtk2
- if(UNIX AND pcsx2_core AND NOT GTKn_FOUND)
- set(pcsx2_core FALSE)
-- message(STATUS "Skip build of pcsx2 core: miss some dependencies")
-- message(STATUS "${msg_dep_pcsx2}")
-+ print_dep("Skip build of pcsx2 core: miss some dependencies" "${msg_dep_pcsx2}")
- endif()
-
-
-@@ -102,8 +107,7 @@ if(EXTRA_PLUGINS)
- set(CDVDiso FALSE)
- else()
- set(CDVDiso FALSE)
-- message(STATUS "Skip build of CDVDiso: miss some dependencies")
-- message(STATUS "${msg_dep_cdvdiso}")
-+ print_dep("Skip build of CDVDiso: miss some dependencies" "${msg_dep_cdvdiso}")
- endif()
- endif()
-
-@@ -147,11 +151,10 @@ endif()
- if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND (EGL_FOUND OR NOT EGL_API))
- set(GSdx TRUE)
- elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx")
-- set(GSdx FALSE)
-+ set(GSdx FALSE)
- else()
-- set(GSdx FALSE)
-- message(STATUS "Skip build of GSdx: miss some dependencies")
-- message(STATUS "${msg_dep_gsdx}")
-+ set(GSdx FALSE)
-+ print_dep("Skip build of GSdx: miss some dependencies" "${msg_dep_gsdx}")
- endif()
- #---------------------------------------
-
-@@ -170,8 +173,7 @@ if(EXTRA_PLUGINS)
- set(zerogs FALSE)
- else()
- set(zerogs FALSE)
-- message(STATUS "Skip build of zerogs: miss some dependencies")
-- message(STATUS "${msg_dep_zerogs}")
-+ print_dep("Skip build of zerogs: miss some dependencies" "${msg_dep_zerogs}")
- endif()
- endif()
- #---------------------------------------
-@@ -186,14 +188,15 @@ endif()
- # -JPEG
- # -common_libs
- #---------------------------------------
--if((GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND JPEG_FOUND AND common_libs AND GTKn_FOUND) AND (CG_FOUND OR GLSL_API))
-- set(zzogl TRUE)
--elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/zzogl-pg")
-- set(zzogl FALSE)
--else()
-- set(zzogl FALSE)
-- message(STATUS "Skip build of zzogl: miss some dependencies")
-- message(STATUS "${msg_dep_zzogl}")
-+if(EXTRA_PLUGINS)
-+ if((GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND JPEG_FOUND AND common_libs AND GTKn_FOUND) AND (CG_FOUND OR GLSL_API))
-+ set(zzogl TRUE)
-+ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/zzogl-pg")
-+ set(zzogl FALSE)
-+ else()
-+ set(zzogl FALSE)
-+ print_dep("Skip build of zzogl: miss some dependencies" "${msg_dep_zzogl}")
-+ endif()
- endif()
- #---------------------------------------
-
-@@ -216,8 +219,7 @@ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/onepad")
- set(onepad FALSE)
- else()
- set(onepad FALSE)
-- message(STATUS "Skip build of onepad: miss some dependencies")
-- message(STATUS "${msg_dep_onepad}")
-+ print_dep("Skip build of onepad: miss some dependencies" "${msg_dep_onepad}")
- endif()
- #---------------------------------------
-
-@@ -244,8 +246,7 @@ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/spu2-x")
- set(spu2-x FALSE)
- else()
- set(spu2-x FALSE)
-- message(STATUS "Skip build of spu2-x: miss some dependencies")
-- message(STATUS "${msg_dep_spu2x}")
-+ print_dep("Skip build of spu2-x: miss some dependencies" "${msg_dep_spu2x}")
- endif()
- #---------------------------------------
-
-@@ -266,8 +267,7 @@ if(EXTRA_PLUGINS)
- set(zerospu2 FALSE)
- else()
- set(zerospu2 FALSE)
-- message(STATUS "Skip build of zerospu2: miss some dependencies")
-- message(STATUS "${msg_dep_zerospu2}")
-+ print_dep("Skip build of zerospu2: miss some dependencies" "${msg_dep_zerospu2}")
- endif()
- endif()
- #---------------------------------------
---
-2.4.6
-
diff --git a/games-emulation/pcsx2/pcsx2-1.3.1.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
similarity index 86%
rename from games-emulation/pcsx2/pcsx2-1.3.1.ebuild
rename to games-emulation/pcsx2/pcsx2-1.4.0.ebuild
index e839ef2..06305d2 100644
--- a/games-emulation/pcsx2/pcsx2-1.3.1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
@@ -4,12 +4,13 @@
EAPI=5
PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW"
+MY_PV="${PV/_/-}"
inherit cmake-utils l10n multilib toolchain-funcs wxwidgets
DESCRIPTION="A PlayStation 2 emulator"
HOMEPAGE="http://www.pcsx2.net"
-SRC_URI="https://github.com/PCSX2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -18,14 +19,16 @@ IUSE=""
RDEPEND="
app-arch/bzip2[abi_x86_32(-)]
+ app-arch/xz-utils[abi_x86_32(-)]
dev-libs/libaio[abi_x86_32(-)]
media-libs/alsa-lib[abi_x86_32(-)]
+ media-libs/libpng:=[abi_x86_32(-)]
media-libs/libsdl[abi_x86_32(-),joystick,sound]
- media-libs/portaudio[abi_x86_32(-)]
media-libs/libsoundtouch[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
+ media-libs/portaudio[abi_x86_32(-)]
>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
virtual/jpeg:62[abi_x86_32(-)]
+ virtual/opengl[abi_x86_32(-)]
x11-libs/gtk+:2[abi_x86_32(-)]
x11-libs/libICE[abi_x86_32(-)]
x11-libs/libX11[abi_x86_32(-)]
@@ -35,14 +38,11 @@ RDEPEND="
# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
DEPEND="${RDEPEND}
>=app-eselect/eselect-opengl-1.3.1
+ dev-cpp/pngpp
>=dev-cpp/sparsehash-1.5
"
-PATCHES=(
- "${FILESDIR}"/"${P}-egl-optional.patch"
- "${FILESDIR}"/"${P}-packaging.patch"
- "${FILESDIR}"/"${P}-cflags.patch"
-)
+S="${WORKDIR}/${PN}-${MY_PV}"
clean_locale() {
rm -R "${S}"/locales/"${1}" || die
@@ -50,8 +50,8 @@ clean_locale() {
pkg_setup() {
if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
- if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
- die "${PN} does not compile with gcc less than 4.7"
+ if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
+ die "${PN} does not compile with gcc less than 4.8"
fi
fi
}
@@ -76,18 +76,18 @@ src_configure() {
local mycmakeargs=(
-DARCH_FLAG=
- -DEGL_API=FALSE
+ -DDISABLE_BUILD_DATE=TRUE
+ -DDISABLE_PCSX2_WRAPPER=TRUE
-DEXTRA_PLUGINS=FALSE
- -DGLES_API=FALSE
- -DGLSL_API=FALSE
- -DGTK3_API=FALSE
- -DPACKAGE_MODE=TRUE
-DOPTIMIZATION_FLAG=
+ -DPACKAGE_MODE=TRUE
-DXDG_STD=TRUE
-DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
-DDOC_DIR=/usr/share/doc/"${PF}"
+ -DEGL_API=FALSE
+ -DGTK3_API=FALSE
-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
# wxGTK must be built against same sdl version
-DSDL2_API=FALSE
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2017-01-18 10:46 David Seifert
0 siblings, 0 replies; 20+ messages in thread
From: David Seifert @ 2017-01-18 10:46 UTC (permalink / raw
To: gentoo-commits
commit: 97658bc43cdb51c3159562d76312e0fc1689c9a6
Author: Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Mon Jan 9 19:24:29 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 10:45:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97658bc4
games-emulation/pcsx2: fixed compilation with gcc 5
Gentoo-Bug: https://bugs.gentoo.org/605162
Closes: https://github.com/gentoo/gentoo/pull/3402
games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch | 26 ++++++++++++++++++++++
games-emulation/pcsx2/pcsx2-1.4.0.ebuild | 4 +++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch
new file mode 100644
index 00000000..cfc941f
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch
@@ -0,0 +1,26 @@
+From 71991f24ef75b7da678d8de8d593bf82677d2708 Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Mon, 9 Jan 2017 18:37:44 +0400
+Subject: [PATCH] x86emitter: gcc 5 compilation fix
+
+---
+ common/src/x86emitter/cpudetect.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp
+index 717ca89..cf94d7f 100644
+--- a/common/src/x86emitter/cpudetect.cpp
++++ b/common/src/x86emitter/cpudetect.cpp
+@@ -16,6 +16,9 @@
+ #include "PrecompiledHeader.h"
+ #include "cpudetect_internal.h"
+ #include "internal.h"
++#if defined(__GNUC__)
++#include "x86intrin.h"
++#endif
+
+ using namespace x86Emitter;
+
+--
+2.10.2
+
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
index 205910c..d18fd53 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN}-${MY_PV}"
+PATCHES=( "${FILESDIR}"/${P}-gcc5.patch )
+
clean_locale() {
rm -R "${S}"/locales/"${1}" || die
}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2018-07-23 6:17 Sergei Trofimovich
0 siblings, 0 replies; 20+ messages in thread
From: Sergei Trofimovich @ 2018-07-23 6:17 UTC (permalink / raw
To: gentoo-commits
commit: 2125b084cea6e23fc24d07e748dc0a3b5521c8f9
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 06:16:50 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 06:17:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2125b084
games-emulation/pcsx2: tweak for gcc-8
It's a backport of upstream commit 171e7f016dc9e132f9faf40a22f0312d45d356a5
"common: Work around GCC8 _xgetbv bug"
Bug: https://gcc.gnu.org/PR85684
Package-Manager: Portage-2.3.43, Repoman-2.3.10
.../pcsx2/files/pcsx2-1.4.0-xgetbv.patch | 26 ++++++++++++++++++++++
games-emulation/pcsx2/pcsx2-1.4.0.ebuild | 7 ++++--
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch
new file mode 100644
index 00000000000..e90b0df9b6e
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch
@@ -0,0 +1,26 @@
+From 171e7f016dc9e132f9faf40a22f0312d45d356a5 Mon Sep 17 00:00:00 2001
+From: Jonathan Li <jonathan.li@hotmail.co.uk>
+Date: Fri, 11 May 2018 01:42:27 +0100
+Subject: [PATCH] common: Work around GCC8 _xgetbv bug
+
+clang and earlier GCC versions do not provide the _xgetbv intrinsic.
+GCC8 does, but unfortunately it's broken.
+(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85684).
+
+Re-use our _xgetbv implementation to avoid the bug, but rename it to
+avoid compilation errors as well.
+---
+ common/include/x86emitter/x86_intrin.h | 7 ++++---
+ common/src/x86emitter/cpudetect.cpp | 2 +-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+--- a/common/include/intrin_x86.h
++++ b/common/include/intrin_x86.h
+@@ -107 +107 @@ static __inline__ __attribute__((always_inline)) void __cpuidex(int CPUInfo[], c
+-static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv(unsigned int index)
++static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv_pcsx2(unsigned int index)
+--- a/common/src/x86emitter/cpudetect.cpp
++++ b/common/src/x86emitter/cpudetect.cpp
+@@ -273 +276 @@ void x86capabilities::Identify()
+- if((_xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS).
++ if((_xgetbv_pcsx2(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS).
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
index cfd1606f91a..ac18cbd565e 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -43,7 +43,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN}-${MY_PV}"
-PATCHES=( "${FILESDIR}"/${P}-gcc5.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc5.patch
+ "${FILESDIR}"/${P}-xgetbv.patch
+)
clean_locale() {
rm -R "${S}"/locales/"${1}" || die
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2020-10-27 7:35 Joonas Niilola
0 siblings, 0 replies; 20+ messages in thread
From: Joonas Niilola @ 2020-10-27 7:35 UTC (permalink / raw
To: gentoo-commits
commit: 5d316c08962efd9c4f8dd213206aaea9de686f8f
Author: Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Sat Oct 24 14:44:09 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 07:35:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d316c08
games-emulation/pcsx2: fixed sandbox violation
Closes: https://bugs.gentoo.org/730536
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../pcsx2/files/pcsx2-1.6.0-disable-setcap.patch | 49 +++++++++
games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild | 110 +++++++++++++++++++++
2 files changed, 159 insertions(+)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.6.0-disable-setcap.patch b/games-emulation/pcsx2/files/pcsx2-1.6.0-disable-setcap.patch
new file mode 100644
index 00000000000..07040b62b91
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.6.0-disable-setcap.patch
@@ -0,0 +1,49 @@
+From 4366d2973316a6c250a17cf9a170f187e2ed9f93 Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Sat, 17 Oct 2020 12:05:36 +0400
+Subject: [PATCH] Added cmake options to bypass setcap execution.
+
+This call became a problem with distributions (eg Gentoo GNU/Linux) that
+builds PCSX2 in sandboxed environment which disallows setcap execution.
+
+Signed-off-by: Yuri Konotopov <ykonotopov@gnome.org>
+---
+ cmake/BuildParameters.cmake | 1 +
+ pcsx2/CMakeLists.txt | 10 ++++++----
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
+index 235bdb8e5..a3ff0041f 100644
+--- a/cmake/BuildParameters.cmake
++++ b/cmake/BuildParameters.cmake
+@@ -46,6 +46,7 @@ option(GSDX_LEGACY "Build a GSdx legacy plugin compatible with GL3.3")
+ option(PACKAGE_MODE "Use this option to ease packaging of PCSX2 (developer/distribution option)")
+ option(DISABLE_CHEATS_ZIP "Disable including the cheats_ws.zip file")
+ option(DISABLE_PCSX2_WRAPPER "Disable including the PCSX2-linux.sh file")
++option(DISABLE_SETCAP "Do not set files capabilities")
+ option(XDG_STD "Use XDG standard path instead of the standard PCSX2 path")
+ option(EXTRA_PLUGINS "Build various 'extra' plugins")
+ option(SDL2_API "Use SDL2 on spu2x and onepad (wxWidget mustn't be built with SDL1.2 support" ON)
+diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
+index 6839089d7..6e129caca 100644
+--- a/pcsx2/CMakeLists.txt
++++ b/pcsx2/CMakeLists.txt
+@@ -739,9 +739,11 @@ endif()
+ add_pcsx2_executable(${Output} "${pcsx2FinalSources}" "${pcsx2FinalLibs}" "${pcsx2FinalFlags}")
+
+ if(dev9ghzdrk)
+- if(PACKAGE_MODE)
+- install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${BIN_DIR}/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${BIN_DIR}/${Output}; set +x\")")
+- else()
+- install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${CMAKE_SOURCE_DIR}/bin/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${CMAKE_SOURCE_DIR}/bin/${Output}; set +x\")")
++ if(NOT DISABLE_SETCAP)
++ if(PACKAGE_MODE)
++ install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${BIN_DIR}/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${BIN_DIR}/${Output}; set +x\")")
++ else()
++ install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${CMAKE_SOURCE_DIR}/bin/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${CMAKE_SOURCE_DIR}/bin/${Output}; set +x\")")
++ endif()
+ endif()
+ endif()
+--
+2.26.2
+
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
new file mode 100644
index 00000000000..0333043f873
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV="${PV/_/-}"
+
+inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
+
+DESCRIPTION="A PlayStation 2 emulator"
+HOMEPAGE="https://www.pcsx2.net"
+SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+ app-arch/bzip2[abi_x86_32(-)]
+ app-arch/xz-utils[abi_x86_32(-)]
+ dev-libs/libaio[abi_x86_32(-)]
+ dev-libs/libxml2:2[abi_x86_32(-)]
+ media-libs/alsa-lib[abi_x86_32(-)]
+ media-libs/libpng:=[abi_x86_32(-)]
+ media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
+ media-libs/libsoundtouch[abi_x86_32(-)]
+ media-libs/portaudio[abi_x86_32(-)]
+ net-libs/libpcap[abi_x86_32(-)]
+ sys-libs/zlib[abi_x86_32(-)]
+ virtual/libudev[abi_x86_32(-)]
+ virtual/opengl[abi_x86_32(-)]
+ x11-libs/gtk+:3[abi_x86_32(-)]
+ x11-libs/libICE[abi_x86_32(-)]
+ x11-libs/libX11[abi_x86_32(-)]
+ x11-libs/libXext[abi_x86_32(-)]
+ >=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+"
+DEPEND="${RDEPEND}
+ dev-cpp/pngpp
+ dev-cpp/sparsehash
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+FILECAPS=(
+ "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+)
+
+PATCHES=(
+ "${FILESDIR}/${P}-disable-setcap.patch"
+)
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
+ # -mxsave flag is needed when GCC >= 8.2 is used
+ # https://bugs.gentoo.org/685156
+ if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
+ append-flags -mxsave
+ fi
+ fi
+}
+
+src_configure() {
+ multilib_toolchain_setup x86
+ # Build with ld.gold fails
+ # https://github.com/PCSX2/pcsx2/issues/1671
+ tc-ld-disable-gold
+
+ # pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
+ # if it something other than "Devel|Debug|Release"
+ local CMAKE_BUILD_TYPE="Release"
+
+ if use amd64; then
+ # Passing correct CMAKE_TOOLCHAIN_FILE for amd64
+ # https://github.com/PCSX2/pcsx2/pull/422
+ local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
+ fi
+
+ local mycmakeargs=(
+ -DARCH_FLAG=
+ -DDISABLE_BUILD_DATE=TRUE
+ -DDISABLE_PCSX2_WRAPPER=TRUE
+ -DDISABLE_SETCAP=TRUE
+ -DEXTRA_PLUGINS=FALSE
+ -DOPTIMIZATION_FLAG=
+ -DPACKAGE_MODE=TRUE
+ -DXDG_STD=TRUE
+
+ -DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
+ -DDOC_DIR=/usr/share/doc/"${PF}"
+ -DEGL_API=FALSE
+ -DGTK3_API=TRUE
+ -DOPENCL_API=FALSE
+ -DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
+ # wxGTK must be built against same sdl version
+ -DSDL2_API=TRUE
+ -DUSE_VTUNE=FALSE
+ )
+
+ WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+ cmake_src_configure
+}
+
+src_install() {
+ # Upstream issues:
+ # https://github.com/PCSX2/pcsx2/issues/417
+ # https://github.com/PCSX2/pcsx2/issues/3077
+ QA_EXECSTACK="usr/bin/PCSX2"
+ QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
+ cmake_src_install
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2022-07-31 20:38 James Le Cuirot
0 siblings, 0 replies; 20+ messages in thread
From: James Le Cuirot @ 2022-07-31 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 4af9aade2199538e6ace3ec8d2d272cdfdb9edc6
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Jul 31 14:58:30 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 20:37:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af9aade
games-emulation/pcsx2: Update live ebuild
This fixes two issues:
1.
Because -DARCH_FLAGS= the build fails with the following.
PCSX2 requires compiling for at least SSE 4.1
This can be fixed by replacing the cmake argument with
-DDISABLE_ADVANCE_SIMD=ON.
2.
Upstream removed crcs for a few unofficial games that are required to
fix major playability issues. These versions of the games can be far
preferable to the official versions where one was completely broken in
the North American release, but fixed in a fan patched version.
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
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26685
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch | 43 ++++++++++++++++++++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 6 ++-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch b/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch
new file mode 100644
index 000000000000..aa647cd09c07
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch
@@ -0,0 +1,43 @@
+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/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 14345f880fa8..3885455b5d81 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -61,6 +61,10 @@ FILECAPS=(
-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.0-crcs.patch
+)
+
pkg_setup() {
if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
# -mxsave flag is needed when GCC >= 8.2 is used
@@ -93,8 +97,8 @@ src_configure() {
# if it something other than "Devel|Debug|Release"
local CMAKE_BUILD_TYPE="Release"
local mycmakeargs=(
- -DARCH_FLAG=
-DBUILD_SHARED_LIBS=FALSE
+ -DDISABLE_ADVANCE_SIMD=TRUE
-DDISABLE_BUILD_DATE=TRUE
-DDISABLE_PCSX2_WRAPPER=TRUE
-DDISABLE_SETCAP=TRUE
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2022-09-23 0:27 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2022-09-23 0:27 UTC (permalink / raw
To: gentoo-commits
commit: 87f15c596ca134db6715ce4d3b4f543917e560cd
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 22:58:27 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 00:27:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f15c59
games-emulation/pcsx2: add 1.7.3329
Meant to do this for a while given 1.6.0 is getting very old and is
32bit-only (many users end up going with -9999 to handle this), but
upstream kept doing major changes making this perhaps too experimental.
Seems to have settled down a bit, so trying now.
Many changes, so please report if anything off.
For some notable changes from current -9999 ebuild:
- EAPI7->8
- add machinery to keep 1.7.x and -9999 ebuilds in sync
- switch to patches for unbundling, 9999 may break more often but
there will now be a known-working 1.7.x release to fallback on
- postinst elog to explain 1.7.x model a bit + warn
- update LICENSE to account for hopefully all files and 3rdparty/* use
- add IUSE=qt6 early support, doesn't support PACKAGE_MODE so this
requires a few workarounds
- add IUSE=wayland with untested runtime (build system would need
updates if wanted pure X-less)
- add IUSE=vulkan (considered IUSE=opengl too, esp if using vulkan,
but code/build is too tied with opengl+egl)
- pass -fno-strict-aliasing with USE=vulkan for glslang wrt bug #858374
- depend on >=libsdl2-2.0.22, not /necessary/ but the Qt build requests
this minimum version rather than gtk's .12 for some reason
- fix tests (they weren't being built/ran, low coverage either way)
- use -DARCH_FLAG to pass minimum required -msse4.1 rather than rely
on -DDISABLE_ADVANCED_SIMD which still pass more than necessary
- disable WX_vs_SDL check rather than pass -DSDL2_API, see wx-vs-sdl
patch for details
- drop ld.gold workaround, likely still broken but not really
supporting gold anymore (please don't use it, esp. system-wide)
- drop imgui submodule, is now hard-bundled as non-submodule and makes
little sense to unbundle because of the way it's setup
- drop unused alsa-lib(alsa is provided by external cubeb), libXext +
libICE (checked but unused, okay if missing), and libxml2
- replace freetype by harfbuzz, albeit while it checks and tries to
link with harfbuzz it's technically unused (same for libsamplerate)
This also drops x86 keyword, it may be possible to make it work but
between the CMakeLists current FATAL_ERROR if not x86_64 (thus -* in
KEYWORDS), various use of migrated-from-x86 asm, and min req of sse4.1
leaving out many cpus, this doesn't leave real room for non-x86_64.
CMake Error at cmake/BuildParameters.cmake:152 (message):
Unsupported architecture: i386
Users of -9999 are encouraged to switch to 1.7.x to get normal
updates and not be at the forefront of every new issues (9999
ebuild will mostly only be checked when doing new 1.7.x releases
unless get a report).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/Manifest | 3 +
.../pcsx2/files/pcsx2-1.7.3329-clang16.patch | 19 ++
.../pcsx2/files/pcsx2-1.7.3329-lto.patch | 21 +++
.../pcsx2/files/pcsx2-1.7.3329-musl.patch | 9 +
.../pcsx2/files/pcsx2-1.7.3329-qt6.patch | 10 ++
.../pcsx2/files/pcsx2-1.7.3329-unbundle.patch | 41 +++++
.../pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch | 9 +
games-emulation/pcsx2/metadata.xml | 4 +
games-emulation/pcsx2/pcsx2-1.7.3329.ebuild | 198 +++++++++++++++++++++
9 files changed, 314 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index bb30d90e594a..3a8dfeb3dde4 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1 +1,4 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
+DIST pcsx2-1.7.3329.tar.gz 19379924 BLAKE2B ec1313d97ab9f8bb5c735e73a3174071ccbd8499857835145dcd057f96cf51b60f3677a64c155916e5b6d33960d3e0d8c300714b6149ce4326e747e672c97406 SHA512 cfdd129c93e04f3ddc0a685483683cf5d4c239f9e7a059fd838ebe6cc8c2f3f819c26f45a8fe2a256030fdbd6273599d6e95813980eafbd301dac27689c2182a
+DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
+DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch
new file mode 100644
index 000000000000..331101ed6a1c
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/870412
+--- a/3rdparty/cpuinfo/src/api.c
++++ b/3rdparty/cpuinfo/src/api.c
+@@ -78 +78 @@
+-const struct cpuinfo_uarch_info* cpuinfo_get_uarchs() {
++const struct cpuinfo_uarch_info* cpuinfo_get_uarchs(void) {
+--- a/cmake/FindPCAP.cmake
++++ b/cmake/FindPCAP.cmake
+@@ -47 +47 @@
+-check_c_source_compiles("int main() { return 0; }" PCAP_LINKS_SOLO)
++check_c_source_compiles("int main(void) { return 0; }" PCAP_LINKS_SOLO)
+@@ -55 +55 @@
+- check_c_source_compiles("int main() { return 0; }" PCAP_NEEDS_THREADS)
++ check_c_source_compiles("int main(void) { return 0; }" PCAP_NEEDS_THREADS)
+--- a/tests/ctest/CMakeLists.txt
++++ b/tests/ctest/CMakeLists.txt
+@@ -20 +20 @@
+- int main() {
++ int main(void) {
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch
new file mode 100644
index 000000000000..1047105d646a
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch
@@ -0,0 +1,21 @@
+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-musl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
new file mode 100644
index 000000000000..95d2ff38a8c2
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
@@ -0,0 +1,9 @@
+--- a/pcsx2/USB/qemu-usb/iov.h
++++ b/pcsx2/USB/qemu-usb/iov.h
+@@ -17,5 +17,5 @@
+ #define IOV_H
+
+-#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) /* /usr/include/bits/uio.h */
++#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) && !defined(__DEFINED_struct_iovec)
+ struct iovec
+ {
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch
new file mode 100644
index 000000000000..9ef82985dc99
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch
@@ -0,0 +1,10 @@
+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.3329-unbundle.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
new file mode 100644
index 000000000000..450329522183
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
@@ -0,0 +1,41 @@
+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
new file mode 100644
index 000000000000..d00f9553993d
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
@@ -0,0 +1,9 @@
+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()
diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index 0d8f2efac4cd..40c13d5f12ff 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -13,6 +13,10 @@
<email>games@gentoo.org</email>
<name>Gentoo Games Project</name>
</maintainer>
+ <use>
+ <flag name="qt6">Add support for the Qt 6 application and UI framework</flag>
+ <flag name="vulkan">Enable support for Vulkan</flag>
+ </use>
<upstream>
<bugs-to>https://github.com/PCSX2/pcsx2/issues</bugs-to>
<remote-id type="github">PCSX2/pcsx2</remote-id>
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
new file mode 100644
index 000000000000..e4673dc1422c
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2022 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_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.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 GPL-2+ LGPL-2.1+
+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 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:=
+ dev-libs/libaio
+ dev-libs/libchdr
+ >=dev-libs/libfmt-7.1.3:=
+ dev-libs/libzip:=[zstd]
+ media-libs/cubeb
+ media-libs/harfbuzz
+ media-libs/libglvnd
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ >=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
+ qt6? (
+ dev-qt/qtbase:6[gui,network,widgets]
+ 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]
+ pulseaudio? ( media-libs/libpulse )
+ )
+ 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[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-clang16.patch
+ "${FILESDIR}"/${PN}-1.7.3329-lto.patch
+ "${FILESDIR}"/${PN}-1.7.3329-musl.patch
+ "${FILESDIR}"/${PN}-1.7.3329-qt6.patch
+ "${FILESDIR}"/${PN}-1.7.3329-unbundle.patch
+ "${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch
+)
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ local EGIT_SUBMODULES=()
+ if use vulkan; then
+ EGIT_SUBMODULES+=(
+ 3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
+ 3rdparty/vulkan-headers # to keep in sync with glslang
+ )
+ fi
+ git-r3_src_unpack
+ else
+ default
+ 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
+
+ # pulseaudio is only used for usb-mic and without qt6, not for audio output
+ { use pulseaudio && use !qt6; } || :> cmake/FindPulseAudio.cmake || die
+
+ # GS tests currently fail to build with qt6
+ use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
+
+ # delete all 3rdparty/* except known-used ones in non-live
+ if [[ ${PV} != 9999 ]]; then
+ local keep=(
+ cpuinfo glad imgui include jpgd lzma simpleini xbyak
+ $(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_SYSTEM_LIBS=yes
+ -DUSE_VTUNE=no
+ -DUSE_VULKAN=$(usex vulkan)
+ -DWAYLAND_API=$(usex wayland)
+ -DXDG_STD=yes
+
+ # 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
+ )
+
+ 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 using a nightly release model"
+ elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks"
+ elog "many notable features (e.g. native 64bit builds). Given it may be a long"
+ elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
+ elog "roughly every months."
+ elog
+ elog "Please report an issue if feel a picked nightly release needs to be"
+ elog "updated ahead of time or masked (notably for handling regressions)."
+ fi
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2022-12-19 5:48 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2022-12-19 5:48 UTC (permalink / raw
To: gentoo-commits
commit: b325de0014c8ede50010e246d914948822f56dcb
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 03:49:02 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 05:47:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b325de00
games-emulation/pcsx2: fix build with rapidyaml-0.5.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch | 42 ++++++++++++++++++++++
games-emulation/pcsx2/pcsx2-1.7.3602.ebuild | 5 +++
games-emulation/pcsx2/pcsx2-9999.ebuild | 5 +++
3 files changed, 52 insertions(+)
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
new file mode 100644
index 000000000000..b3185b47006e
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch
@@ -0,0 +1,42 @@
+Quick fix taken from Alpine, fixes >=0.5.0 but breaks <0.5.0
+
+Upstream seem to have no intention to acknowledge this as an issue
+until they bump their bundled copy of rapidyaml:
+https://github.com/PCSX2/pcsx2/issues/7623#issuecomment-1357048378
+--- 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/pcsx2-1.7.3602.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild
index de7b59537121..f2949fc2a844 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild
@@ -138,6 +138,11 @@ src_unpack() {
}
src_prepare() {
+ # could depend on >=0.5 for unconditional, but rather not force it yet
+ # https://github.com/PCSX2/pcsx2/issues/7623
+ has_version '>=dev-cpp/rapidyaml-0.5' &&
+ eapply "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch
+
cmake_src_prepare
# qt6 build doesn't support PACKAGE_MODE and need to set resources location
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 119d33bb8302..92f1596c955b 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -136,6 +136,11 @@ src_unpack() {
}
src_prepare() {
+ # could depend on >=0.5 for unconditional, but rather not force it yet
+ # https://github.com/PCSX2/pcsx2/issues/7623
+ has_version '>=dev-cpp/rapidyaml-0.5' &&
+ eapply "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch
+
cmake_src_prepare
# qt6 build doesn't support PACKAGE_MODE and need to set resources location
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2022-12-29 2:05 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2022-12-29 2:05 UTC (permalink / raw
To: gentoo-commits
commit: 8d20cc57acca57295f7b20b3313d83625d9947a7
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 02:00:41 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 02:04:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d20cc57
games-emulation/pcsx2: update rapidyaml patch for live
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch | 63 ++++++++++++++++++++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 2 +-
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
new file mode 100644
index 000000000000..bded24136fe3
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
@@ -0,0 +1,63 @@
+Quick fix for >=0.5.0 (breaks <0.5.0)
+
+Upstream seem to have no intention to acknowledge this as an issue
+until they bump their bundled copy of rapidyaml:
+https://github.com/PCSX2/pcsx2/issues/7623#issuecomment-1357048378
+--- a/pcsx2/GameDatabase.cpp
++++ b/pcsx2/GameDatabase.cpp
+@@ -176,5 +176,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;
+@@ -207,5 +207,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;
+@@ -237,5 +237,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());
+@@ -258,5 +258,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);
+@@ -268,5 +268,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
+@@ -293,5 +293,5 @@
+ if (node.has_child("dynaPatches") && node["dynaPatches"].has_children())
+ {
+- for (const ryml::NodeRef& n : node["dynaPatches"].children())
++ for (const ryml::ConstNodeRef& n : node["dynaPatches"].children())
+ {
+ DynamicPatch patch;
+@@ -299,5 +299,5 @@
+ if (n.has_child("pattern") && n["pattern"].has_children())
+ {
+- for (const ryml::NodeRef& db_pattern : n["pattern"].children())
++ for (const ryml::ConstNodeRef& db_pattern : n["pattern"].children())
+ {
+ DynamicPatchEntry entry;
+@@ -307,5 +307,5 @@
+ patch.pattern.push_back(entry);
+ }
+- for (const ryml::NodeRef& db_replacement : n["replacement"].children())
++ for (const ryml::ConstNodeRef& db_replacement : n["replacement"].children())
+ {
+ DynamicPatchEntry entry;
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 17916151687b..eebe34cc10de 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -128,7 +128,7 @@ src_prepare() {
# could depend on >=0.5 for unconditional, but rather not force it yet
# https://github.com/PCSX2/pcsx2/issues/7623
has_version '>=dev-cpp/rapidyaml-0.5' &&
- eapply "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch
+ eapply "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
cmake_src_prepare
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2022-12-29 20:29 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2022-12-29 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 717057acb2353e96dddbdcbddae8e34a4af23f93
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 16:15:05 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 20:28:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=717057ac
games-emulation/pcsx2: drop 1.7.3602
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
.../pcsx2/files/pcsx2-1.7.3329-musl.patch | 9 -
games-emulation/pcsx2/pcsx2-1.7.3602.ebuild | 242 ---------------------
3 files changed, 252 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d2c09dbfd961..6866d173ca7c 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,4 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.3602.tar.gz 20035989 BLAKE2B bf28433b1df67b3b23655125b6cc6bdfa255468612081d2a64316cc335b97b43f66bc7ed683c19234df6136cb7f8fdf9dce3225865b2d404fc7c5b8b41733eea SHA512 cd5f5a4d347beb381fc13e969baa86887289f836a8b03ae6a926293a81699b3769cf23644a87cff41ec32355604bd735e59455fd13de5fc5aab121976626c16f
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
deleted file mode 100644
index 95d2ff38a8c2..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/pcsx2/USB/qemu-usb/iov.h
-+++ b/pcsx2/USB/qemu-usb/iov.h
-@@ -17,5 +17,5 @@
- #define IOV_H
-
--#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) /* /usr/include/bits/uio.h */
-+#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) && !defined(__DEFINED_struct_iovec)
- struct iovec
- {
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild
deleted file mode 100644
index f2949fc2a844..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2022 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_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/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:=
- dev-libs/libaio
- dev-libs/libchdr
- >=dev-libs/libfmt-7.1.3:=
- 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
- media-libs/libsamplerate
- 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[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-musl.patch
- "${FILESDIR}"/${PN}-1.7.3329-qt6.patch
- "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
- "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- local EGIT_SUBMODULES=(
- # 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
-
- # uses glslang's StandAlone/ResourceLimits.h unavailable with
- # system's (also keep bundled vulkan-headers to be 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/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() {
- # could depend on >=0.5 for unconditional, but rather not force it yet
- # https://github.com/PCSX2/pcsx2/issues/7623
- has_version '>=dev-cpp/rapidyaml-0.5' &&
- eapply "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch
-
- 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
-
- # non-cubeb pulseaudio is only used for usb-mic without qt6, not output
- use pulseaudio || :> cmake/FindPulseAudio.cmake || 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 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_SYSTEM_LIBS=yes
- -DUSE_VTUNE=no
- -DUSE_VULKAN=$(usex vulkan)
- -DWAYLAND_API=$(usex wayland)
- -DXDG_STD=yes
-
- # 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 using a nightly release model"
- elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks"
- elog "many notable features (e.g. native 64bit builds). Given it may be a long"
- elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
- elog "roughly every months."
- elog
- elog "Please report an issue if feel a picked nightly release needs to be"
- elog "updated ahead of time or masked (notably for handling regressions)."
- fi
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2023-01-11 11:26 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2023-01-11 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 20f4fed7d27c518f834980a90ea3343c6d65db54
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 09:17:49 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 11:25:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20f4fed7
games-emulation/pcsx2: make rapidyaml patch unconditional
A PR is pending upstream to bump bundled rapidyaml which will also
require >=0.5 if kept as-is, and 0.5 is stable now so there's little
reason not to change this (no need for a revbump in this case).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch | 7 ++-----
games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch | 7 ++-----
games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 8 ++------
games-emulation/pcsx2/pcsx2-1.7.3820.ebuild | 8 ++------
games-emulation/pcsx2/pcsx2-9999.ebuild | 8 ++------
5 files changed, 10 insertions(+), 28 deletions(-)
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
index b3185b47006e..aee1608ea754 100644
--- 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
@@ -1,8 +1,5 @@
-Quick fix taken from Alpine, fixes >=0.5.0 but breaks <0.5.0
-
-Upstream seem to have no intention to acknowledge this as an issue
-until they bump their bundled copy of rapidyaml:
-https://github.com/PCSX2/pcsx2/issues/7623#issuecomment-1357048378
+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 @@
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
index bded24136fe3..b42ae36045ad 100644
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
@@ -1,8 +1,5 @@
-Quick fix for >=0.5.0 (breaks <0.5.0)
-
-Upstream seem to have no intention to acknowledge this as an issue
-until they bump their bundled copy of rapidyaml:
-https://github.com/PCSX2/pcsx2/issues/7623#issuecomment-1357048378
+https://github.com/PCSX2/pcsx2/issues/7623
+https://github.com/PCSX2/pcsx2/pull/7847
--- a/pcsx2/GameDatabase.cpp
+++ b/pcsx2/GameDatabase.cpp
@@ -176,5 +176,5 @@
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
index 740fb1613eaa..57249a1e145e 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
app-arch/xz-utils
app-arch/zstd:=
- dev-cpp/rapidyaml:=
+ >=dev-cpp/rapidyaml-0.5:=
dev-libs/libaio
dev-libs/libchdr
>=dev-libs/libfmt-7.1.3:=
@@ -94,6 +94,7 @@ PATCHES=(
"${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() {
@@ -136,11 +137,6 @@ src_unpack() {
}
src_prepare() {
- # could depend on >=0.5 for unconditional, but rather not force it yet
- # https://github.com/PCSX2/pcsx2/issues/7623
- has_version '>=dev-cpp/rapidyaml-0.5' &&
- eapply "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch
-
cmake_src_prepare
# qt6 build doesn't support PACKAGE_MODE and need to set resources location
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
index caf2e5c05300..7c14ae265d5f 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
app-arch/xz-utils
app-arch/zstd:=
- dev-cpp/rapidyaml:=
+ >=dev-cpp/rapidyaml-0.5:=
dev-libs/libaio
dev-libs/libchdr
dev-libs/libfmt:=
@@ -83,6 +83,7 @@ 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.3803-rapidyaml-0.5.0.patch
)
src_unpack() {
@@ -125,11 +126,6 @@ src_unpack() {
}
src_prepare() {
- # could depend on >=0.5 for unconditional, but rather not force it yet
- # https://github.com/PCSX2/pcsx2/issues/7623
- has_version '>=dev-cpp/rapidyaml-0.5' &&
- eapply "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
-
cmake_src_prepare
sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 73eae17a4f96..a052878f071a 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
app-arch/xz-utils
app-arch/zstd:=
- dev-cpp/rapidyaml:=
+ >=dev-cpp/rapidyaml-0.5:=
dev-libs/libaio
dev-libs/libchdr
dev-libs/libfmt:=
@@ -83,6 +83,7 @@ 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.3803-rapidyaml-0.5.0.patch
)
src_unpack() {
@@ -125,11 +126,6 @@ src_unpack() {
}
src_prepare() {
- # could depend on >=0.5 for unconditional, but rather not force it yet
- # https://github.com/PCSX2/pcsx2/issues/7623
- has_version '>=dev-cpp/rapidyaml-0.5' &&
- eapply "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
-
cmake_src_prepare
sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2023-07-01 9:07 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2023-07-01 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 638d959dfe1ae6462e3d3996f6cb7e4558c23429
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 1 08:25:11 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 09:07:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=638d959d
games-emulation/pcsx2: update live
gtest unbundling needs rebasing, and unfortunately can no longer
use system soundtouch as-is (newly bundled, fails if unbundled).
Also split unbundling patches while at it, using diff -U0 so they're
unlikely to break easily while touching the same file (context is
not important for these).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch | 7 +++++++
.../pcsx2/files/pcsx2-1.7.4667-system-chdr.patch | 6 ++++++
.../pcsx2/files/pcsx2-1.7.4667-system-gtest.patch | 15 +++++++++++++++
.../pcsx2/files/pcsx2-1.7.4667-system-zstd.patch | 13 +++++++++++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 9 +++++++--
5 files changed, 48 insertions(+), 2 deletions(-)
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-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)
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2023-07-25 0:10 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2023-07-25 0:10 UTC (permalink / raw
To: gentoo-commits
commit: ea2897a4c78f03ccb232e90c504c6707f8e24ff5
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 23:34:38 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 00:01:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2897a4
games-emulation/pcsx2: add 1.7.4795
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
.../pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch | 8 +
games-emulation/pcsx2/pcsx2-1.7.4795.ebuild | 277 +++++++++++++++++++++
3 files changed, 286 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 2a4397da1100..d986666bdaa4 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,6 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.4624.tar.gz 11178711 BLAKE2B 539add6bf6b542b29c1ac61584dbfa549f9b866e56e72eaf9342d1e990576252c861542d4e397324efae73eda933756e14d871aaf6ece45edfb1e6e27d37b43a SHA512 af43136ffefe60e0adb85b930ec9da22a71e766a911e1a2ad37cfb1190338dee2a0a45ecd4c0de17ed5d0622b8b17d7c7ff9201ba8b2f9924d6b7d4b5804d6a1
+DIST pcsx2-1.7.4795.tar.gz 11816914 BLAKE2B b220979ebae7c9115ca464bd52e14f2fd76d02c58159c3cc49947a8ed530b49ab41ec1c0053bd5c5a63aa7d3052214e5c21bdb6000bf153524bba64a916143e2 SHA512 2b4c31deff5efc37cd672f5e9bb3bbda51091208c191cd726b9d25eea6c99a5d9466f8382a4e1e0ba9503be0681243b91b6d1cb3aad9689162275b83341b63e8
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch
new file mode 100644
index 000000000000..c4d11083ad45
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch
@@ -0,0 +1,8 @@
+Continuation of https://github.com/PCSX2/pcsx2/commit/a59f95317a3fd
+--- a/pcsx2/GameDatabase.cpp
++++ b/pcsx2/GameDatabase.cpp
+@@ -1040,3 +1040,3 @@
+ const u32 index = static_cast<u32>(s_hash_database.size());
+- for (const ryml::NodeRef& n : node["hashes"].children())
++ for (const auto& n : node["hashes"].children())
+ {
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
new file mode 100644
index 000000000000..7d24c2ae54cd
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
@@ -0,0 +1,277 @@
+# 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: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+ 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-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 )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+ ${COMMON_DEPEND}
+ games-emulation/pcsx2_patches
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+ test? ( dev-cpp/gtest )
+"
+BDEPEND="
+ dev-qt/qttools:6[linguist]
+ wayland? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )
+"
+
+FILECAPS=(
+ -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
+)
+
+PATCHES=(
+ "${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
+ "${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.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 soundtouch 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_LINKED_FFMPEG=yes
+ -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
+
+ # 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)
+ -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
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2023-10-10 20:20 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2023-10-10 20:20 UTC (permalink / raw
To: gentoo-commits
commit: d65be23ca9ed07d21da4f83289bf99e479bc2d48
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 18:52:11 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 20:18:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65be23c
games-emulation/pcsx2: drop 1.7.4940-r1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/Manifest | 6 -
.../pcsx2/files/pcsx2-1.7.4667-system-chdr.patch | 6 -
.../pcsx2/files/pcsx2-1.7.4667-system-gtest.patch | 15 --
.../pcsx2/files/pcsx2-1.7.4667-system-zstd.patch | 13 -
.../pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch | 8 -
games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild | 277 ---------------------
6 files changed, 325 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ea922468de55..2a4ba484f723 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,8 +1,2 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec SHA512 be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6
DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b SHA512 ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6
-DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
-DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
-DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
-DIST pcsx2-rcheevos-3af1e2fc51.tar.gz 541818 BLAKE2B 88d17b6943689b8f34240392c0e9f1c66a3f06e2bbc67cdbb1a9ac83608f2b1b74ef64cfcba40a3389f8ca7ecc6ec99b212994bef0d30e846d35673f5f0fee89 SHA512 991b64c676f3e84f8726a1965fe7709d41a04ac6cb4ab5e91ec415d6bfdf776bff909b75bfbdca705f3c03f1bfc413a15bde1755f8afa53a12148adfffb7ac83
-DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
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
deleted file mode 100644
index 9787cd380337..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- 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
deleted file mode 100644
index 858efc3b3e47..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 27b2e82852e8..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/pcsx2-1.7.4795-rapidyaml-0.5.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch
deleted file mode 100644
index c4d11083ad45..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-Continuation of https://github.com/PCSX2/pcsx2/commit/a59f95317a3fd
---- a/pcsx2/GameDatabase.cpp
-+++ b/pcsx2/GameDatabase.cpp
-@@ -1040,3 +1040,3 @@
- const u32 index = static_cast<u32>(s_hash_database.size());
-- for (const ryml::NodeRef& n : node["hashes"].children())
-+ for (const auto& n : node["hashes"].children())
- {
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild
deleted file mode 100644
index 4976851a41d4..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild
+++ /dev/null
@@ -1,277 +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=3af1e2fc5188d6e932ee379942f4049ea877e648
- 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: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
- 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-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 )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
- ${COMMON_DEPEND}
- <games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- dev-qt/qttools:6[linguist]
- wayland? (
- dev-util/wayland-scanner
- kde-frameworks/extra-cmake-modules
- )
-"
-
-FILECAPS=(
- -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
-PATCHES=(
- "${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
- "${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.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 soundtouch 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_LINKED_FFMPEG=yes
- -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
-
- # 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)
- -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
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2024-01-08 12:59 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2024-01-08 12:59 UTC (permalink / raw
To: gentoo-commits
commit: de66e7b69307542a793931c375498cfa4a22dfb4
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 10:29:52 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 12:57:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de66e7b6
games-emulation/pcsx2: drop 1.7.5214
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
.../files/pcsx2-1.7.3468-cubeb-automagic.patch | 56 --------
games-emulation/pcsx2/pcsx2-1.7.5214.ebuild | 154 ---------------------
3 files changed, 211 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 293fe8fddf59..da9e1fbded42 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1,2 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B 6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9 SHA512 3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862
DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd SHA512 6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
deleted file mode 100644
index 804cf29af397..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Same that media-libs/cubeb does and meant for -DLAZY_LOAD_LIBS=no.
-
-Unfortunately need to use bundled cubeb here given it modifies the
-source starting with (but not limited to):
-https://github.com/PCSX2/pcsx2/commit/9170a5abc1
---- a/3rdparty/cubeb/CMakeLists.txt
-+++ b/3rdparty/cubeb/CMakeLists.txt
-@@ -110,38 +110,48 @@
-
- find_package(PkgConfig REQUIRED)
-
-+ if(CHECK_PULSE)
- pkg_check_modules(libpulse IMPORTED_TARGET libpulse)
- if(libpulse_FOUND)
- set(USE_PULSE ON)
- target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN)
- target_link_libraries(cubeb PRIVATE PkgConfig::libpulse)
- endif()
-+ endif()
-
-+ if(CHECK_ALSA)
- pkg_check_modules(alsa IMPORTED_TARGET alsa)
- if(alsa_FOUND)
- set(USE_ALSA ON)
- target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN)
- target_link_libraries(cubeb PRIVATE PkgConfig::alsa)
- endif()
-+ endif()
-
-+ if(CHECK_JACK)
- pkg_check_modules(jack IMPORTED_TARGET jack)
- if(jack_FOUND)
- set(USE_JACK ON)
- target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN)
- target_link_libraries(cubeb PRIVATE PkgConfig::jack)
- endif()
-+ endif()
-
-+ if(CHECK_SNDIO)
- check_include_files(sndio.h USE_SNDIO)
- if(USE_SNDIO)
- target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN)
- target_link_libraries(cubeb PRIVATE sndio)
- endif()
-+ endif()
-
-+ if(CHECK_AAUDIO)
- check_include_files(aaudio/AAudio.h USE_AAUDIO)
- if(USE_AAUDIO)
- target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN)
- target_link_libraries(cubeb PRIVATE aaudio)
- endif()
-+ endif()
- endif()
-
- if(USE_PULSE)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
deleted file mode 100644
index 462f4b662736..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
+++ /dev/null
@@ -1,154 +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
- # unbundling on this package has become unmaintainable and, rather than
- # handle submodules separately, using a tarball that includes them
- SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
- 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 sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
- app-arch/xz-utils
- dev-libs/libaio
- >=dev-qt/qtbase-6.6.0:6[gui,network,widgets]
- >=dev-qt/qtsvg-6.6.0:6
- media-libs/libglvnd
- media-libs/libpng:=
- >=media-libs/libsdl2-2.28.4[haptic,joystick]
- media-video/ffmpeg:=
- net-libs/libpcap
- net-misc/curl
- sys-apps/dbus
- sys-libs/zlib:=
- virtual/libudev:=
- x11-libs/libXrandr
- alsa? ( media-libs/alsa-lib )
- jack? ( virtual/jack )
- pulseaudio? ( media-libs/libpulse )
- sndio? ( media-sound/sndio:= )
- vulkan? ( media-libs/vulkan-loader )
- wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
- ${COMMON_DEPEND}
- >=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
-"
-BDEPEND="
- >=dev-qt/qttools-6.6.0:6[linguist]
- wayland? (
- dev-util/wayland-scanner
- kde-frameworks/extra-cmake-modules
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.3773-lto.patch
- "${FILESDIR}"/${PN}-1.7.4667-flags.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if [[ ${PV} != 9999 ]]; then
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
- -i cmake/Pcsx2Utils.cmake || 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
- filter-lto
- fi
-
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=no
- -DDISABLE_BUILD_DATE=yes
- -DENABLE_TESTS=$(usex test)
- -DUSE_LINKED_FFMPEG=yes
- -DUSE_VTUNE=no
- -DUSE_VULKAN=$(usex vulkan)
- -DWAYLAND_API=$(usex wayland)
- -DX11_API=yes # X libs are currently hard-required either way
-
- # 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
-
- # 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)
- -DCHECK_PULSE=$(usex pulseaudio)
- -DCHECK_SNDIO=$(usex sndio)
- -DLAZY_LOAD_LIBS=no
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build unittests
-}
-
-src_install() {
- insinto /usr/lib/${PN}
- doins -r "${BUILD_DIR}"/bin/.
-
- fperms +x /usr/lib/${PN}/pcsx2-qt
- dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
-
- newicon bin/resources/icons/AppIconLarge.png ${PN}.png
- make_desktop_entry ${PN} ${PN^^}
-
- dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
-
- use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
-}
-
-pkg_postinst() {
- fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
-
- if [[ ${REPLACING_VERSIONS##* } ]] &&
- ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
- elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
- elog "notably now a 64bit build using Qt6. Just-in-case it is recommended"
- elog "to backup configs, save states, and memory cards before using."
- elog
- elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
- fi
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2024-04-13 17:29 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2024-04-13 17:29 UTC (permalink / raw
To: gentoo-commits
commit: fa7a60f4742c5599d49d055bcbece43e3e3a3deb
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 17:26:33 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 17:29:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7a60f4
games-emulation/pcsx2: update live
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch | 18 ++++++++++++++++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 1 +
2 files changed, 19 insertions(+)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch
new file mode 100644
index 000000000000..aa447b30b6fc
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch
@@ -0,0 +1,18 @@
+This does not exist in normal shaderc and was modified[1] by PCSX2
+for use in their CI/appimage making it impossible to use system's
+(despite they do not bundle it). So not much choices but to remove
+usage.
+
+Partial (for simplification) revert of [2], hopefully temporary.
+
+[1] https://github.com/PCSX2/pcsx2/commit/1cd4ba269854646
+[2] https://github.com/PCSX2/pcsx2/commit/fbfdf1200d27260
+--- a/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
++++ b/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
+@@ -113,6 +113,4 @@
+ {
+ options.SetGenerateDebugInfo();
+- if (GSDeviceVK::GetInstance()->GetOptionalExtensions().vk_khr_shader_non_semantic_info)
+- options.SetEmitNonSemanticDebugInfo();
+
+ options.SetOptimizationLevel(shaderc_optimization_level_zero);
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 2ca40ad4ee99..b1a0cb87549d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -79,6 +79,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+ "${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2024-05-21 17:19 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2024-05-21 17:19 UTC (permalink / raw
To: gentoo-commits
commit: de916e3ad11a728544603942e2093c2c4888fb44
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 17:10:24 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue May 21 17:19:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de916e3a
games-emulation/pcsx2: update live for upstream's shaderc changes
Hardly tested beside running a game + a valid shader using vulkan,
please report bugs to Gentoo if there is anything up with this that
cannot be reproduced with upstream's AppImage.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/pcsx2-1.7.5835-vanilla-shaderc.patch | 49 ++++++++++++++++++++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 4 +-
2 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5835-vanilla-shaderc.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5835-vanilla-shaderc.patch
new file mode 100644
index 000000000000..e9c06fb07a5c
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5835-vanilla-shaderc.patch
@@ -0,0 +1,49 @@
+PCSX2 upstream modifies shaderc[1][2][3] rendering its code incompatible
+with vanilla. We'd rather not package this modified shaderc if it can
+reasonably be avoided, so this does minimal code changes to allow vanilla
+usage.
+
+Disclaimer: as the author of this patch, be warned that I can hardly claim
+to know neither C++ nor shaderc, so it could very well be wrong. If run into
+vulkan/shaderc-related issues, try to reproduce with upstream's AppImage
+before reporting bugs to them as they offer no support for distros' builds.
+
+[1] https://github.com/PCSX2/pcsx2/commit/1cd4ba269854646
+[2] https://github.com/PCSX2/pcsx2/commit/fbfdf1200d27260
+[3] https://github.com/PCSX2/pcsx2/commit/ff7995f0d6caaac
+
+Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
+--- a/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
++++ b/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
+@@ -109,5 +109,5 @@
+ X(shaderc_compile_options_set_optimization_level) \
+ X(shaderc_compile_options_set_target_env) \
+- X(shaderc_compilation_status_to_string) \
++ X(shaderc_result_get_compilation_status) \
+ X(shaderc_compile_into_spv) \
+ X(shaderc_result_release) \
+@@ -217,19 +217,16 @@
+ dyn_shaderc::shaderc_compile_options_set_source_language(options, shaderc_source_language_glsl);
+ dyn_shaderc::shaderc_compile_options_set_target_env(options, shaderc_target_env_vulkan, 0);
+- dyn_shaderc::shaderc_compile_options_set_generate_debug_info(options, debug,
+- debug && GSDeviceVK::GetInstance()->GetOptionalExtensions().vk_khr_shader_non_semantic_info);
++ dyn_shaderc::shaderc_compile_options_set_generate_debug_info(options);
+ dyn_shaderc::shaderc_compile_options_set_optimization_level(
+ options, debug ? shaderc_optimization_level_zero : shaderc_optimization_level_performance);
+
+- shaderc_compilation_result_t result;
+- const shaderc_compilation_status status = dyn_shaderc::shaderc_compile_into_spv(
++ shaderc_compilation_result_t result = dyn_shaderc::shaderc_compile_into_spv(
+ dyn_shaderc::s_compiler, source.data(), source.length(), static_cast<shaderc_shader_kind>(stage), "source",
+- "main", options, &result);
+- if (status != shaderc_compilation_status_success)
++ "main", options);
++ if (dyn_shaderc::shaderc_result_get_compilation_status(result) != shaderc_compilation_status_success)
+ {
+ const std::string_view errors(result ? dyn_shaderc::shaderc_result_get_error_message(result) :
+ "null result object");
+- ERROR_LOG("Failed to compile shader to SPIR-V: {}\n{}",
+- dyn_shaderc::shaderc_compilation_status_to_string(status), errors);
++ ERROR_LOG("Failed to compile shader to SPIR-V: {}", errors);
+ DumpBadShader(source, errors);
+ }
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 643fe6a2b122..295c925c4305 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -27,7 +27,7 @@ IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan wayland
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
-# dlopen: libglvnd, qtsvg, vulkan-loader, wayland
+# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
COMMON_DEPEND="
app-arch/lz4:=
app-arch/zstd:=
@@ -78,8 +78,8 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch
"${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
+ "${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2024-05-23 0:53 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2024-05-23 0:53 UTC (permalink / raw
To: gentoo-commits
commit: 5880e274502f29f69c921ed16320d8fcc80def36
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 00:46:34 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu May 23 00:48:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5880e274
games-emulation/pcsx2: drop obsolete patch
Still applies but been fixed upstream, wasn't neccessary
for the last bump either.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
| 18 ------------------
games-emulation/pcsx2/pcsx2-1.7.5835.ebuild | 1 -
games-emulation/pcsx2/pcsx2-9999.ebuild | 1 -
3 files changed, 20 deletions(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch
deleted file mode 100644
index d8d341a7dea1..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-ThreadedFileReader.cpp:37:4: error: use of undeclared identifier 'memcpy'
-defs.h:78:14: error: no member named 'clamp' in namespace 'std'
---- a/pcsx2/CDVD/ThreadedFileReader.h
-+++ b/pcsx2/CDVD/ThreadedFileReader.h
-@@ -10,4 +10,5 @@
- #include <atomic>
- #include <condition_variable>
-+#include <cstring>
-
- class Error;
---- a/pcsx2/SPU2/defs.h
-+++ b/pcsx2/SPU2/defs.h
-@@ -6,4 +6,5 @@
- #include "GS/MultiISA.h"
-
-+#include <algorithm>
- #include <array>
-
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
index 295c925c4305..3b09dfdebe2d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
)
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 295c925c4305..3b09dfdebe2d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
)
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2024-06-22 9:34 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2024-06-22 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 9304bf2718c68949f0aa5c906e4a7e2929342bf3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 09:13:49 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 09:33:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9304bf27
games-emulation/pcsx2: drop 1.7.5624, 1.7.5724
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/Manifest | 2 -
.../files/pcsx2-1.7.5700-vanilla-shaderc.patch | 18 ---
games-emulation/pcsx2/pcsx2-1.7.5624.ebuild | 161 --------------------
games-emulation/pcsx2/pcsx2-1.7.5724.ebuild | 167 ---------------------
4 files changed, 348 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 201c1e51c713..fad0d732cb4d 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1 @@
-DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
-DIST pcsx2-1.7.5724.tar.xz 11429708 BLAKE2B 773dddc2b754ec5eddccad6e520846811299aac9cddf7b5ab77cca13c330f457f2b1d045d5f0f804a70d7fd3e498b6aab62b32e0a58536afd6805785055c81c4 SHA512 1589a0f3087cbb7c57e648f7afc7f1a22edef2601bab10dec2928b31d77d81780f11916f5a56f353d4a1063ea7e01e6ddab8df9e4982424eb7cf14b3bcfe2e3d
DIST pcsx2-1.7.5835.tar.xz 11565084 BLAKE2B 537aa890b668a1bed471f3677de1fee99f33fda41943dc4e7a11f8a85d2cbe831bfcd0040319643d370e90f31974272ee8ec4e17e3b6ec5d170d5750d38d707f SHA512 7e0541e5d0433a59047dfd15af3c3d90c61f61a416510cce14b89d5b641c45d7deae1a084ebd9e8b36f1768e714e3b480f1b28801e0f818b0290d7d06d384bc7
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch
deleted file mode 100644
index aa447b30b6fc..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This does not exist in normal shaderc and was modified[1] by PCSX2
-for use in their CI/appimage making it impossible to use system's
-(despite they do not bundle it). So not much choices but to remove
-usage.
-
-Partial (for simplification) revert of [2], hopefully temporary.
-
-[1] https://github.com/PCSX2/pcsx2/commit/1cd4ba269854646
-[2] https://github.com/PCSX2/pcsx2/commit/fbfdf1200d27260
---- a/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
-+++ b/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
-@@ -113,6 +113,4 @@
- {
- options.SetGenerateDebugInfo();
-- if (GSDeviceVK::GetInstance()->GetOptionalExtensions().vk_khr_shader_non_semantic_info)
-- options.SetEmitNonSemanticDebugInfo();
-
- options.SetOptimizationLevel(shaderc_optimization_level_zero);
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
deleted file mode 100644
index b53145e648db..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
- # unbundling on this package has become unmaintainable and, rather than
- # handle submodules separately, using a tarball that includes them
- SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
- 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 +clang jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
- app-arch/lz4:=
- app-arch/xz-utils
- app-arch/zstd:=
- dev-libs/libaio
- dev-qt/qtbase:6[concurrent,gui,widgets]
- dev-qt/qtsvg:6
- media-libs/libglvnd[X]
- media-libs/libpng:=
- media-libs/libsdl2[haptic,joystick]
- media-libs/libwebp:=
- media-video/ffmpeg:=
- net-libs/libpcap
- net-misc/curl
- sys-apps/dbus
- sys-libs/zlib:=
- virtual/libudev:=
- x11-libs/libXrandr
- alsa? ( media-libs/alsa-lib )
- jack? ( virtual/jack )
- pulseaudio? ( media-libs/libpulse )
- sndio? ( media-sound/sndio:= )
- vulkan? ( media-libs/vulkan-loader )
- wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
- ${COMMON_DEPEND}
- >=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
-"
-BDEPEND="
- dev-qt/qttools:6[linguist]
- clang? ( sys-devel/clang:* )
- wayland? (
- dev-util/wayland-scanner
- kde-frameworks/extra-cmake-modules
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.4667-flags.patch
- "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if [[ ${PV} != 9999 ]]; then
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
- -i cmake/Pcsx2Utils.cmake || die
- fi
-
- # relax Qt6 and SDL2 version requirements which often get restricted
- # without a specific need, please report a bug to Gentoo (not upstream)
- # if a still-available older version is really causing issues
- sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
- -i cmake/SearchForStuff.cmake || die
-}
-
-src_configure() {
- # note that upstream only supports clang and ignores gcc issues, e.g.
- # https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
- # (CMakeLists.txt also gives a big warning if compiler is not clang)
- if use clang && ! tc-is-clang; then
- local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
- strip-unsupported-flags
- fi
-
- # for bundled old glslang (bug #858374)
- use vulkan && append-flags -fno-strict-aliasing
-
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=no
- -DDISABLE_ADVANCE_SIMD=yes
- -DENABLE_TESTS=$(usex test)
- -DUSE_LINKED_FFMPEG=yes
- -DUSE_VTUNE=no
- -DUSE_VULKAN=$(usex vulkan)
- -DWAYLAND_API=$(usex wayland)
- -DX11_API=yes # X libs are currently hard-required either way
-
- # 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)
- -DCHECK_PULSE=$(usex pulseaudio)
- -DCHECK_SNDIO=$(usex sndio)
- -DLAZY_LOAD_LIBS=no
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build unittests
-}
-
-src_install() {
- insinto /usr/lib/${PN}
- doins -r "${BUILD_DIR}"/bin/.
-
- fperms +x /usr/lib/${PN}/pcsx2-qt
- dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
-
- newicon bin/resources/icons/AppIconLarge.png ${PN}.png
- make_desktop_entry ${PN} ${PN^^}
-
- dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
-
- use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
-}
-
-pkg_postinst() {
- fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
-
- if [[ ${REPLACING_VERSIONS##* } ]] &&
- ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
- elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
- elog "notably now a 64bit build using Qt6. Just-in-case it is recommended"
- elog "to backup configs, save states, and memory cards before using."
- elog
- elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
- fi
-}
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
deleted file mode 100644
index 1bf5c7c73e38..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
- # unbundling on this package has become unmaintainable and, rather than
- # handle submodules separately, using a tarball that includes them
- SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
- 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 +clang jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: libglvnd, qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
- app-arch/lz4:=
- app-arch/zstd:=
- dev-libs/libaio
- dev-qt/qtbase:6[concurrent,gui,widgets]
- dev-qt/qtsvg:6
- media-libs/freetype
- media-libs/libglvnd[X]
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libsdl2[haptic,joystick]
- media-libs/libwebp:=
- media-video/ffmpeg:=
- net-libs/libpcap
- net-misc/curl
- sys-apps/dbus
- sys-libs/zlib:=
- virtual/libudev:=
- x11-libs/libXrandr
- alsa? ( media-libs/alsa-lib )
- jack? ( virtual/jack )
- pulseaudio? ( media-libs/libpulse )
- sndio? ( media-sound/sndio:= )
- vulkan? (
- media-libs/shaderc
- media-libs/vulkan-loader
- )
- wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
- ${COMMON_DEPEND}
- >=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
-"
-BDEPEND="
- dev-qt/qttools:6[linguist]
- clang? ( sys-devel/clang:* )
- wayland? (
- dev-util/wayland-scanner
- kde-frameworks/extra-cmake-modules
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.4667-flags.patch
- "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if [[ ${PV} != 9999 ]]; then
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
- -i cmake/Pcsx2Utils.cmake || die
- fi
-
- # relax Qt6 and SDL2 version requirements which often get restricted
- # without a specific need, please report a bug to Gentoo (not upstream)
- # if a still-available older version is really causing issues
- sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
- -i cmake/SearchForStuff.cmake || die
-}
-
-src_configure() {
- # note that upstream only supports clang and ignores gcc issues, e.g.
- # https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
- # (CMakeLists.txt also gives a big warning if compiler is not clang)
- if use clang && ! tc-is-clang; then
- local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
- strip-unsupported-flags
- fi
-
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=no
- -DDISABLE_ADVANCE_SIMD=yes
- -DENABLE_TESTS=$(usex test)
- -DUSE_LINKED_FFMPEG=yes
- -DUSE_VTUNE=no
- -DUSE_VULKAN=$(usex vulkan)
- -DWAYLAND_API=$(usex wayland)
- -DX11_API=yes # X libs are currently hard-required either way
-
- # 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)
- -DCHECK_PULSE=$(usex pulseaudio)
- -DCHECK_SNDIO=$(usex sndio)
- -DLAZY_LOAD_LIBS=no
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build unittests
-}
-
-src_install() {
- insinto /usr/lib/${PN}
- doins -r "${BUILD_DIR}"/bin/.
-
- fperms +x /usr/lib/${PN}/pcsx2-qt
- dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
-
- newicon bin/resources/icons/AppIconLarge.png ${PN}.png
- make_desktop_entry ${PN} ${PN^^}
-
- dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
-
- use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
-}
-
-pkg_postinst() {
- fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
-
- # calls aplay (or gst-play/launch-1.0 as fallback in next version)
- # https://github.com/PCSX2/pcsx2/issues/11141
- optfeature "UI sound effects support" media-sound/alsa-utils
-
- if [[ ${REPLACING_VERSIONS##* } ]] &&
- ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
- elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
- elog "notably now a 64bit build using Qt6. Just-in-case it is recommended"
- elog "to backup configs, save states, and memory cards before using."
- elog
- elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
- fi
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2024-07-02 5:17 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2024-07-02 5:17 UTC (permalink / raw
To: gentoo-commits
commit: 1109347a0b07161d08e96bf82608361d24a18a3f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 04:48:07 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 05:17:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1109347a
games-emulation/pcsx2: fix build with musl
Originally thought would only need _GNU_SOURCE, but there is a bit
more to the fix 7zip upstream did in bug #928730. Could still patch
but can go for the easy solution which will use neither cpu_set_t
nor (more importantly) pthread_attr_setaffinity_np that musl lacks.
Also fix a different musl issue only affecting >=pcsx2-1.7.5913,
workaround imported from Chimera Linux.
Closes: https://bugs.gentoo.org/935298
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../pcsx2/files/pcsx2-1.7.5913-musl-cache.patch | 20 ++++++++++++++++++++
games-emulation/pcsx2/pcsx2-1.7.5835.ebuild | 4 ++++
games-emulation/pcsx2/pcsx2-1.7.5913.ebuild | 5 +++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 5 +++++
4 files changed, 34 insertions(+)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5913-musl-cache.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5913-musl-cache.patch
new file mode 100644
index 000000000000..3383904fee48
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5913-musl-cache.patch
@@ -0,0 +1,20 @@
+Patch adapted from [1]:
+
+ musl doesn't expose these sysconf values, so just use the loop
+ below that reads them out of sysfs coherency_line_size only
+
+[1] https://github.com/chimera-linux/cports/blob/114b576aee3ebc25b48ac120da1a1093dcc4365f/user/pcsx2/patches/cache.patch
+--- a/common/Linux/LnxHostSys.cpp
++++ b/common/Linux/LnxHostSys.cpp
+@@ -143,7 +143,11 @@
+ size_t HostSys::GetRuntimeCacheLineSize()
+ {
++ #if defined(__GLIBC__)
+ int l1i = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
+ int l1d = sysconf(_SC_LEVEL1_ICACHE_LINESIZE);
+ int res = (l1i > l1d) ? l1i : l1d;
++ #else
++ int res = 0;
++ #endif
+ for (int index = 0; index < 16; index++)
+ {
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
index 87e19f866161..ece5dfc93cc5 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
@@ -105,6 +105,10 @@ src_configure() {
strip-unsupported-flags
fi
+ # pthread_attr_setaffinity_np is not supported on musl, may be possible
+ # to remove if bundled lzma code is updated like 7zip did (bug #935298)
+ use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
+
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
-DDISABLE_ADVANCE_SIMD=yes
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
index f8d4b9f5a3aa..deabb28cc4af 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
"${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch
+ "${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
)
src_prepare() {
@@ -107,6 +108,10 @@ src_configure() {
strip-unsupported-flags
fi
+ # pthread_attr_setaffinity_np is not supported on musl, may be possible
+ # to remove if bundled lzma code is updated like 7zip did (bug #935298)
+ use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
+
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
-DDISABLE_ADVANCE_SIMD=yes
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f8d4b9f5a3aa..deabb28cc4af 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
"${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch
+ "${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
)
src_prepare() {
@@ -107,6 +108,10 @@ src_configure() {
strip-unsupported-flags
fi
+ # pthread_attr_setaffinity_np is not supported on musl, may be possible
+ # to remove if bundled lzma code is updated like 7zip did (bug #935298)
+ use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
+
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
-DDISABLE_ADVANCE_SIMD=yes
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
@ 2024-07-02 15:55 Ionen Wolkens
0 siblings, 0 replies; 20+ messages in thread
From: Ionen Wolkens @ 2024-07-02 15:55 UTC (permalink / raw
To: gentoo-commits
commit: a977584dd98fc70320153189c12fdeb8e33ed432
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 15:52:24 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 15:52:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a977584d
games-emulation/pcsx2: further fix build with musl
Due to a missing header, likely only fails with some
specific combination of clang+libstdc+musl or so.
Closes: https://bugs.gentoo.org/935352
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
| 9 +++++++++
games-emulation/pcsx2/pcsx2-1.7.5835.ebuild | 1 +
games-emulation/pcsx2/pcsx2-1.7.5913.ebuild | 1 +
games-emulation/pcsx2/pcsx2-9999.ebuild | 1 +
4 files changed, 12 insertions(+)
--git a/games-emulation/pcsx2/files/pcsx2-1.7.5835-musl-header.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5835-musl-header.patch
new file mode 100644
index 000000000000..f945bae30bbd
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5835-musl-header.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/935352
+--- a/pcsx2/SPU2/defs.h
++++ b/pcsx2/SPU2/defs.h
+@@ -8,4 +8,5 @@
+ #include <algorithm>
+ #include <array>
++#include <cstdio>
+
+ // --------------------------------------------------------------------------------------
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
index ece5dfc93cc5..50a1ae3cb150 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
+ "${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
)
src_prepare() {
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
index deabb28cc4af..ed8749726f75 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
"${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch
+ "${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
"${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
)
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index deabb28cc4af..ed8749726f75 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
"${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch
+ "${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
"${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
)
^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2024-07-02 15:55 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-19 5:48 [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2024-07-02 15:55 Ionen Wolkens
2024-07-02 5:17 Ionen Wolkens
2024-06-22 9:34 Ionen Wolkens
2024-05-23 0:53 Ionen Wolkens
2024-05-21 17:19 Ionen Wolkens
2024-04-13 17:29 Ionen Wolkens
2024-01-08 12:59 Ionen Wolkens
2023-10-10 20:20 Ionen Wolkens
2023-07-25 0:10 Ionen Wolkens
2023-07-01 9:07 Ionen Wolkens
2023-01-11 11:26 Ionen Wolkens
2022-12-29 20:29 Ionen Wolkens
2022-12-29 2:05 Ionen Wolkens
2022-09-23 0:27 Ionen Wolkens
2022-07-31 20:38 James Le Cuirot
2020-10-27 7:35 Joonas Niilola
2018-07-23 6:17 Sergei Trofimovich
2017-01-18 10:46 David Seifert
2016-01-13 14:23 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox