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 17A6413835C for ; Fri, 11 Dec 2020 07:58:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44B8AE097C; Fri, 11 Dec 2020 07:58:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 F1164E097D for ; Fri, 11 Dec 2020 07:58:29 +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 492DF340FC4 for ; Fri, 11 Dec 2020 07:58:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92B4D48B for ; Fri, 11 Dec 2020 07:58:25 +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: <1607673490.0722271ca187e1c4c5f30ae32b4385fe766be942.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/ X-VCS-Repository: repo/gentoo X-VCS-Files: 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: 0722271ca187e1c4c5f30ae32b4385fe766be942 X-VCS-Branch: master Date: Fri, 11 Dec 2020 07:58:25 +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: 8a846cbb-1deb-4cf8-9ab9-72e5568ff9a3 X-Archives-Hash: 324363385137ecf031195a50c57de9be commit: 0722271ca187e1c4c5f30ae32b4385fe766be942 Author: Maciej Barć protonmail com> AuthorDate: Sun Dec 6 21:47:58 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Dec 11 07:58:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0722271c games-emulation/ppsspp: add USE flag for discord-rpc Closes: https://bugs.gentoo.org/758365 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Maciej Barć protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/18541 Signed-off-by: Joonas Niilola gentoo.org> games-emulation/ppsspp/metadata.xml | 1 + games-emulation/ppsspp/ppsspp-1.10.3.ebuild | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml index 73483506334..d19785f0a0c 100644 --- a/games-emulation/ppsspp/metadata.xml +++ b/games-emulation/ppsspp/metadata.xml @@ -10,6 +10,7 @@ Proxy Maintainers + Enable interfacing with a locally running Discord desktop client Use the system-wide media-video/ffmpeg instead of bundled diff --git a/games-emulation/ppsspp/ppsspp-1.10.3.ebuild b/games-emulation/ppsspp/ppsspp-1.10.3.ebuild index 41b2ef1ee03..c2d256e9a4f 100644 --- a/games-emulation/ppsspp/ppsspp-1.10.3.ebuild +++ b/games-emulation/ppsspp/ppsspp-1.10.3.ebuild @@ -12,18 +12,18 @@ SRC_URI=" 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 ) + discord? ( https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ${P}-ext_discord-rpc.tar.gz ) " RESTRICT="test" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="qt5 sdl +system-ffmpeg" +IUSE="discord qt5 sdl +system-ffmpeg" REQUIRED_USE="!qt5? ( sdl )" RDEPEND=" @@ -57,14 +57,12 @@ src_unpack() { 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 + ! use system-ffmpeg && list+=( ffmpeg ) + use discord && list+=( ext_discord-rpc ) 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 @@ -82,6 +80,7 @@ src_configure() { local mycmakeargs=( $(cmake_use_find_package sdl SDL2) -DHEADLESS=true + -DUSE_DISCORD=$(usex discord) -DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg) -DUSE_SYSTEM_LIBZIP=ON -DUSE_SYSTEM_SNAPPY=ON