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 1712E139368 for ; Sun, 8 Aug 2021 09:54:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57281E0874; Sun, 8 Aug 2021 09:54:35 +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 2C569E0874 for ; Sun, 8 Aug 2021 09:54:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 ED019342DAF for ; Sun, 8 Aug 2021 09:54:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1DBFB887 for ; Sun, 8 Aug 2021 09:54:31 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1628416466.b1a7d2251f1ce089d554d2872c5f3570879527e2.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild games-emulation/dolphin/dolphin-9999.ebuild X-VCS-Directories: games-emulation/dolphin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b1a7d2251f1ce089d554d2872c5f3570879527e2 X-VCS-Branch: master Date: Sun, 8 Aug 2021 09:54:31 +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: 5b535e56-f555-4724-a4b6-38e0eab37bc1 X-Archives-Hash: 1029b1d37cac86e320bb6a7e6cfe4473 commit: b1a7d2251f1ce089d554d2872c5f3570879527e2 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 8 09:38:23 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 8 09:54:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a7d225 games-emulation/dolphin: Fix LICENSE Adjust the package's license to GPL-2+, plus add licenses for the bundled deps. Signed-off-by: Michał Górny gentoo.org> .../dolphin/dolphin-5.0_p20210506-r1.ebuild | 76 ++++++++++---------- games-emulation/dolphin/dolphin-9999.ebuild | 82 +++++++++++----------- 2 files changed, 81 insertions(+), 77 deletions(-) diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild index 28d9f08814f..994989ac1a8 100644 --- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild +++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild @@ -21,7 +21,8 @@ fi DESCRIPTION="Gamecube and Wii game emulator" HOMEPAGE="https://dolphin-emu.org/" -LICENSE="GPL-2" +# NB: appended below +LICENSE="GPL-2+" SLOT="0" IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log profile pulseaudio systemd upnp vulkan" @@ -73,48 +74,49 @@ RDEPEND="${RDEPEND} PATCHES=("${FILESDIR}"/${P}-musl.patch) +# [directory]=license +declare -A KEEP_BUNDLED=( + [Bochs_disasm]=LGPL-2.1+ + [FreeSurround]=GPL-2+ + + # vulkan's API is not backwards-compatible: + # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR + # but dolphin still relies on it, bug #729832 + [Vulkan]=Apache-2.0 + + [cpp-optparse]=MIT + # no support for for using system library + [glslang]=BSD + [imgui]=MIT + + # not packaged, tiny header library + [rangeset]=ZLIB + + # FIXME: xxhash can't be found by cmake + [xxhash]=BSD-2 + # no support for for using system library + [minizip]=ZLIB + # soundtouch uses shorts, not floats + [soundtouch]=LGPL-2.1+ + [cubeb]=ISC + [discord-rpc]=MIT + # Their build set up solely relies on the build in gtest. + [gtest]= # (build-time only) + # gentoo's version requires exception support. + # dolphin disables exceptions and fails the build. + [picojson]=BSD-2 + # No code to detect shared library. + [zstd]=BSD +) +LICENSE+=" ${KEEP_BUNDLED[*]}" + src_prepare() { cmake_src_prepare - # Remove all the bundled libraries that support system-installed - # preference. See CMakeLists.txt for conditional 'add_subdirectory' calls. - local keep_sources=( - Bochs_disasm - FreeSurround - - # vulkan's API is not backwards-compatible: - # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR - # but dolphin still relies on it, bug #729832 - Vulkan - - cpp-optparse - # no support for for using system library - glslang - imgui - - # not packaged, tiny header library - rangeset - - # FIXME: xxhash can't be found by cmake - xxhash - # no support for for using system library - minizip - # soundtouch uses shorts, not floats - soundtouch - cubeb - discord-rpc - # Their build set up solely relies on the build in gtest. - gtest - # gentoo's version requires exception support. - # dolphin disables exceptions and fails the build. - picojson - # No code to detect shared library. - zstd - ) local s remove=() for s in Externals/*; do [[ -f ${s} ]] && continue - if ! has "${s#Externals/}" "${keep_sources[@]}"; then + if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then remove+=( "${s}" ) fi done diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index cc0e8a05e21..1a7a4c37e4e 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -22,7 +22,8 @@ fi DESCRIPTION="Gamecube and Wii game emulator" HOMEPAGE="https://dolphin-emu.org/" -LICENSE="GPL-2" +# NB: appended below +LICENSE="GPL-2+" SLOT="0" IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba profile pulseaudio systemd upnp vulkan" @@ -72,51 +73,52 @@ BDEPEND=" RDEPEND="${RDEPEND} vulkan? ( media-libs/vulkan-loader )" +# [directory]=license +declare -A KEEP_BUNDLED=( + [Bochs_disasm]=LGPL-2.1+ + [FreeSurround]=GPL-2+ + + # vulkan's API is not backwards-compatible: + # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR + # but dolphin still relies on it, bug #729832 + [Vulkan]=Apache-2.0 + + [cpp-optparse]=MIT + # no support for for using system library + [glslang]=BSD + [imgui]=MIT + + # not packaged, tiny header library + [rangeset]=ZLIB + + # FIXME: xxhash can't be found by cmake + [xxhash]=BSD-2 + # no support for for using system library + [minizip]=ZLIB + # soundtouch uses shorts, not floats + [soundtouch]=LGPL-2.1+ + [cubeb]=ISC + [discord-rpc]=MIT + # Their build set up solely relies on the build in gtest. + [gtest]= # (build-time only) + # gentoo's version requires exception support. + # dolphin disables exceptions and fails the build. + [picojson]=BSD-2 + # No code to detect shared library. + [zstd]=BSD + + # This is a stripped-down mGBA for integrated GBA support + [mGBA]=MPL-2.0 +) +LICENSE+=" ${KEEP_BUNDLED[*]}" + src_prepare() { cmake_src_prepare - # Remove all the bundled libraries that support system-installed - # preference. See CMakeLists.txt for conditional 'add_subdirectory' calls. - local KEEP_SOURCES=( - Bochs_disasm - FreeSurround - - # vulkan's API is not backwards-compatible: - # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR - # but dolphin still relies on it, bug #729832 - Vulkan - - cpp-optparse - # no support for for using system library - glslang - imgui - - # not packaged, tiny header library - rangeset - - # FIXME: xxhash can't be found by cmake - xxhash - # no support for for using system library - minizip - # soundtouch uses shorts, not floats - soundtouch - cubeb - discord-rpc - # Their build set up solely relies on the build in gtest. - gtest - # gentoo's version requires exception support. - # dolphin disables exceptions and fails the build. - picojson - # No code to detect shared library. - zstd - - # This is a stripped-down mGBA for integrated GBA support - mGBA - ) local s remove=() for s in Externals/*; do [[ -f ${s} ]] && continue - if ! has "${s#Externals/}" "${keep_sources[@]}"; then + if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then remove+=( "${s}" ) fi done