Gentoo Archives: gentoo-commits

From: Albert Diserholt <albert@×××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/godot/
Date: Mon, 03 Jan 2022 18:14:38
Message-Id: 1641233569.5de3a7b4c863e0aa0c665edde3f525973690c882.albert@gentoo
1 commit: 5de3a7b4c863e0aa0c665edde3f525973690c882
2 Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
3 AuthorDate: Mon Jan 3 18:12:49 2022 +0000
4 Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
5 CommitDate: Mon Jan 3 18:12:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=5de3a7b4
7
8 Fix dependency in dev-games/godot-3.2.3
9
10 It seems to always link against theora & theroadec, even when disabled.
11 A patch should probably have been created, but always having it as a
12 dependency and enabling the use flag by default was faster and easier.
13
14 Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
15
16 dev-games/godot/Manifest | 2 +-
17 dev-games/godot/godot-3.2.3.ebuild | 20 ++++++++++----------
18 2 files changed, 11 insertions(+), 11 deletions(-)
19
20 diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
21 index 98f0e83..3587996 100644
22 --- a/dev-games/godot/Manifest
23 +++ b/dev-games/godot/Manifest
24 @@ -1,4 +1,4 @@
25 DIST 3.1.1-stable.zip 25427059 BLAKE2B 85c4df448f5af7f96a3f5a3ba8e23e7764f83e1a43b21807ccf3ba66356aa3ec1dc56242dcf7d0c7d1d9efcba56b7eab8cfc32e314d1f35978bd34d2c300f65e SHA512 509b144be7416174a487548b5708367f7ce743b0268a710d0dc9a9fb095eb368a218bf5cd591f38f90bb9a96fa24acab442c503f4ea91b485274503e381569cd
26 DIST godot-3.2.3.zip 27949594 BLAKE2B 8ade9ebb742327b86ae7d645cf46c3bbb5e03ef07230c42d4113a599e978e03a64e189d08af578e26a569872ed569f0e95fdde8e1f482d02191855fe4e7e29c8 SHA512 2727a6adbca5065ce3d15dbee0aed213b3ac0a4aaa24fe3d34345afdf3e77eec45296d4141999cf51a04fae1d2785781351e77ac23fa7585e618d0f36aae910f
27 EBUILD godot-3.1.1.ebuild 3794 BLAKE2B 110ee31e86a3a4202cffac3be24dc3037430fd2bc9e4b1c9a6d67c730f5d5250c4df9f539dabb38465a2196877280696cebaf638fdb1031050ab97bf45be9f12 SHA512 af13c9c329ac5b7d33272c0bccfe0e02663d98dd09d4e3342a58c7a083d9b7df0ab5c38fd51ac5bfa5cdbe51f14865f59a8cab20010acec98b5a7ad9825d60b9
28 -EBUILD godot-3.2.3.ebuild 3730 BLAKE2B 378949918f199d27642d9c624629dae68cf78d16fa20da97ce4f28bd6e56dfe9f6c05467231c9badffdfbffb2ba56d12760c6291bfffea8f42906f48bc24a66f SHA512 6a2d3ae793b0ad0ed776c6c1b44a4af647d925a38b1069944aa5959bfa34e79217bb20699ea57011f6afece446309562dc6e739a1c8f67d98228db91517edeb5
29 +EBUILD godot-3.2.3.ebuild 3653 BLAKE2B e77bc594215f973ed463a84f520ddcfacb6a1b87524b0c34ad44e5f5eed915e6ce8b3b66b397c3756c4a459b924a9eebdc8df8e8eb77da2b3fd9345f55a530f3 SHA512 bf9b6d6c1a483b275188300286ea18ae13d361dff626b04388eb7222bd46c06d1a22ad8597d95504ee65886fe9466fb13b6bb0130449cb083fc2ac51218925ab
30
31 diff --git a/dev-games/godot/godot-3.2.3.ebuild b/dev-games/godot/godot-3.2.3.ebuild
32 index 8648b1d..31f3cb6 100644
33 --- a/dev-games/godot/godot-3.2.3.ebuild
34 +++ b/dev-games/godot/godot-3.2.3.ebuild
35 @@ -1,8 +1,8 @@
36 -# Copyright 1999-2020 Gentoo Foundation
37 +# Copyright 1999-2022 Gentoo Foundation
38 # Distributed under the terms of the GNU General Public License v2
39
40 EAPI=7
41 -PYTHON_COMPAT=( python2_7 python3_{6..8} )
42 +PYTHON_COMPAT=( python2_7 python3_{6..10} )
43
44 inherit eutils python-any-r1 scons-utils flag-o-matic llvm desktop
45
46 @@ -30,7 +30,7 @@ IUSE="
47 +mbedtls
48 +opus
49 pulseaudio
50 - theora
51 + +theora
52 +udev
53 +vorbis
54 +webp
55 @@ -50,7 +50,7 @@ DEPEND="
56 >=media-libs/libpng-1.6.16:0=
57 >=media-libs/libsndfile-1.0.25-r1
58 media-libs/libvpx
59 - theora? ( media-libs/libtheora )
60 + media-libs/libtheora
61 vorbis? ( >=media-libs/libvorbis-1.3.4 )
62 webp? ( media-libs/libwebp )
63 opus? ( media-libs/opus )
64 @@ -99,17 +99,17 @@ src_configure() {
65 MYSCONS=(
66 CC="$(tc-getCC)"
67 CXX="$(tc-getCXX)"
68 - builtin_enet=$(usex enet)
69 + builtin_enet=no
70 builtin_freetype=no
71 builtin_libogg=no
72 builtin_libpng=no
73 - builtin_libtheora=$(usex theora)
74 - builtin_libvorbis=$(usex vorbis)
75 + builtin_libtheora=no
76 + builtin_libvorbis=no
77 builtin_libvpx=no
78 - builtin_libwebp=$(usex webp)
79 - builtin_mbedtls=$(usex mbedtls)
80 + builtin_libwebp=no
81 + builtin_mbedtls=no
82 builtin_miniupnpc=no
83 - builtin_opus=$(usex opus)
84 + builtin_opus=no
85 builtin_pcre2=no
86 builtin_zlib=no
87 builtin_zstd=no