From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9066115808B for ; Wed, 16 Feb 2022 23:10:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5802E0867; Wed, 16 Feb 2022 23:10:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5DC8E0867 for ; Wed, 16 Feb 2022 23:10:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F054342E0E for ; Wed, 16 Feb 2022 23:10:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A2D72A0 for ; Wed, 16 Feb 2022 23:10:38 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1645052989.1f781826a1c70818ec1168862af737ef81c67bfd.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild X-VCS-Directories: games-emulation/pcsx2/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 1f781826a1c70818ec1168862af737ef81c67bfd X-VCS-Branch: master Date: Wed, 16 Feb 2022 23:10:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0dbfd81a-ce75-40e5-ab86-1db976d0aafc X-Archives-Hash: 831383caee4c6c14d7826accc2e996a1 commit: 1f781826a1c70818ec1168862af737ef81c67bfd Author: Ionen Wolkens gentoo org> AuthorDate: Wed Feb 16 22:47:21 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Feb 16 23:09:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f781826 games-emulation/pcsx2: drop passing unnecessary toolchain file Undocumented not-for-ebuilds MYCMAKEARGS was used as a way to replace the toolchain file, however Gentoo's is perfectly fine here thanks to `multilib_toolchain_setup x86` setting this up. Still revbump to ~arch as a precaution, but should be fine. Could use some other fixups but ideal would be for a new release (or maybe start looking into snapshots after upstream stops doing major changes) to get rid of all this 32bit stuff. Bug: https://bugs.gentoo.org/833100 Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild | 103 ++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild new file mode 100644 index 000000000000..cc399bd2cc8a --- /dev/null +++ b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2022 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}" + +S="${WORKDIR}/${PN}-${MY_PV}" + +FILECAPS=( + -m 755 "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" + + 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 +}