| 1 |
commit: f052cc776f97644ecd4cf94dbdfdad25e40762c0 |
| 2 |
Author: Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Jun 7 13:39:56 2021 +0000 |
| 4 |
Commit: Theo Anderson <telans <AT> posteo <DOT> de> |
| 5 |
CommitDate: Mon Jun 7 13:40:30 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f052cc77 |
| 7 |
|
| 8 |
dev-games/godot: depend on media-libs/embree unconditionally |
| 9 |
|
| 10 |
This follows the logic in godot's build system. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/794556 |
| 13 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
| 14 |
Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com> |
| 15 |
|
| 16 |
dev-games/godot/{godot-3.3.2.ebuild => godot-3.3.2-r1.ebuild} | 8 ++++---- |
| 17 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-games/godot/godot-3.3.2.ebuild b/dev-games/godot/godot-3.3.2-r1.ebuild |
| 20 |
similarity index 93% |
| 21 |
rename from dev-games/godot/godot-3.3.2.ebuild |
| 22 |
rename to dev-games/godot/godot-3.3.2-r1.ebuild |
| 23 |
index f301b3ee6..3224a44f5 100644 |
| 24 |
--- a/dev-games/godot/godot-3.3.2.ebuild |
| 25 |
+++ b/dev-games/godot/godot-3.3.2-r1.ebuild |
| 26 |
@@ -15,13 +15,14 @@ KEYWORDS="~amd64 ~x86" |
| 27 |
|
| 28 |
LICENSE="Apache-2.0 Boost-1.0 BSD CC-BY-3.0 MIT MPL-2.0 OFL-1.1 public-domain ZLIB" |
| 29 |
SLOT="0/3" |
| 30 |
-IUSE="+bullet debug deprecated +enet +freetype lto +mbedtls +ogg +opus pulseaudio raycast +theora +udev +upnp +vorbis +webp" |
| 31 |
+IUSE="+bullet debug deprecated +enet +freetype lto +mbedtls +ogg +opus pulseaudio +raycast +theora +udev +upnp +vorbis +webp" |
| 32 |
|
| 33 |
RDEPEND=" |
| 34 |
app-arch/lz4 |
| 35 |
app-arch/zstd |
| 36 |
dev-libs/libpcre2[pcre32] |
| 37 |
media-libs/alsa-lib |
| 38 |
+ media-libs/embree:3 |
| 39 |
media-libs/libpng:0= |
| 40 |
media-libs/libvpx |
| 41 |
media-libs/mesa[gles2] |
| 42 |
@@ -42,7 +43,6 @@ RDEPEND=" |
| 43 |
media-libs/opusfile |
| 44 |
) |
| 45 |
pulseaudio? ( media-sound/pulseaudio ) |
| 46 |
- raycast? ( media-libs/embree:3 ) |
| 47 |
theora? ( media-libs/libtheora ) |
| 48 |
udev? ( virtual/udev ) |
| 49 |
upnp? ( net-libs/miniupnpc ) |
| 50 |
@@ -61,7 +61,7 @@ PATCHES=( |
| 51 |
|
| 52 |
src_prepare() { |
| 53 |
default |
| 54 |
- rm -r thirdparty/{bullet,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zstd} || die |
| 55 |
+ rm -r thirdparty/{bullet,embree,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zstd} || die |
| 56 |
} |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
@@ -94,13 +94,13 @@ src_configure() { |
| 60 |
myesconsargs+=( |
| 61 |
# Mono bindings requires MSBuild which is only available on Windows |
| 62 |
module_mono_enabled=no |
| 63 |
- module_raycast_enabled=$(usex raycast) |
| 64 |
module_bullet_enabled=$(usex bullet) |
| 65 |
module_enet_enabled=$(usex enet) |
| 66 |
module_freetype_enabled=$(usex freetype) |
| 67 |
module_mbedtls_enabled=$(usex mbedtls) |
| 68 |
module_ogg_enabled=$(usex ogg) |
| 69 |
module_opus_enabled=$(usex opus) |
| 70 |
+ module_raycast_enabled=$(usex raycast) |
| 71 |
module_theora_enabled=$(usex theora) |
| 72 |
module_upnp_enabled=$(usex upnp) |
| 73 |
module_vorbis_enabled=$(usex vorbis) |
Archives