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 7C5B813835B for ; Mon, 17 May 2021 19:11:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13C4DE07A7; Mon, 17 May 2021 19:11:56 +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 EFEB2E07A7 for ; Mon, 17 May 2021 19:11:55 +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 7EBE2340FFC for ; Mon, 17 May 2021 19:11:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 00552737 for ; Mon, 17 May 2021 19:11:52 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1621196320.2d49a493401a1471868b5731983efd51ff8a73f5.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: games-emulation/melonds/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-emulation/melonds/melonds-0.9.2.ebuild games-emulation/melonds/melonds-9999.ebuild X-VCS-Directories: games-emulation/melonds/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 2d49a493401a1471868b5731983efd51ff8a73f5 X-VCS-Branch: master Date: Mon, 17 May 2021 19:11:52 +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: a72d722f-a77b-4e44-a744-c25981bc86d0 X-Archives-Hash: 33f75bcbd36046f2811d598b4ea99d5c commit: 2d49a493401a1471868b5731983efd51ff8a73f5 Author: Anna Vyalkova sysrq in> AuthorDate: Sun May 16 19:23:10 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sun May 16 20:18:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2d49a493 games-emulation/melonds: add USE flags Other changes: * removed unneeded dependencies * added licenses for bundled deps Signed-off-by: Anna Vyalkova sysrq.in> games-emulation/melonds/melonds-0.9.2.ebuild | 23 +++++++++++++---------- games-emulation/melonds/melonds-9999.ebuild | 23 ++++++++++++----------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/games-emulation/melonds/melonds-0.9.2.ebuild b/games-emulation/melonds/melonds-0.9.2.ebuild index 46d1babd9..81582477d 100644 --- a/games-emulation/melonds/melonds-0.9.2.ebuild +++ b/games-emulation/melonds/melonds-0.9.2.ebuild @@ -23,26 +23,21 @@ else S="${WORKDIR}/${MY_P}" fi -LICENSE="GPL-3" +IUSE="+jit +opengl" +LICENSE="BSD-2 GPL-2 GPL-3 Unlicense" SLOT="0" DEPEND=" app-arch/libarchive dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - media-libs/libepoxy media-libs/libsdl2[sound,video] - net-libs/gnutls - net-libs/libpcap net-libs/libslirp - net-misc/curl - x11-libs/cairo -" -RDEPEND=" - ${DEPEND} + net-libs/libpcap + opengl? ( media-libs/libepoxy ) " +RDEPEND="${DEPEND}" # used for JIT recompiler QA_EXECSTACK="usr/bin/melonDS" @@ -51,6 +46,14 @@ src_prepare() { cmake_src_prepare } +src_configure() { + local mycmakeargs=( + -DENABLE_JIT=$(usex jit) + -DENABLE_OGLRENDERER=$(usex opengl) + ) + cmake_src_configure +} + src_compile() { tc-export AR cmake_src_compile diff --git a/games-emulation/melonds/melonds-9999.ebuild b/games-emulation/melonds/melonds-9999.ebuild index 9113b2611..81582477d 100644 --- a/games-emulation/melonds/melonds-9999.ebuild +++ b/games-emulation/melonds/melonds-9999.ebuild @@ -23,33 +23,34 @@ else S="${WORKDIR}/${MY_P}" fi -LICENSE="GPL-3" +IUSE="+jit +opengl" +LICENSE="BSD-2 GPL-2 GPL-3 Unlicense" SLOT="0" DEPEND=" app-arch/libarchive dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - media-libs/libepoxy media-libs/libsdl2[sound,video] - net-libs/gnutls - net-libs/libpcap net-libs/libslirp - net-misc/curl - x11-libs/cairo -" -RDEPEND=" - ${DEPEND} + net-libs/libpcap + opengl? ( media-libs/libepoxy ) " +RDEPEND="${DEPEND}" + +# used for JIT recompiler +QA_EXECSTACK="usr/bin/melonDS" src_prepare() { cmake_src_prepare } src_configure() { - append-ldflags -Wl,-z,noexecstack + local mycmakeargs=( + -DENABLE_JIT=$(usex jit) + -DENABLE_OGLRENDERER=$(usex opengl) + ) cmake_src_configure }