From 2018227e9344edb9da15fc6a4a8298086cc2aa77 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Jun 2019 21:45:28 +0100 Subject: gentoo resync : 02.06.2019 --- games-emulation/Manifest.gz | Bin 10025 -> 10022 bytes games-emulation/dolphin/Manifest | 3 +- games-emulation/dolphin/dolphin-5.0.ebuild | 3 +- .../files/dolphin-5.0-soundtouch-exceptions.patch | 19 ++++ games-emulation/pcsx2/Manifest | 4 +- games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild | 109 ++++++++++++++++++++ games-emulation/pcsx2/pcsx2-1.4.0.ebuild | 110 --------------------- games-emulation/pcsx2/pcsx2-9999.ebuild | 1 - 8 files changed, 134 insertions(+), 115 deletions(-) create mode 100644 games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch create mode 100644 games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild delete mode 100644 games-emulation/pcsx2/pcsx2-1.4.0.ebuild (limited to 'games-emulation') diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz index b88d23032487..33786db041e3 100644 Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest index d4a778022d9b..8a269ef31847 100644 --- a/games-emulation/dolphin/Manifest +++ b/games-emulation/dolphin/Manifest @@ -1,7 +1,8 @@ AUX dolphin-5.0-CHAR_WIDTH-collision.patch 2043 BLAKE2B d29f1f9ff360d79105d7020174bfc5063ad18c544d17056dca055174d8d0c837671f5d04f95de98e140d8634651f869e1a0d9e79b834f0f039ce59900c0696b0 SHA512 47c25a3fd5e6c47e34fe23d5faa71ea316c708fa2bbcbc5136a415fc25a0b207c4d18bfedb2d7c4e2a71394581d1e41fd7d4cca3544d34e3f4a6a84fee360314 AUX dolphin-5.0-no-pie.patch 1068 BLAKE2B e941c7002b7adaaefc5c9ea2433a1362c1698b325c2804a31eac616c1185205c27b10466a9f4f1f3e2c2e3773f24f5cae6afb849cbf18a574dfbe08622f88ffa SHA512 8deacd47896003687e25117d758cba6423a6729e6bd54c1bdf39e904f6659ee42d5740338fd94301ef98befaaf02697e32d5fecb604ddc38186b1f81285aec56 +AUX dolphin-5.0-soundtouch-exceptions.patch 591 BLAKE2B 7a5f25041214f58e99f8e6d50544392be6f1336a070e812b8f4675c777a3e53482c49fdf578781d2a8bb6f7eb6517f6dde087965482756e7b156958c25c815fb SHA512 df9d1832ea2d844ec7ca79b01a3fe8463e21feb089105b79c91218db0d6426e1fc489d3b40688e02a13bef8782b80c50f09f0d0603822c035e8ed99b559a0f39 AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a -EBUILD dolphin-5.0.ebuild 4610 BLAKE2B f10b2979143b167887758b6d70db658ce0fe4d9c0bdc57ccc87b16b5682ddebd23f9e14d5fb000b250767bd11487fa13e988b76fd6958cfa56a396c2e5adea4e SHA512 d45ab963c14353014fd9178b61ebecdb017e67ea8e99b252712acbd9732ddb31ae5125ffeaef6cd66276b526dc74955904141a88252682cf34ea3df184ac6746 +EBUILD dolphin-5.0.ebuild 4655 BLAKE2B c78423d3ac3063e0a758e105f2cd3dd4e27bcf92c2bcd7544424d570e180c7c11f4ae809f1faad2ffb55357beb01b9de3c03e1bab2f60bcf7de2bdb2516256b1 SHA512 51a8927b7bf1fca75c0939c220cd1f1acba53bd9e641ee284725c0cae495c14e06bd9753db01e82cb7c64c57e6057a25d2b6fec27e4b8397eb52ca52cb4498fa EBUILD dolphin-9999.ebuild 3917 BLAKE2B 1f2bb40aeb8e7aac5b2fd566f23506b28ac7a895aea076cff52f5f2d1cb3cd9dafe4be6efd11ba43d53d5c24626c05ff2a37a766ac955d84a8b24b21b0e9718c SHA512 3df915167defe593a915292997b3e063b090224d82071ffbbecf9a3cf4a1b8ab03b9afcb1bd7466127b69a923bd6b6a29af25fb60b116aecfcfad39d4f2a81cd MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5 diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild index 491d92991bef..871b1246ade5 100644 --- a/games-emulation/dolphin/dolphin-5.0.ebuild +++ b/games-emulation/dolphin/dolphin-5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -75,6 +75,7 @@ PATCHES=( "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch "${FILESDIR}"/${P}-xgetbv.patch "${FILESDIR}"/${P}-no-pie.patch + "${FILESDIR}"/${P}-soundtouch-exceptions.patch ) src_prepare() { diff --git a/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch new file mode 100644 index 000000000000..ffd07cf0697f --- /dev/null +++ b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/686752 + +Description: Fix FTBFS with SoundTouch 2.1.2 + Explicitly disable exceptions in SoundTouch headers because Dolphin + is compiled with -fno-exceptions. +Author: James Cowgill +Bug-Debian: https://bugs.debian.org/917671 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Source/Core/AudioCommon/OpenALStream.h ++++ b/Source/Core/AudioCommon/OpenALStream.h +@@ -32,6 +32,7 @@ + #define BOOL SoundTouch_BOOL + #endif + ++#define ST_NO_EXCEPTION_HANDLING + #include + #include + diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index c7fa76d9cf7f..3267f5294083 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,6 +1,6 @@ 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 -EBUILD pcsx2-1.4.0.ebuild 2897 BLAKE2B 29580f7dcc52243cfba39b6cff4c0cec2105d0517fb12686d4fa2643a8899b341b40f8cf2a8da33a7d77d2bd3f5f6e47e3648fe16b4eb902d5f01cfaef31e0c2 SHA512 a015bc26554976d1c5f9a3903cd090aaf4eec5f6aa4ce9a0d991fc2dcb71371f0ce8ee358b20d3f0f7e9f40fd82a87197601cc64694f2df8839641e08713e991 -EBUILD pcsx2-9999.ebuild 2530 BLAKE2B a7636a21259bfb43293940bedba24521570b844fb04deb59a8e4017cb51fe0d372552156f4e3ac72c9abdde8c166c6c21271378ff7cb29f41d946562b313f055 SHA512 38214dabe6d312fc5a4a3a3ce73285b385f2668b83d4a280bf023804db2c6f60debd150b5304b878137d06cb9e05aa8eab22a45bf8e64d27d4c5c0db096fc2e0 +EBUILD pcsx2-1.4.0-r1.ebuild 2862 BLAKE2B 3d18870ff5ea8f0cfe42ac5d4c42b513e004a46b6540bc7bcf25c29b28cfaefb07ee3da983112f54442714c5a1551a89c8b8fcf9fe5b00c6729c4c75c63a6c84 SHA512 bea798521b7978df7a06a1130c38d8b57e68902e03915a2efde51cf541c9ab2da3f67ac3a1c90f86acdd7904c13bbb19369247c39ce436ac79674f67e15a89ad +EBUILD pcsx2-9999.ebuild 2498 BLAKE2B a9fee170d38a6fa704a9bb79041eca8520a7b36661af8fa2daa7d551ecf2e2a2e4ed2f64a0fd4a68cff13e8db25380b6eb2dfc7abf106ad5f34ca45c935a96c7 SHA512 3cabace84c937c8e3a3ebdf633a6c4d3c562262c526a05525b76c75eef688c88a8b4996c82cddc84b0709c4feb61612db0e97173dbd70bbfb590423fd34b519d MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3 diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild new file mode 100644 index 000000000000..0ddc30dd7ba3 --- /dev/null +++ b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW" +MY_PV="${PV/_/-}" + +inherit cmake-utils l10n 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" +IUSE="" + +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-1.2.4[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] +" +# 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 +" + +S="${WORKDIR}/${PN}-${MY_PV}" + +PATCHES=( + "${FILESDIR}"/${P}-gcc5.patch + "${FILESDIR}"/${P}-xgetbv.patch +) + +clean_locale() { + rm -R "${S}"/locales/"${1}" || die +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then + if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then + die "${PN} does not compile with gcc less than 4.8" + fi + fi +} + +src_prepare() { + cmake-utils_src_prepare + l10n_for_each_disabled_locale_do clean_locale +} + +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_INSTALL_PREFIX=/usr + -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" need-wxwidgets unicode + cmake-utils_src_configure +} + +src_install() { + # Upstream issue: https://github.com/PCSX2/pcsx2/issues/417 + QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*" + + cmake-utils_src_install +} diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild deleted file mode 100644 index ac18cbd565e4..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW" -MY_PV="${PV/_/-}" - -inherit cmake-utils l10n 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" -IUSE="" - -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-1.2.4[abi_x86_32(-)] - virtual/jpeg:62[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] -" -# 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 -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -PATCHES=( - "${FILESDIR}"/${P}-gcc5.patch - "${FILESDIR}"/${P}-xgetbv.patch -) - -clean_locale() { - rm -R "${S}"/locales/"${1}" || die -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then - if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then - die "${PN} does not compile with gcc less than 4.8" - fi - fi -} - -src_prepare() { - cmake-utils_src_prepare - l10n_for_each_disabled_locale_do clean_locale -} - -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_INSTALL_PREFIX=/usr - -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" need-wxwidgets unicode - cmake-utils_src_configure -} - -src_install() { - # Upstream issue: https://github.com/PCSX2/pcsx2/issues/417 - QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*" - - cmake-utils_src_install -} diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 5526d71d9d27..78e81473e330 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -24,7 +24,6 @@ RDEPEND=" media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] - virtual/jpeg:62[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] -- cgit v1.2.3