commit: 33307a72972b7e5a0191ef291f72eb7490c7fa47
Author: Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Thu Feb 25 14:38:04 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 1 08:25:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33307a72
games-emulation/pcsx2: drop unused dependencies
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../{pcsx2-9999.ebuild => pcsx2-1.6.0-r2.ebuild} | 79 ++++++++++++----------
games-emulation/pcsx2/pcsx2-9999.ebuild | 5 +-
2 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild
b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
similarity index 50%
copy from games-emulation/pcsx2/pcsx2-9999.ebuild
copy to games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index b1c9556114d..39f1ff3ec9e 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -2,54 +2,50 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+MY_PV="${PV/_/-}"
-inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
+inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
DESCRIPTION="A PlayStation 2 emulator"
HOMEPAGE="https://pcsx2.net/";
-EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git";
-EGIT_SUBMODULES=()
+SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
-IUSE="test"
-
-RESTRICT="!test? ( test )"
+KEYWORDS="-* ~amd64 ~x86"
RDEPEND="
- app-arch/bzip2
- app-arch/xz-utils
- dev-cpp/yaml-cpp:=
- dev-libs/libaio
- dev-libs/libfmt:=
- dev-libs/libxml2:2
- media-libs/alsa-lib
- media-libs/libpng:=
- media-libs/libsamplerate
- media-libs/libsdl2[haptic,joystick,sound]
- media-libs/libsoundtouch
- media-libs/portaudio
- net-libs/libpcap
- sys-libs/zlib
- virtual/libudev
- virtual/opengl
- x11-libs/gtk+:3
- x11-libs/libICE
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/wxGTK:3.0-gtk3[X]
-"
-DEPEND="${RDEPEND}
- dev-cpp/pngpp
- dev-cpp/sparsehash
+ 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]
"
-BDEPEND="test? ( dev-cpp/gtest )"
+DEPEND="${RDEPEND}"
+
+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
@@ -61,6 +57,7 @@ pkg_setup() {
}
src_configure() {
+ multilib_toolchain_setup x86
# Build with ld.gold fails
# https://github.com/PCSX2/pcsx2/issues/1671
tc-ld-disable-gold
@@ -68,19 +65,31 @@ src_configure() {
# 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_SYSTEM_YAML=TRUE
-DUSE_VTUNE=FALSE
)
@@ -93,6 +102,6 @@ src_install() {
# 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"
+ QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
cmake_src_install
}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild
b/games-emulation/pcsx2/pcsx2-9999.ebuild
index b1c9556114d..5f738f270f9 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -40,10 +40,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/wxGTK:3.0-gtk3[X]
"
-DEPEND="${RDEPEND}
- dev-cpp/pngpp
- dev-cpp/sparsehash
-"
+DEPEND="${RDEPEND}"
BDEPEND="test? ( dev-cpp/gtest )"
FILECAPS=(
