diff options
Diffstat (limited to 'games-emulation/pcsx2')
| -rw-r--r-- | games-emulation/pcsx2/Manifest | 5 | ||||
| -rw-r--r-- | games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild | 112 | ||||
| -rw-r--r-- | games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild | 2 | ||||
| -rw-r--r-- | games-emulation/pcsx2/pcsx2-9999.ebuild | 7 |
4 files changed, 6 insertions, 120 deletions
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index a27006a860df..0b95e8c1a278 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,6 +1,5 @@ AUX pcsx2-1.6.0-disable-setcap.patch 2783 BLAKE2B 8840d64feeb042c8442fae30c40fa05e5de19f0b5da9f383bb097e8f092bbabcaf529424e11eb99bb3af81ac8407cd207f846683cd359ac9ea11f8d40a4a72dd SHA512 463ef253a192d3531b1733c4006bd5870aaa31ae58e54d188edd889bb0c3e3eb7d2e76442461c68105ff51753b29add02a673aad4eb5ed27a0b9a66345fea08d DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 -EBUILD pcsx2-1.6.0-r1.ebuild 2837 BLAKE2B 81174d609dd0c17ba0ac3a144c9bb2835dcc19f7065908dd6bf8de1b95bcadec7776bd85ea3efce6e01a104778e1168d4079575c907de052999b99278b647b1d SHA512 304662644fc9f70bcd1c464e63cc828f0323f1f748801d48d5185619c5897e0c84d849398b40a28369923d94cb28ca6aea0a9f9706cea2afba4af66187c88025 -EBUILD pcsx2-1.6.0-r2.ebuild 2809 BLAKE2B 242f23326abcd7fd989c4788ea29470a05c91133ac96967db1ac3d2b83c4b63b9ac200fb47fa1b37980462a0d480c026cad461235dd8299f7d8ad012a9439c92 SHA512 9beb5958247b61c11f61f3ba3edf4565e40c781acb6f01cd7045889a2573b4b88637cd970f069e15f1913685973934889a852314da49e3e89e4851afee5c9f8c -EBUILD pcsx2-9999.ebuild 2607 BLAKE2B 3961c43af3ea246096a127469f48de24125ee8801158e881cd6c01e6ae4b7da7379319455529b2582a91ff7a46a857e0d8ef4e9de7569ff33916e8ff3114d9d8 SHA512 ca2e4d652e1477669bed7c07ba554b12560e8ab2251536f5ca4e30cab7413515fce16a38aa1875e2945d07c8f7c641415ec1c0eb55a208f653d4a708f9d311fd +EBUILD pcsx2-1.6.0-r2.ebuild 2808 BLAKE2B f947a2cb7ec6a2ba32514a622317913a3b63fc4063c7b7a1aa36012ecefb8bae327a8673e9b1d66002f6f059cd0d08faf3de4d79566fe451305a47b2de615ced SHA512 cf504517c5dac9cfff4adaf7fe7425e468acd7f1e5a8c7ff0670040ed5e8970dd8e304d716831e8cea4c1fc015a499e4db791fd0df4913f28ed25cc89664433a +EBUILD pcsx2-9999.ebuild 2638 BLAKE2B 6e59c820b624bbff5c041e3723d3444c11ae78dcdb7ff5e48c6a17d0f0777a6c8b8f8826ba8c1e7e320dccb3b18f23696c598b5afe27668c5be21f37faa760cd SHA512 d44cad0597b3fd0229e5667e1236d8001e9ec2ab490727e14d128274ead62755761497951e53da4f0cf183a304a9950b9227b9f095362d8912958fa18c953c97 MISC metadata.xml 533 BLAKE2B 6133475168a5df84979b4ce8a195451abcc28f6cc910b937bc9de5b31f4f149c251602786d05d256a0c863d4a49ba5b47c8bbc957d1f87e5019ea78e8e3a5295 SHA512 9be0d69ebad684eeaad115e7b3e5ab66093e87a48523ef5b0cf6dff30ff5b0be9fdfc93aa755767e55a2e1a74fbc34316242acb24148560ae4a7382586eac1a5 diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild deleted file mode 100644 index 7bdeda838f0d..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" -inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets - -MY_PV="${PV/_/-}" - -DESCRIPTION="A PlayStation 2 emulator" -HOMEPAGE="https://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:${WX_GTK_VER}[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 - ) - - 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 -} diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild index 36422246430f..a9b0dc2b9ffb 100644 --- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="-* amd64 ~x86" +KEYWORDS="-* amd64 x86" RDEPEND=" app-arch/bzip2[abi_x86_32(-)] diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 2df1c8c2ebc9..98a12b52d531 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -9,9 +9,9 @@ inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets DESCRIPTION="A PlayStation 2 emulator" HOMEPAGE="https://pcsx2.net/" EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git" -EGIT_SUBMODULES=() +EGIT_SUBMODULES=( 3rdparty/imgui/imgui ) -LICENSE="GPL-3" +LICENSE="GPL-3 Apache-2.0 OFL-1.1" # TODO: needs review for a full list SLOT="0" KEYWORDS="" IUSE="pulseaudio test" @@ -42,6 +42,7 @@ RDEPEND=" x11-libs/libICE x11-libs/libX11 x11-libs/libXext + x11-libs/libXrandr x11-libs/wxGTK:${WX_GTK_VER}[X] pulseaudio? ( media-sound/pulseaudio ) " @@ -96,8 +97,6 @@ src_configure() { -DXDG_STD=TRUE -DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}" - # wxGTK must be built against same sdl version - -DSDL2_API=TRUE -DUSE_SYSTEM_YAML=TRUE -DUSE_VTUNE=FALSE ) |