commit: a65ce2b064d82640943d74b5cc72bba9674dceb5 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Jun 11 14:21:54 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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
