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 9DF3213835B for ; Wed, 9 Jun 2021 03:39:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 850D9E0825; Wed, 9 Jun 2021 03:39:08 +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 6BB22E0825 for ; Wed, 9 Jun 2021 03:39:07 +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 2CD37340B66 for ; Wed, 9 Jun 2021 03:39:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AED047A2 for ; Wed, 9 Jun 2021 03:39:04 +0000 (UTC) From: "Theo Anderson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Anderson" Message-ID: <1623073230.f052cc776f97644ecd4cf94dbdfdad25e40762c0.telans@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-games/godot/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-games/godot/godot-3.3.2-r1.ebuild dev-games/godot/godot-3.3.2.ebuild X-VCS-Directories: dev-games/godot/ X-VCS-Committer: telans X-VCS-Committer-Name: Theo Anderson X-VCS-Revision: f052cc776f97644ecd4cf94dbdfdad25e40762c0 X-VCS-Branch: master Date: Wed, 9 Jun 2021 03:39:04 +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: c966fd51-df24-44a8-9cd9-19bd56920eb6 X-Archives-Hash: 500b75c88b6ab812645a17087d79182b commit: f052cc776f97644ecd4cf94dbdfdad25e40762c0 Author: Ross Charles Campbell gmail com> AuthorDate: Mon Jun 7 13:39:56 2021 +0000 Commit: Theo Anderson posteo de> CommitDate: Mon Jun 7 13:40:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f052cc77 dev-games/godot: depend on media-libs/embree unconditionally This follows the logic in godot's build system. Closes: https://bugs.gentoo.org/794556 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Ross Charles Campbell gmail.com> dev-games/godot/{godot-3.3.2.ebuild => godot-3.3.2-r1.ebuild} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-games/godot/godot-3.3.2.ebuild b/dev-games/godot/godot-3.3.2-r1.ebuild similarity index 93% rename from dev-games/godot/godot-3.3.2.ebuild rename to dev-games/godot/godot-3.3.2-r1.ebuild index f301b3ee6..3224a44f5 100644 --- a/dev-games/godot/godot-3.3.2.ebuild +++ b/dev-games/godot/godot-3.3.2-r1.ebuild @@ -15,13 +15,14 @@ KEYWORDS="~amd64 ~x86" LICENSE="Apache-2.0 Boost-1.0 BSD CC-BY-3.0 MIT MPL-2.0 OFL-1.1 public-domain ZLIB" SLOT="0/3" -IUSE="+bullet debug deprecated +enet +freetype lto +mbedtls +ogg +opus pulseaudio raycast +theora +udev +upnp +vorbis +webp" +IUSE="+bullet debug deprecated +enet +freetype lto +mbedtls +ogg +opus pulseaudio +raycast +theora +udev +upnp +vorbis +webp" RDEPEND=" app-arch/lz4 app-arch/zstd dev-libs/libpcre2[pcre32] media-libs/alsa-lib + media-libs/embree:3 media-libs/libpng:0= media-libs/libvpx media-libs/mesa[gles2] @@ -42,7 +43,6 @@ RDEPEND=" media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) - raycast? ( media-libs/embree:3 ) theora? ( media-libs/libtheora ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc ) @@ -61,7 +61,7 @@ PATCHES=( src_prepare() { default - rm -r thirdparty/{bullet,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zstd} || die + rm -r thirdparty/{bullet,embree,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zstd} || die } src_configure() { @@ -94,13 +94,13 @@ src_configure() { myesconsargs+=( # Mono bindings requires MSBuild which is only available on Windows module_mono_enabled=no - module_raycast_enabled=$(usex raycast) module_bullet_enabled=$(usex bullet) module_enet_enabled=$(usex enet) module_freetype_enabled=$(usex freetype) module_mbedtls_enabled=$(usex mbedtls) module_ogg_enabled=$(usex ogg) module_opus_enabled=$(usex opus) + module_raycast_enabled=$(usex raycast) module_theora_enabled=$(usex theora) module_upnp_enabled=$(usex upnp) module_vorbis_enabled=$(usex vorbis)