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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ACC2B13835A for ; Sat, 28 Nov 2020 08:45:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02B4AE082B; Sat, 28 Nov 2020 08:45:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A34BAE082B for ; Sat, 28 Nov 2020 08:45:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72B71341492 for ; Sat, 28 Nov 2020 08:45:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23F7F3FB for ; Sat, 28 Nov 2020 08:45:42 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1606553133.9a7fc28d92805d500bb0e324c1574970b7cdad80.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/ppsspp/Manifest games-emulation/ppsspp/metadata.xml games-emulation/ppsspp/ppsspp-1.10.3.ebuild X-VCS-Directories: games-emulation/ppsspp/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 9a7fc28d92805d500bb0e324c1574970b7cdad80 X-VCS-Branch: master Date: Sat, 28 Nov 2020 08:45:42 +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: 7705397b-1abe-4010-82af-b053498d3f04 X-Archives-Hash: e68aa2289155369eb8abd524706320e6 commit: 9a7fc28d92805d500bb0e324c1574970b7cdad80 Author: Maciej Barć protonmail com> AuthorDate: Sat Nov 28 08:40:41 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Nov 28 08:45:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a7fc28d games-emulation/ppsspp: bump to 1.10.3, become maintainer Closes: https://bugs.gentoo.org/739212 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Maciej Barć protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/18336 Signed-off-by: Joonas Niilola gentoo.org> games-emulation/ppsspp/Manifest | 9 +++ games-emulation/ppsspp/metadata.xml | 25 +++--- games-emulation/ppsspp/ppsspp-1.10.3.ebuild | 114 ++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 9 deletions(-) diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest index 100fe7096ea..d1bd5fdbf15 100644 --- a/games-emulation/ppsspp/Manifest +++ b/games-emulation/ppsspp/Manifest @@ -1,3 +1,12 @@ +DIST ppsspp-1.10.3-assets_lang.tar.gz 623227 BLAKE2B 91bccaca863ffead629a00783d9afba8d8975a76085ce48bf7e8fa515f60c7e850b7aad023a365955576fc0093c1e2f33813a41225b1728e1cf9431034d199a3 SHA512 5f023b7a4ecade3d88aa36ecf724fcf98200de05fc25797f1895ec3fa952dc01256a181f88d2fe3c283151c83ef502c63939d13160e4d1252f2d47d00bd54223 +DIST ppsspp-1.10.3-ext_SPIRV-Cross.tar.gz 814213 BLAKE2B cfed78ac0ae4e6e7d82874b4fec2b5475063b09f8c8a3bef9bd23024978820dfbee68209a3ebbd3b883e8c2011d4353e1c0c1b543578d860cde8d20a0b304440 SHA512 b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65 +DIST ppsspp-1.10.3-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be +DIST ppsspp-1.10.3-ext_discord-rpc.tar.gz 2107457 BLAKE2B 8a8117b13791aa4eda7addb974ca1bdd22766961af2de28eaa24337bdb0035b4538ca8241f07d8de9532ad8cd64ba846361bd9c4edb37ebeec149b7e72545d1f SHA512 17fb5de5d5afea9b7e0cdc116d5e3611b147eb2cde3a295a1a4ceb688bceb93d54feb2e479d511ce39d53a1380462a75dcdf6be9ddc2cece9d44b7f8ff7504af +DIST ppsspp-1.10.3-ext_glslang.tar.gz 3138654 BLAKE2B fe5113842d18ce2327e59d2c40ac8847bc28cd8e53ea8d63f9585b6f97943587ba81521b8d0ac94bccde58e14487b1d524cebf61ded0944d9b55c2b7b63bf59b SHA512 153233429ac7ff16b8a530eae28152e55eb90481c9adca5119853fefe76b265b16b922694396d70e8e4511b2da5519c2e1e016bd79617befb90b609cad5a5fc3 +DIST ppsspp-1.10.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93 +DIST ppsspp-1.10.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc +DIST ppsspp-1.10.3-ffmpeg.tar.gz 387126903 BLAKE2B fd838039dda32f1b9d16649bd7e5a5d6fb3db74a8032d51973b01e567dd97c06c3d16b82a5176cb5828178f47619d767e1e0473a31484ab957636502a5172fa0 SHA512 74a8ee678c16578af63af3a6dd11dbd7bba265bc6581ff78c19269cff1b2896e236c6468175eb19c3c321ee67ebe1d62b4ff179163bb7162089c953a18483cf7 +DIST ppsspp-1.10.3.tar.gz 16956980 BLAKE2B 3f02abaf68a3a2acbaf71936fe70904a5065eb5c8afc8ec00804c325c597c4bf57fb4b9c7e1df7b302c085043a0ad210ca0d6ed2be89dd6ed28c9c635afff8db SHA512 522b2014810bd39a8554920b6d9bec7c47334d51537a7ca41482f629622b9e2d3dddfaaa5389b3c6c7dda8d7d3212b7ce9f6bd6e6d8498ffe370cf2cc58aac30 DIST ppsspp-1.5.4-assets_lang.tar.gz 347859 BLAKE2B 648915773856a64dafb5d159e0917b4345ff99dba7b7dae4f343ecd81e1d835cb958766ab8928118ae4768564414e3dcceba474e05e99be23d56c9447c59786b SHA512 72983f01c51900fa133ca83d226a5daec78153c9d70fc1ca6233b531f3c5d5da5e307e377560789cecccad7a98ba8f66da104cc4375f51576f90c535dc980b98 DIST ppsspp-1.5.4-dx9sdk.tar.gz 14582591 BLAKE2B 12a370e262d045bab6f85237160189921e0bc9992726bb60d241c20a5714128995cf110bb5889c530f8cc3497a34645a96ff31b7b61fb3004279f26b15287435 SHA512 2c54b441b0a31f63ecab1bd2ab14254fb2047d35d2765262d43277330a8428fbf4c8848d5f730456a033cf84258f6b60a467213f8339289b3ab83ed7e94c65b7 DIST ppsspp-1.5.4-ext_SPIRV-Cross.tar.gz 228943 BLAKE2B 0b4ed8a751737bf6fce9fa766f0b8dc0671b49a6adf026c369ebd3776d9d8c23acd08b6d3f41666a6e23410ffb243917a844d9de85e3eca5ce04935421aaca98 SHA512 5fe2f772b571da0627fb9d9c424bea2b4ea1c0563e36ff455ddaf1b92ea3d5ee636e039a0619e0971478ce10e163b45258e9b03d2610c573f74d1cfd08549bb8 diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml index 5197ad9867b..a4d7fff54a6 100644 --- a/games-emulation/ppsspp/metadata.xml +++ b/games-emulation/ppsspp/metadata.xml @@ -1,13 +1,20 @@ - - - Build headless version of the PPSSPP - Use the system-wide media-video/ffmpeg instead of bundled - - - https://github.com/hrydgard/ppsspp/issues - hrydgard/ppsspp - + + xgqt@protonmail.com + Maciej Barć + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Build headless version of the PPSSPP + Use the system-wide media-video/ffmpeg instead of bundled + + + https://github.com/hrydgard/ppsspp/issues + hrydgard/ppsspp + diff --git a/games-emulation/ppsspp/ppsspp-1.10.3.ebuild b/games-emulation/ppsspp/ppsspp-1.10.3.ebuild new file mode 100644 index 00000000000..4ecf77e7eca --- /dev/null +++ b/games-emulation/ppsspp/ppsspp-1.10.3.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop xdg + +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 + https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz + https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ${P}-ext_armips.tar.gz + https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ${P}-ext_rapidjson.tar.gz + https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ${P}-ext_discord-rpc.tar.gz + https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ${P}-ext_glslang.tar.gz + https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ${P}-ext_native_tools_prebuilt.tar.gz + https://github.com/hrydgard/ppsspp-lang/archive/fd6f5bc01afb419eacca538b425c01eb2a055393.tar.gz -> ${P}-assets_lang.tar.gz + !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/d3e695286cce346274192c214c00f021c00cd575.tar.gz -> ${P}-ffmpeg.tar.gz ) +" + +RESTRICT="test" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+headless qt5 sdl +system-ffmpeg" +REQUIRED_USE="!qt5? ( sdl )" + +RDEPEND=" + app-arch/snappy:= + dev-libs/libzip:= + dev-util/glslang:= + media-libs/glew:= + sys-libs/zlib:= + virtual/opengl + sdl? ( media-libs/libsdl2 ) + system-ffmpeg? ( media-video/ffmpeg:= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5[-gles2-only] + dev-qt/qtmultimedia:5[-gles2-only] + dev-qt/qtopengl:5[-gles2-only] + dev-qt/qtwidgets:5[-gles2-only] + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.4-O2.patch" +) + +src_unpack() { + unpack "${P}.tar.gz" + + cd "${S}" || die + local i list=( + assets_lang + ext_SPIRV-Cross + ext_armips + ext_discord-rpc + ext_glslang + ext_native_tools_prebuilt + ext_rapidjson + ) + 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_src_prepare +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package sdl SDL2) + -DHEADLESS=$(usex headless) + -DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg) + -DUSE_SYSTEM_LIBZIP=ON + -DUSE_SYSTEM_SNAPPY=ON + -DUSING_QT_UI=$(usex qt5) + ) + cmake_src_configure +} + +src_install() { + insinto /usr/share/"${PN}" + doins -r "${BUILD_DIR}/assets" + + 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 + + use headless && dobin "${BUILD_DIR}/PPSSPPHeadless" + dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)" + make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game" +} + +pkg_postinst() { + xdg_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 +}