commit: 3b865db19463ac0ee68f5d428b3d9fd3a1ed521b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Aug 15 08:52:16 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Aug 15 10:37:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b865db1
games-emulation/ppsspp: Fix REQUIRED_USE logic Package-Manager: Portage-2.3.46, Repoman-2.3.10 games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild | 96 +++++++++++++++++++++++++++ games-emulation/ppsspp/ppsspp-9999.ebuild | 53 ++++++++------- 2 files changed, 122 insertions(+), 27 deletions(-) diff --git a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild new file mode 100644 index 00000000000..25ec0aa433c --- /dev/null +++ b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils desktop + +DESCRIPTION="A PSP emulator written in C++" +HOMEPAGE="https://www.ppsspp.org/"; +SRC_URI=" + https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ${P}-ffmpeg.tar.gz ) + https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ${P}-assets_lang.tar.gz + https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ${P}-pspautotests.tar.gz + https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ${P}-dx9sdk.tar.gz + https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ${P}-ext_glslang.tar.gz + https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ${P}-ext_armips.tar.gz + https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ${P}-ext_armips_ext_tinyformat.tar.gz + https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="headless libav +qt5 sdl +system-ffmpeg" +REQUIRED_USE="!qt5? ( sdl )" + +RDEPEND=" + sys-libs/zlib:= + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + !sdl? ( dev-qt/qtmultimedia:5 ) + ) + sdl? ( media-libs/libsdl2 ) + system-ffmpeg? ( + !libav? ( media-video/ffmpeg:= ) + libav? ( media-video/libav:= ) + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.2-assets-lookup.patch + "${FILESDIR}"/${PN}-1.4-O2.patch +) + +src_unpack() { + unpack "${P}.tar.gz" + cd "${S}" || die + local i list=( assets_lang pspautotests dx9sdk ext_glslang ext_armips ext_SPIRV-Cross ext_armips_ext_tinyformat ) + if ! use system-ffmpeg; then + list+=( ffmpeg ) + fi + for i in "${list[@]}"; do + tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz" + done +} + +src_prepare() { + if ! use system-ffmpeg; then + sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die + fi + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DHEADLESS=$(usex headless) + -DUSING_QT_UI=$(usex qt5) + $(cmake-utils_use_find_package sdl SDL2) + -DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg) + ) + cmake-utils_src_configure +} + +src_install() { + use headless && dobin "${BUILD_DIR}/PPSSPPHeadless" + insinto /usr/share/"${PN}" + doins -r "${BUILD_DIR}/assets" + dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)" + local i + for i in 16 24 32 48 64 96 128 256 512 ; do + doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png" + done + make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game" +} + +pkg_postinst() { + if use system-ffmpeg; then + ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it." + ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations." + fi +} diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild index 5ece82adfcc..a65fd45f5a9 100644 --- a/games-emulation/ppsspp/ppsspp-9999.ebuild +++ b/games-emulation/ppsspp/ppsspp-9999.ebuild @@ -1,36 +1,36 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils cmake-utils git-r3 +inherit cmake-utils desktop git-r3 -DESCRIPTION="A PSP emulator written in C++." +DESCRIPTION="A PSP emulator written in C++" HOMEPAGE="https://www.ppsspp.org/"; EGIT_REPO_URI="https://github.com/hrydgard/${PN}.git"; +EGIT_SUBMODULES=( '*' ) LICENSE="GPL-2" SLOT="0" -IUSE="+qt5 sdl headless libav +system-ffmpeg" -REQUIRED_USE=" - !headless? ( || ( qt5 sdl ) ) - ?? ( qt5 sdl ) -" -EGIT_SUBMODULES=( '*' ) +KEYWORDS="" +IUSE="headless libav +qt5 sdl +system-ffmpeg" +REQUIRED_USE="!qt5? ( sdl )" -RDEPEND="sys-libs/zlib - system-ffmpeg? ( - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) - ) - sdl? ( media-libs/libsdl2 ) +RDEPEND=" + sys-libs/zlib:= qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 - )" - + !sdl? ( dev-qt/qtmultimedia:5 ) + ) + sdl? ( media-libs/libsdl2 ) + system-ffmpeg? ( + !libav? ( media-video/ffmpeg:= ) + libav? ( media-video/libav:= ) + ) +" DEPEND="${RDEPEND}" src_unpack() { @@ -52,10 +52,11 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DHEADLESS=$(usex headless) -DUSING_QT_UI=$(usex qt5) + $(cmake-utils_use_find_package sdl SDL2) -DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg) - -DHEADLESS=$(usex headless) - ) + ) cmake-utils_src_configure } @@ -63,14 +64,12 @@ src_install() { use headless && dobin "${BUILD_DIR}/PPSSPPHeadless" insinto /usr/share/"${PN}" doins -r "${BUILD_DIR}/assets" - if use qt5 || use sdl ; then - dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)" - local i - for i in 16 24 32 48 64 96 128 256 512 ; do - doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png" - done - make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game" - fi + dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)" + local i + for i in 16 24 32 48 64 96 128 256 512 ; do + doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png" + done + make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game" } pkg_postinst() {
