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 27D0915817D for ; Tue, 11 Jun 2024 14:46:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51435E2AD6; Tue, 11 Jun 2024 14:46:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 28202E2AD6 for ; Tue, 11 Jun 2024 14:46:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 12BE933BE12 for ; Tue, 11 Jun 2024 14:46:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 798261769 for ; Tue, 11 Jun 2024 14:46:19 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1718117105.a65ce2b064d82640943d74b5cc72bba9674dceb5.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/godot/godot-3.5.3-r1.ebuild dev-games/godot/godot-3.5.3.ebuild dev-games/godot/godot-4.2.2-r1.ebuild dev-games/godot/godot-4.2.2.ebuild X-VCS-Directories: dev-games/godot/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: a65ce2b064d82640943d74b5cc72bba9674dceb5 X-VCS-Branch: master Date: Tue, 11 Jun 2024 14:46:19 +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: c562ad6b-9b5d-47aa-a6f3-9dac2df00c17 X-Archives-Hash: c19bc39584c3e5ab9c8841454df07c92 commit: a65ce2b064d82640943d74b5cc72bba9674dceb5 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jun 11 14:21:54 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jun 11 14:45:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65ce2b0 dev-games/godot: use bundled miniupnpc for now Likely an easy fix, but no time to look at this right now and would rather not set a upper bound given hard to say how long this will stay broken as upstream relies on the bundled copy. Will check if can revert this on bump. Closes: https://bugs.gentoo.org/934044 Signed-off-by: Ionen Wolkens gentoo.org> dev-games/godot/{godot-3.5.3.ebuild => godot-3.5.3-r1.ebuild} | 6 +++--- dev-games/godot/{godot-4.2.2.ebuild => godot-4.2.2-r1.ebuild} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-games/godot/godot-3.5.3.ebuild b/dev-games/godot/godot-3.5.3-r1.ebuild similarity index 97% rename from dev-games/godot/godot-3.5.3.ebuild rename to dev-games/godot/godot-3.5.3-r1.ebuild index c4e78535e32d..9a41621d39b5 100644 --- a/dev-games/godot/godot-3.5.3.ebuild +++ b/dev-games/godot/godot-3.5.3-r1.ebuild @@ -59,7 +59,6 @@ RDEPEND=" ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) - upnp? ( net-libs/miniupnpc:= ) webm? ( media-libs/libvorbis media-libs/libvpx:= @@ -95,8 +94,9 @@ src_prepare() { # use of builtin_ switches can be messy (see below), delete to be sure local unbundle=( bullet embree freetype libogg libpng libtheora libvorbis libvpx - libwebp mbedtls miniupnpc opus pcre2 recastnavigation wslay zlib zstd + libwebp mbedtls opus pcre2 recastnavigation wslay zlib zstd # miniupnpc # certs: unused by generated header, but scons panics if not found + # miniupnpc: check if can re-add on bump, bug #934044 ) rm -r "${unbundle[@]/#/thirdparty/}" || die } @@ -134,7 +134,7 @@ src_compile() { builtin_libvpx=$(usex !webm) builtin_libwebp=$(usex !webp) builtin_mbedtls=no - builtin_miniupnpc=$(usex !upnp) + builtin_miniupnpc=yes #934044 (for now, should revisit) builtin_opus=$(usex !webm) builtin_pcre2=no builtin_recast=no diff --git a/dev-games/godot/godot-4.2.2.ebuild b/dev-games/godot/godot-4.2.2-r1.ebuild similarity index 97% rename from dev-games/godot/godot-4.2.2.ebuild rename to dev-games/godot/godot-4.2.2-r1.ebuild index bda89ed4d705..d9ea297149f2 100644 --- a/dev-games/godot/godot-4.2.2.ebuild +++ b/dev-games/godot/godot-4.2.2-r1.ebuild @@ -67,7 +67,6 @@ RDEPEND=" theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) - upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) " DEPEND=" @@ -99,8 +98,9 @@ src_prepare() { local unbundle=( brotli doctest embree freetype graphite harfbuzz icu4c libogg libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls - miniupnpc pcre2 recastnavigation volk wslay zlib zstd + pcre2 recastnavigation volk wslay zlib zstd # certs: unused by generated header, but scons panics if not found + # miniupnpc: check if can re-add on bump, bug #934044 ) rm -r "${unbundle[@]/#/thirdparty/}" || die @@ -153,7 +153,7 @@ src_compile() { builtin_libvorbis=no builtin_libwebp=$(usex !webp) builtin_mbedtls=no - builtin_miniupnpc=$(usex !upnp) + builtin_miniupnpc=yes #934044 (for now, should revisit) builtin_msdfgen=yes # not wired for unbundling nor packaged builtin_openxr=yes # not packaged builtin_pcre2=no