diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2024-06-11 10:21:54 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-06-11 10:45:05 -0400 |
| commit | a65ce2b064d82640943d74b5cc72bba9674dceb5 (patch) | |
| tree | bdc6f37cf89d6fefe479b02e747251524ca9da2b /dev-games | |
| parent | gui-wm/tinywl: Keyword 0.17.3 ppc64, #934028 (diff) | |
| download | gentoo-a65ce2b064d82640943d74b5cc72bba9674dceb5.tar.gz gentoo-a65ce2b064d82640943d74b5cc72bba9674dceb5.tar.bz2 gentoo-a65ce2b064d82640943d74b5cc72bba9674dceb5.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/godot/godot-3.5.3-r1.ebuild (renamed from dev-games/godot/godot-3.5.3.ebuild) | 6 | ||||
| -rw-r--r-- | dev-games/godot/godot-4.2.2-r1.ebuild (renamed from dev-games/godot/godot-4.2.2.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 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 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 |