commit: 57b4a9d03988ca21db72dab9b524aec96f18504a Author: Yuri Konotopov <ykonotopov <AT> gnome <DOT> org> AuthorDate: Tue Aug 27 11:03:52 2019 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Aug 28 15:54:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b4a9d0
games-emulation/pcsx2: ebuild enhancements. Closes: https://bugs.gentoo.org/692208 Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org> Closes: https://github.com/gentoo/gentoo/pull/12798 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../{pcsx2-9999.ebuild => pcsx2-1.4.0-r2.ebuild} | 45 +++++++++------------- games-emulation/pcsx2/pcsx2-9999.ebuild | 22 +++++------ 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild similarity index 64% copy from games-emulation/pcsx2/pcsx2-9999.ebuild copy to games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild index f79952eccb6..d31cad3370a 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild @@ -1,55 +1,47 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 +MY_PV="${PV/_/-}" -inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets +inherit cmake-utils multilib wxwidgets DESCRIPTION="A PlayStation 2 emulator" HOMEPAGE="https://www.pcsx2.net"; -EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"; +SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="" +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/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] - net-libs/libpcap[abi_x86_32(-)] - >=sys-libs/zlib-1.2.4[abi_x86_32(-)] - virtual/libudev[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(-),-sdl,X] + x11-libs/wxGTK:3.0[abi_x86_32(-),X] " -# 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 + dev-cpp/sparsehash " -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 -} +S="${WORKDIR}/${PN}-${MY_PV}" + +PATCHES=( + "${FILESDIR}"/${P}-gcc5.patch + "${FILESDIR}"/${P}-xgetbv.patch +) src_configure() { multilib_toolchain_setup x86 @@ -80,17 +72,16 @@ src_configure() { -DGTK3_API=FALSE -DPLUGIN_DIR="/usr/$(get_libdir)/${PN}" # wxGTK must be built against same sdl version - -DSDL2_API=TRUE + -DSDL2_API=FALSE -DWX28_API=FALSE ) - WX_GTK_VER="3.0" need-wxwidgets unicode + WX_GTK_VER="3.0" setup-wxwidgets cmake-utils_src_configure } src_install() { # Upstream issue: https://github.com/PCSX2/pcsx2/issues/417 - QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*" - + QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2" cmake-utils_src_install } diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index f79952eccb6..9e646daf585 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets @@ -25,20 +25,19 @@ RDEPEND=" media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] - >=sys-libs/zlib-1.2.4[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] virtual/libudev[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(-),-sdl,X] + x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),-sdl,X] " # 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 + dev-cpp/sparsehash " pkg_setup() { @@ -77,20 +76,21 @@ src_configure() { -DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}" -DDOC_DIR=/usr/share/doc/"${PF}" -DEGL_API=FALSE - -DGTK3_API=FALSE + -DGTK3_API=TRUE -DPLUGIN_DIR="/usr/$(get_libdir)/${PN}" # wxGTK must be built against same sdl version -DSDL2_API=TRUE - -DWX28_API=FALSE ) - WX_GTK_VER="3.0" need-wxwidgets unicode + WX_GTK_VER="3.0-gtk3" setup-wxwidgets cmake-utils_src_configure } src_install() { - # Upstream issue: https://github.com/PCSX2/pcsx2/issues/417 - QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*" - + # 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-utils_src_install }
