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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9076158094 for ; Sun, 28 Aug 2022 20:56:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0728E0921; Sun, 28 Aug 2022 20:56:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6BF7E0921 for ; Sun, 28 Aug 2022 20:56:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06671340E16 for ; Sun, 28 Aug 2022 20:56:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 747A2574 for ; Sun, 28 Aug 2022 20:56:06 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1661720164.403b41336f08a7c0bb4217fc41ea9095594ca3bb.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/ppsspp/files/ppsspp-disable-ccache-autodetection.patch games-emulation/ppsspp/ppsspp-1.13-r1.ebuild X-VCS-Directories: games-emulation/ppsspp/ games-emulation/ppsspp/files/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 403b41336f08a7c0bb4217fc41ea9095594ca3bb X-VCS-Branch: master Date: Sun, 28 Aug 2022 20:56:06 +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: c47e6512-0b0d-45f9-b0ea-61b59a48cee1 X-Archives-Hash: 51db4279a75c79bef5248caf08441dcf commit: 403b41336f08a7c0bb4217fc41ea9095594ca3bb Author: Azamat H. Hackimov gmail com> AuthorDate: Sun Aug 28 18:26:18 2022 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sun Aug 28 20:56:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=403b4133 games-emulation/ppsspp: update build-system Added support for system zstd library. Remove ccache autodetection, build system automagically detects ccache and use it in situations where it shouldn't do that. Signed-off-by: Azamat H. Hackimov gmail.com> Closes: https://github.com/gentoo/gentoo/pull/27047 Signed-off-by: Maciej Barć gentoo.org> .../ppsspp-disable-ccache-autodetection.patch | 26 ++++++ games-emulation/ppsspp/ppsspp-1.13-r1.ebuild | 102 +++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/games-emulation/ppsspp/files/ppsspp-disable-ccache-autodetection.patch b/games-emulation/ppsspp/files/ppsspp-disable-ccache-autodetection.patch new file mode 100644 index 000000000000..007e64774c20 --- /dev/null +++ b/games-emulation/ppsspp/files/ppsspp-disable-ccache-autodetection.patch @@ -0,0 +1,26 @@ +From ca18b1b578ec7215277a73b6658753ff35e677ea Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Sun, 28 Aug 2022 17:53:05 +0300 +Subject: [PATCH] Disable ccache autodetection + +Build system automagically detects ccache and use it in situations where +it should'nt do that. +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 376e2c5ad..8c382ce5c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,7 +111,6 @@ if(MACOSX AND NOT USE_SYSTEM_LIBSDL2) + set(SDL2_LIBRARY ${CMAKE_SOURCE_DIR}/SDL/macOS/SDL2.framework) + endif() + +-include(ccache) + include(GNUInstallDirs) + + add_definitions(-DASSETS_DIR="${CMAKE_INSTALL_FULL_DATADIR}/ppsspp/assets/") +-- +2.35.1 + diff --git a/games-emulation/ppsspp/ppsspp-1.13-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.13-r1.ebuild new file mode 100644 index 000000000000..3b1688d5a6d4 --- /dev/null +++ b/games-emulation/ppsspp/ppsspp-1.13-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop xdg cmake + +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/9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1.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/hrydgard/glslang/archive/dc11adde23c455a24e13dd54de9b4ede8bdd7db8.tar.gz -> ${P}-ext_glslang.tar.gz + https://github.com/hrydgard/miniupnp/archive/3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e.tar.gz -> ${P}-ext_miniupnp.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/3bf6b18eb0ae68861fbfbb7b43cd764771ca42a9.tar.gz -> ${P}-assets_lang.tar.gz + discord? ( https://github.com/discordapp/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz -> ${P}-ext_discord-rpc.tar.gz ) +" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="discord qt5" +RESTRICT="test" + +RDEPEND=" + app-arch/snappy:= + app-arch/zstd:= + dev-libs/libzip:= + dev-util/glslang:= + media-libs/glew:= + media-libs/libpng:= + media-libs/libsdl2[joystick] + media-video/ffmpeg:0/56.58.58 + sys-libs/zlib:= + virtual/opengl + 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] + ) + !qt5? ( media-libs/libsdl2[X,opengl,sound,video] ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-CMakeLists-flags.patch" + "${FILESDIR}/${PN}-disable-ccache-autodetection.patch" +) + +src_unpack() { + unpack ${P}.tar.gz + + cd "${S}" || die + local list=( + assets_lang + ext_SPIRV-Cross + ext_armips + ext_glslang + ext_miniupnp + ext_native_tools_prebuilt + ext_rapidjson + ) + use discord && list+=( ext_discord-rpc ) + + local i + 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_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DHEADLESS=false + -DUSE_DISCORD=$(usex discord) + -DUSE_SYSTEM_FFMPEG=ON + -DUSE_SYSTEM_LIBZIP=ON + -DUSE_SYSTEM_SNAPPY=ON + -DUSE_SYSTEM_ZSTD=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 + + dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)" + make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" +}