commit: 91844fc261e827777441311e7f2fda5d5ef98079 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Feb 20 08:09:48 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Feb 20 10:10:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91844fc2
games-emulation/pcsx2: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> games-emulation/pcsx2/Manifest | 1 - games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch | 26 ------- .../pcsx2/files/pcsx2-1.4.0-xgetbv.patch | 26 ------- games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild | 86 ---------------------- 4 files changed, 139 deletions(-) diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 15e66eee855..bb30d90e594 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,2 +1 @@ -DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch deleted file mode 100644 index cfc941f2824..00000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 71991f24ef75b7da678d8de8d593bf82677d2708 Mon Sep 17 00:00:00 2001 -From: Yuri Konotopov <[email protected]> -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/files/pcsx2-1.4.0-xgetbv.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch deleted file mode 100644 index e90b0df9b6e..00000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 171e7f016dc9e132f9faf40a22f0312d45d356a5 Mon Sep 17 00:00:00 2001 -From: Jonathan Li <[email protected]> -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-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild deleted file mode 100644 index fc48152454b..00000000000 --- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -MY_PV="${PV/_/-}" - -inherit cmake multilib 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(-)] - media-libs/alsa-lib[abi_x86_32(-)] - media-libs/libpng:=[abi_x86_32(-)] - media-libs/libsdl[abi_x86_32(-),joystick,sound] - media-libs/libsoundtouch[abi_x86_32(-)] - media-libs/portaudio[abi_x86_32(-)] - sys-libs/zlib[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(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/wxGTK:3.0[abi_x86_32(-),X] -" -DEPEND="${RDEPEND} - dev-cpp/pngpp - dev-cpp/sparsehash -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -PATCHES=( - "${FILESDIR}"/${P}-gcc5.patch - "${FILESDIR}"/${P}-xgetbv.patch -) - -src_configure() { - multilib_toolchain_setup x86 - - # 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 - -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=FALSE - -DPLUGIN_DIR="/usr/$(get_libdir)/${PN}" - # wxGTK must be built against same sdl version - -DSDL2_API=FALSE - -DWX28_API=FALSE - ) - - WX_GTK_VER="3.0" setup-wxwidgets - cmake_src_configure -} - -src_install() { - # Upstream issue: https://github.com/PCSX2/pcsx2/issues/417 - QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2" - cmake_src_install -}
