| 1 |
commit: d7c33873510292da260a8390e0aa992759f514e1 |
| 2 |
Author: Albert Diserholt <albert <AT> diserholt <DOT> com> |
| 3 |
AuthorDate: Thu Aug 20 07:17:33 2020 +0000 |
| 4 |
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com> |
| 5 |
CommitDate: Thu Aug 20 07:18:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=d7c33873 |
| 7 |
|
| 8 |
Fix dev-games/godot ebuilds |
| 9 |
|
| 10 |
3.2.2 created the wrong desktop entries |
| 11 |
9999 now builds the 4.0 development branch |
| 12 |
|
| 13 |
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com> |
| 14 |
|
| 15 |
dev-games/godot/Manifest | 4 +- |
| 16 |
.../{godot-3.2.2.ebuild => godot-3.2.2-r1.ebuild} | 42 ++++++++++--------- |
| 17 |
dev-games/godot/godot-9999.ebuild | 47 +++++++++++++--------- |
| 18 |
3 files changed, 55 insertions(+), 38 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest |
| 21 |
index 43c2589..4e5a648 100644 |
| 22 |
--- a/dev-games/godot/Manifest |
| 23 |
+++ b/dev-games/godot/Manifest |
| 24 |
@@ -1,5 +1,5 @@ |
| 25 |
DIST 3.1.1-stable.zip 25427059 BLAKE2B 85c4df448f5af7f96a3f5a3ba8e23e7764f83e1a43b21807ccf3ba66356aa3ec1dc56242dcf7d0c7d1d9efcba56b7eab8cfc32e314d1f35978bd34d2c300f65e SHA512 509b144be7416174a487548b5708367f7ce743b0268a710d0dc9a9fb095eb368a218bf5cd591f38f90bb9a96fa24acab442c503f4ea91b485274503e381569cd |
| 26 |
DIST godot-3.2.2.zip 27714032 BLAKE2B 68d936570a783b902f72bfb80d4e8d9a112e8d741e41167a4af060321ea68d808357c5d45d2c0e835f1edfb70b26ed222c116678ea2b673e9f45ef15217f0b01 SHA512 d33c2a9c9c234a3c89bf8e533f5bdbfa4483f8794d90e928e7fe4acfab0fca9b1acd8cfb8d7606bdfe94d1275b3b07dde512cc0544dd3fc6d2dc8b1199664da2 |
| 27 |
EBUILD godot-3.1.1.ebuild 3794 BLAKE2B 110ee31e86a3a4202cffac3be24dc3037430fd2bc9e4b1c9a6d67c730f5d5250c4df9f539dabb38465a2196877280696cebaf638fdb1031050ab97bf45be9f12 SHA512 af13c9c329ac5b7d33272c0bccfe0e02663d98dd09d4e3342a58c7a083d9b7df0ab5c38fd51ac5bfa5cdbe51f14865f59a8cab20010acec98b5a7ad9825d60b9 |
| 28 |
-EBUILD godot-3.2.2.ebuild 3640 BLAKE2B eebf7b5a12e7c8d640c0370e087439323535f230972bf4da4680acc739a6fe84cfb37efb4cc329a4b2604f862293d0abb85de60912f5249ef21f01dc86fbf6b7 SHA512 1a128c8268fad428b141d2c58cec0ec691efea3689427857c8564a41d6274b830da04a2fd8377ae3a9e89e6da3749a7f049edc26adac8560dc8251b000ce8990 |
| 29 |
-EBUILD godot-9999.ebuild 3640 BLAKE2B eebf7b5a12e7c8d640c0370e087439323535f230972bf4da4680acc739a6fe84cfb37efb4cc329a4b2604f862293d0abb85de60912f5249ef21f01dc86fbf6b7 SHA512 1a128c8268fad428b141d2c58cec0ec691efea3689427857c8564a41d6274b830da04a2fd8377ae3a9e89e6da3749a7f049edc26adac8560dc8251b000ce8990 |
| 30 |
+EBUILD godot-3.2.2-r1.ebuild 3730 BLAKE2B 378949918f199d27642d9c624629dae68cf78d16fa20da97ce4f28bd6e56dfe9f6c05467231c9badffdfbffb2ba56d12760c6291bfffea8f42906f48bc24a66f SHA512 6a2d3ae793b0ad0ed776c6c1b44a4af647d925a38b1069944aa5959bfa34e79217bb20699ea57011f6afece446309562dc6e739a1c8f67d98228db91517edeb5 |
| 31 |
+EBUILD godot-9999.ebuild 3864 BLAKE2B c8e9d1a04a41488a7366b065478f9ce85aef54d95f752a596e30fc2e9547f197d7cb15bf871795d2e24855aefd9935072346b111c8629d322dfcded898c627a3 SHA512 7cddfd5ea520cd9170160b064e801d300c2ebf4dc4e32eb6ac5d9d3f96c4af623cb9d70ca0f6fc8fa78ca7b6c156a8f0bd502c518d1c5babfc5123ca594c13d2 |
| 32 |
|
| 33 |
diff --git a/dev-games/godot/godot-3.2.2.ebuild b/dev-games/godot/godot-3.2.2-r1.ebuild |
| 34 |
similarity index 85% |
| 35 |
rename from dev-games/godot/godot-3.2.2.ebuild |
| 36 |
rename to dev-games/godot/godot-3.2.2-r1.ebuild |
| 37 |
index 2b8695e..8648b1d 100644 |
| 38 |
--- a/dev-games/godot/godot-3.2.2.ebuild |
| 39 |
+++ b/dev-games/godot/godot-3.2.2-r1.ebuild |
| 40 |
@@ -33,7 +33,8 @@ IUSE=" |
| 41 |
theora |
| 42 |
+udev |
| 43 |
+vorbis |
| 44 |
- +webp" |
| 45 |
+ +webp |
| 46 |
+ +X" |
| 47 |
|
| 48 |
DEPEND=" |
| 49 |
>=app-arch/bzip2-1.0.6-r6 |
| 50 |
@@ -44,12 +45,17 @@ DEPEND=" |
| 51 |
dev-libs/libpcre2[pcre32] |
| 52 |
>=media-libs/alsa-lib-1.0.28 |
| 53 |
>=media-libs/flac-1.3.1-r1 |
| 54 |
+ freetype? ( >=media-libs/freetype-2.5.3-r1:2 ) |
| 55 |
>=media-libs/libogg-1.3.1 |
| 56 |
+ >=media-libs/libpng-1.6.16:0= |
| 57 |
>=media-libs/libsndfile-1.0.25-r1 |
| 58 |
media-libs/libvpx |
| 59 |
- >=media-libs/mesa-10.2.8[gles2] |
| 60 |
+ theora? ( media-libs/libtheora ) |
| 61 |
+ vorbis? ( >=media-libs/libvorbis-1.3.4 ) |
| 62 |
webp? ( media-libs/libwebp ) |
| 63 |
opus? ( media-libs/opus ) |
| 64 |
+ >=media-libs/mesa-10.2.8[gles2] |
| 65 |
+ pulseaudio? ( >=media-sound/pulseaudio-5.0-r7 ) |
| 66 |
enet? ( net-libs/enet ) |
| 67 |
>=net-libs/libasyncns-0.8-r3 |
| 68 |
mbedtls? ( net-libs/mbedtls ) |
| 69 |
@@ -57,22 +63,22 @@ DEPEND=" |
| 70 |
>=sys-apps/attr-2.4.47-r1 |
| 71 |
>=sys-apps/tcp-wrappers-7.6.22-r1 |
| 72 |
>=sys-apps/util-linux-2.25.2-r2 |
| 73 |
- !llvm? ( >=sys-devel/gcc-4.6.4:*[cxx] ) |
| 74 |
+ !llvm? ( >=sys-devel/gcc-7.0.0:*[cxx] ) |
| 75 |
+ llvm? ( >=sys-devel/llvm-6.0.0 ) |
| 76 |
>=sys-libs/gdbm-1.11 |
| 77 |
>=sys-libs/glibc-2.20-r2 |
| 78 |
>=sys-libs/libcap-2.22-r2 |
| 79 |
>=sys-libs/zlib-1.2.8-r1 |
| 80 |
- >=x11-libs/libX11-1.6.2 |
| 81 |
- >=x11-libs/libXcursor-1.1.14 |
| 82 |
- >=x11-libs/libXinerama-1.1.3 |
| 83 |
- freetype? ( >=media-libs/freetype-2.5.3-r1:2 ) |
| 84 |
- llvm? ( >=sys-devel/llvm-3.6.0 ) |
| 85 |
- >=media-libs/libpng-1.6.16:0= |
| 86 |
- pulseaudio? ( >=media-sound/pulseaudio-5.0-r7 ) |
| 87 |
- theora? ( media-libs/libtheora ) |
| 88 |
+ X? ( |
| 89 |
+ >=x11-libs/libX11-1.6.2 |
| 90 |
+ >=x11-libs/libXcursor-1.1.14 |
| 91 |
+ >=x11-libs/libXi-1.0.0 |
| 92 |
+ >=x11-libs/libXinerama-1.1.3 |
| 93 |
+ ) |
| 94 |
udev? ( virtual/udev ) |
| 95 |
- virtual/glu |
| 96 |
- vorbis? ( >=media-libs/libvorbis-1.3.4 )" |
| 97 |
+ virtual/glu" |
| 98 |
+ |
| 99 |
+#dev-lang/yasm |
| 100 |
|
| 101 |
RDEPEND="${DEPEND}" |
| 102 |
|
| 103 |
@@ -114,7 +120,7 @@ src_configure() { |
| 104 |
module_theora_enabled=$(usex theora) |
| 105 |
module_vorbis_enabled=$(usex vorbis) |
| 106 |
module_webp_enabled=$(usex webp) |
| 107 |
- platform=x11 |
| 108 |
+ platform=$(usex X x11 server) |
| 109 |
pulseaudio=$(usex pulseaudio) |
| 110 |
tools=yes |
| 111 |
progress=false |
| 112 |
@@ -136,20 +142,20 @@ src_install() { |
| 113 |
dobin bin/godot.* |
| 114 |
if [[ "${ARCH}" == "amd64" ]]; then |
| 115 |
if use llvm; then |
| 116 |
- make_desktop_entry godot.x11.tools.64.llvm Godot |
| 117 |
+ make_desktop_entry godot.x11.opt.tools.64.llvm Godot |
| 118 |
with_desktop_entry=1 |
| 119 |
else |
| 120 |
- make_desktop_entry godot.x11.tools.64 Godot |
| 121 |
+ make_desktop_entry godot.x11.opt.tools.64 Godot |
| 122 |
with_desktop_entry=1 |
| 123 |
fi |
| 124 |
fi |
| 125 |
|
| 126 |
if [[ "${ARCH}" == "x86" ]]; then |
| 127 |
if use llvm; then |
| 128 |
- make_desktop_entry godot.x11.tools.32.llvm Godot |
| 129 |
+ make_desktop_entry godot.x11.opt.tools.32.llvm Godot |
| 130 |
with_desktop_entry=1 |
| 131 |
else |
| 132 |
- make_desktop_entry godot.x11.tools.32 Godot |
| 133 |
+ make_desktop_entry godot.x11.opt.tools.32 Godot |
| 134 |
with_desktop_entry=1 |
| 135 |
fi |
| 136 |
fi |
| 137 |
|
| 138 |
diff --git a/dev-games/godot/godot-9999.ebuild b/dev-games/godot/godot-9999.ebuild |
| 139 |
index 2b8695e..99a1cb0 100644 |
| 140 |
--- a/dev-games/godot/godot-9999.ebuild |
| 141 |
+++ b/dev-games/godot/godot-9999.ebuild |
| 142 |
@@ -32,8 +32,10 @@ IUSE=" |
| 143 |
pulseaudio |
| 144 |
theora |
| 145 |
+udev |
| 146 |
+ +vulkan |
| 147 |
+vorbis |
| 148 |
- +webp" |
| 149 |
+ +webp |
| 150 |
+ +X" |
| 151 |
|
| 152 |
DEPEND=" |
| 153 |
>=app-arch/bzip2-1.0.6-r6 |
| 154 |
@@ -42,14 +44,21 @@ DEPEND=" |
| 155 |
>=app-arch/zstd-1.4.4 |
| 156 |
>=dev-libs/json-c-0.11-r1 |
| 157 |
dev-libs/libpcre2[pcre32] |
| 158 |
+ dev-util/glslang |
| 159 |
+ vulkan? ( dev-util/vulkan-headers ) |
| 160 |
>=media-libs/alsa-lib-1.0.28 |
| 161 |
>=media-libs/flac-1.3.1-r1 |
| 162 |
+ freetype? ( >=media-libs/freetype-2.5.3-r1:2 ) |
| 163 |
>=media-libs/libogg-1.3.1 |
| 164 |
+ >=media-libs/libpng-1.6.16:0= |
| 165 |
>=media-libs/libsndfile-1.0.25-r1 |
| 166 |
media-libs/libvpx |
| 167 |
- >=media-libs/mesa-10.2.8[gles2] |
| 168 |
+ theora? ( media-libs/libtheora ) |
| 169 |
+ vorbis? ( >=media-libs/libvorbis-1.3.4 ) |
| 170 |
webp? ( media-libs/libwebp ) |
| 171 |
opus? ( media-libs/opus ) |
| 172 |
+ >=media-libs/mesa-10.2.8[gles2] |
| 173 |
+ pulseaudio? ( >=media-sound/pulseaudio-5.0-r7 ) |
| 174 |
enet? ( net-libs/enet ) |
| 175 |
>=net-libs/libasyncns-0.8-r3 |
| 176 |
mbedtls? ( net-libs/mbedtls ) |
| 177 |
@@ -57,22 +66,22 @@ DEPEND=" |
| 178 |
>=sys-apps/attr-2.4.47-r1 |
| 179 |
>=sys-apps/tcp-wrappers-7.6.22-r1 |
| 180 |
>=sys-apps/util-linux-2.25.2-r2 |
| 181 |
- !llvm? ( >=sys-devel/gcc-4.6.4:*[cxx] ) |
| 182 |
+ !llvm? ( >=sys-devel/gcc-7.0.0:*[cxx] ) |
| 183 |
+ llvm? ( >=sys-devel/llvm-6.0.0 ) |
| 184 |
>=sys-libs/gdbm-1.11 |
| 185 |
>=sys-libs/glibc-2.20-r2 |
| 186 |
>=sys-libs/libcap-2.22-r2 |
| 187 |
>=sys-libs/zlib-1.2.8-r1 |
| 188 |
- >=x11-libs/libX11-1.6.2 |
| 189 |
- >=x11-libs/libXcursor-1.1.14 |
| 190 |
- >=x11-libs/libXinerama-1.1.3 |
| 191 |
- freetype? ( >=media-libs/freetype-2.5.3-r1:2 ) |
| 192 |
- llvm? ( >=sys-devel/llvm-3.6.0 ) |
| 193 |
- >=media-libs/libpng-1.6.16:0= |
| 194 |
- pulseaudio? ( >=media-sound/pulseaudio-5.0-r7 ) |
| 195 |
- theora? ( media-libs/libtheora ) |
| 196 |
+ X? ( |
| 197 |
+ >=x11-libs/libX11-1.6.2 |
| 198 |
+ >=x11-libs/libXcursor-1.1.14 |
| 199 |
+ x11-libs/libXi |
| 200 |
+ >=x11-libs/libXinerama-1.1.3 |
| 201 |
+ ) |
| 202 |
udev? ( virtual/udev ) |
| 203 |
- virtual/glu |
| 204 |
- vorbis? ( >=media-libs/libvorbis-1.3.4 )" |
| 205 |
+ virtual/glu" |
| 206 |
+ |
| 207 |
+#dev-lang/yasm |
| 208 |
|
| 209 |
RDEPEND="${DEPEND}" |
| 210 |
|
| 211 |
@@ -95,6 +104,7 @@ src_configure() { |
| 212 |
CXX="$(tc-getCXX)" |
| 213 |
builtin_enet=$(usex enet) |
| 214 |
builtin_freetype=no |
| 215 |
+ builtin_glslang=no |
| 216 |
builtin_libogg=no |
| 217 |
builtin_libpng=no |
| 218 |
builtin_libtheora=$(usex theora) |
| 219 |
@@ -105,6 +115,7 @@ src_configure() { |
| 220 |
builtin_miniupnpc=no |
| 221 |
builtin_opus=$(usex opus) |
| 222 |
builtin_pcre2=no |
| 223 |
+ builtin_vulkan=$(usex vulkan) |
| 224 |
builtin_zlib=no |
| 225 |
builtin_zstd=no |
| 226 |
module_enet_enabled=$(usex enet) |
| 227 |
@@ -114,7 +125,7 @@ src_configure() { |
| 228 |
module_theora_enabled=$(usex theora) |
| 229 |
module_vorbis_enabled=$(usex vorbis) |
| 230 |
module_webp_enabled=$(usex webp) |
| 231 |
- platform=x11 |
| 232 |
+ platform=$(usex X linuxbsd server) |
| 233 |
pulseaudio=$(usex pulseaudio) |
| 234 |
tools=yes |
| 235 |
progress=false |
| 236 |
@@ -136,20 +147,20 @@ src_install() { |
| 237 |
dobin bin/godot.* |
| 238 |
if [[ "${ARCH}" == "amd64" ]]; then |
| 239 |
if use llvm; then |
| 240 |
- make_desktop_entry godot.x11.tools.64.llvm Godot |
| 241 |
+ make_desktop_entry godot.linuxbsd.opt.tools.64.llvm Godot |
| 242 |
with_desktop_entry=1 |
| 243 |
else |
| 244 |
- make_desktop_entry godot.x11.tools.64 Godot |
| 245 |
+ make_desktop_entry godot.linuxbsd.opt.tools.64 Godot |
| 246 |
with_desktop_entry=1 |
| 247 |
fi |
| 248 |
fi |
| 249 |
|
| 250 |
if [[ "${ARCH}" == "x86" ]]; then |
| 251 |
if use llvm; then |
| 252 |
- make_desktop_entry godot.x11.tools.32.llvm Godot |
| 253 |
+ make_desktop_entry godot.linuxbsd.opt.tools.32.llvm Godot |
| 254 |
with_desktop_entry=1 |
| 255 |
else |
| 256 |
- make_desktop_entry godot.x11.tools.32 Godot |
| 257 |
+ make_desktop_entry godot.linuxbsd.opt.tools.32 Godot |
| 258 |
with_desktop_entry=1 |
| 259 |
fi |
| 260 |
fi |
Archives