From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- games-emulation/pcsx2/Manifest | 6 +- games-emulation/pcsx2/pcsx2-1.6.0.ebuild | 101 ++++++++++++++++++++++++++++ games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild | 99 --------------------------- games-emulation/pcsx2/pcsx2-9999.ebuild | 6 +- 4 files changed, 108 insertions(+), 104 deletions(-) create mode 100644 games-emulation/pcsx2/pcsx2-1.6.0.ebuild delete mode 100644 games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild (limited to 'games-emulation/pcsx2') diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 6e9dac5bad3c..4b69c1fce179 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,9 +1,9 @@ AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad96788184cbc19e1d983a37524d63618ce45009fba555f31f75c8a325156ae0cbfff74531c469add6c867ffc73f47e8 SHA512 c95b5abd255f4d0a1d9efa8b45126fea2c57ed2110358687a14d44c5ccc8f670f33a5e9b56bd9e3ea4806ad2429a84b70d796bec9c909262379bba5914e7d51d AUX pcsx2-1.4.0-xgetbv.patch 1361 BLAKE2B f6e28703f59dbf79c38812e9a61828f1c40b00982e86b7f3d8b507c54a331b38febbafc98012bc43a84b5ba077af56d73cfb9f1c036c0b619ace1129b91ad031 SHA512 03bc1059dbca73382c3d708e92eef270bbf7958736010d8ffcb92c81972e34e1603007b2aad41b70694791760f9323353815f3468392e39e3893c06327824022 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb -DIST pcsx2-1.6.0_rc.tar.gz 17914747 BLAKE2B e088997a7dc8632070f6bcb70defe0ea226fe250bcefd76ab7499d765ba38e7c249fa4e7048815c173fb2e529ef9cd7e139e03b5a178e5dbcaacab6442bb5517 SHA512 41da55efe0652dc2494c7266375a00f7942f45cfbc2602ab981739102876781c474e54758a9c556f189f7b2e34c81fd1f027cfbc4033fb3b817d63387a9c9db3 +DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 EBUILD pcsx2-1.4.0-r1.ebuild 2832 BLAKE2B ef3c11ebaba4a40d2f483628e266d312585fb8ed3366bf19a8fbcb45ebab6709483d4b4b32e20d4e77741257637f29d3891188c5dac58b372708b848d13aa684 SHA512 8b7cbbbca5b5dce6542571f52549600eb38679d74f2d6388533f08d5d8a0a59af136ac83c803894ea723528050e8638bd2b66a6434bdd33efec5fac497aa113c EBUILD pcsx2-1.4.0-r2.ebuild 2116 BLAKE2B c270c39b91613938a4d9eb3fc2742277521eb28d00d1c68877ab8322ede629be362cc6869d3229a13a4e99720b46068686acbd62f521ee8adc616426aaec0ec8 SHA512 905240f48058af46d6abe65c2c173fa463cff58a3d12cf074d282ede0d59044653a499db04e3ec96ae460da45189c3c67f9d2fac1a488bcdd671e03d5a779574 -EBUILD pcsx2-1.6.0_rc.ebuild 2673 BLAKE2B 0a8c480095485d8fef02dc3c89e2b0238e2b70a03e104659f75c38c919e158ac50c8007af7f44bab0a6baec10dfabc552f7a79e318c3c8b9964e599eb382a7fb SHA512 17f4517f7acd2dde7fbe7f3fb1d21bdb229b268a4e99da971be04d88d22645a9d286a366b52c38b54b41f4f4b3dd96de0355058eee2e6762d9e9ca931bd673f4 -EBUILD pcsx2-9999.ebuild 2595 BLAKE2B efef68306fe9695d494f40dfd7507ca15e7084906c4457570fbc2461c46c8f1d0126344dbae8584303dfc49c8eb5b20280ae90c7dc906c2c27f6ff9de4be15b6 SHA512 532385f0035cdeb56dcc36bb9746f11ec6056a0a87bfea66f0d005e3e051d478ee05c2621b5ccb5d3a90bfd28ea226a9a7f1d035b30c1d17b43ac0f12d0be657 +EBUILD pcsx2-1.6.0.ebuild 2700 BLAKE2B a1e54394c31cf5882ef2c681b69471da8d9eb5c155f6a410bc4c008e55abeb7045b539009e74c8829ae4c5f06eff263446e935efcfec305001093dabfab3608c SHA512 c55576bfc01aea39bd8550df4fcc9643176389046a1b6d68fad0a08d4e6dbc151464a07a0089ef81578335b2a44e470f92ef8b640295845c62a8ad8925af9814 +EBUILD pcsx2-9999.ebuild 2622 BLAKE2B 85b0c2becfb06ee1fabcc2a5a8ad3e05d571e3e4999b37543af9f79ca9113a7d9b39b7da3a1a65c9eada8d5fe2aa551b4e39735d9d511a89c1e56805f2529b01 SHA512 1c41b0b891571e849f5c4ef3394c7ac46fdef14adcc0db116bd585faf829814191d4fbf4bcd5a89dd99937ebadf4d6be88e9dd9b1aa7b4cc784e4e6c10f2ec54 MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3 diff --git a/games-emulation/pcsx2/pcsx2-1.6.0.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild new file mode 100644 index 000000000000..b264a1d56a5b --- /dev/null +++ b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +MY_PV="${PV/_/-}" + +inherit cmake flag-o-matic multilib toolchain-funcs 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(-)] + 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] +" +DEPEND="${RDEPEND} + dev-cpp/pngpp + dev-cpp/sparsehash +" + +S="${WORKDIR}/${PN}-${MY_PV}" + +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 + -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 + ) + + WX_GTK_VER="3.0-gtk3" 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_rc.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild deleted file mode 100644 index 58e7478a41b5..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild +++ /dev/null @@ -1,99 +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 toolchain-funcs 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(-)] - 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] -" -# Ensure no incompatible headers from eselect-opengl are installed, bug #510730 -DEPEND="${RDEPEND} - dev-cpp/pngpp - dev-cpp/sparsehash -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -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 - - # 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=TRUE - -DOPENCL_API=FALSE - -DPLUGIN_DIR="/usr/$(get_libdir)/${PN}" - # wxGTK must be built against same sdl version - -DSDL2_API=TRUE - -DUSE_VTUNE=FALSE - ) - - WX_GTK_VER="3.0-gtk3" 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-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 0f0a49453d1f..3de99b803123 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake git-r3 multilib toolchain-funcs wxwidgets +inherit cmake flag-o-matic git-r3 multilib toolchain-funcs wxwidgets DESCRIPTION="A PlayStation 2 emulator" HOMEPAGE="https://www.pcsx2.net" @@ -34,7 +34,6 @@ RDEPEND=" x11-libs/libXext[abi_x86_32(-)] >=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X] " -# Ensure no incompatible headers from eselect-opengl are installed, bug #510730 DEPEND="${RDEPEND} dev-cpp/pngpp dev-cpp/sparsehash @@ -52,6 +51,9 @@ pkg_setup() { 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" -- cgit v1.2.3