1 |
commit: 763d3498173d92e9de312fafcf0a5335adf2dd46 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 7 04:21:41 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 7 04:21:41 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763d3498 |
7 |
|
8 |
games-strategy/0ad: drop 0.0.24b_alpha-r1 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild | 231 --------------------- |
13 |
games-strategy/0ad/Manifest | 2 - |
14 |
.../0ad-0.0.24_alpha_pre20210116040036-build.patch | 105 ---------- |
15 |
...0.24b_alpha-fix-hang-on-quit-without-nvtt.patch | 98 --------- |
16 |
.../0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch | 82 -------- |
17 |
5 files changed, 518 deletions(-) |
18 |
|
19 |
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild |
20 |
deleted file mode 100644 |
21 |
index 6307e21c5b2a..000000000000 |
22 |
--- a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild |
23 |
+++ /dev/null |
24 |
@@ -1,231 +0,0 @@ |
25 |
-# Copyright 2014-2021 Gentoo Authors |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
- |
28 |
-EAPI=7 |
29 |
- |
30 |
-WX_GTK_VER="3.0-gtk3" |
31 |
-PYTHON_COMPAT=( python3_{7..9} ) |
32 |
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg |
33 |
- |
34 |
-if [[ ${PV} == 9999 ]]; then |
35 |
- inherit git-r3 |
36 |
- |
37 |
- EGIT_REPO_URI="https://github.com/0ad/0ad" |
38 |
-elif [[ ${PV} == *_pre* ]]; then |
39 |
- ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7" |
40 |
-else |
41 |
- MY_P="0ad-${PV/_/-}" |
42 |
-fi |
43 |
- |
44 |
-DESCRIPTION="A free, real-time strategy game" |
45 |
-HOMEPAGE="https://play0ad.com/" |
46 |
- |
47 |
-if [[ ${PV} == 9999 ]]; then |
48 |
- S="${WORKDIR}/${P}" |
49 |
-elif [[ ${PV} == *_pre* ]]; then |
50 |
- SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz" |
51 |
- S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}" |
52 |
-else |
53 |
- SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz" |
54 |
- SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz" |
55 |
- S="${WORKDIR}/${MY_P}" |
56 |
-fi |
57 |
- |
58 |
-LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c" |
59 |
-SLOT="0" |
60 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
61 |
-IUSE="editor +lobby nvtt pch test" |
62 |
-RESTRICT="test" |
63 |
- |
64 |
-# virtual/rust is for bundled SpiderMonkey |
65 |
-# Build-time Python dependency is for SM too |
66 |
-# TODO: Unbundle premake5 |
67 |
-# See bug #773472 which may help (bump for it) |
68 |
-BDEPEND=" |
69 |
- ${PYTHON_DEPS} |
70 |
- virtual/pkgconfig |
71 |
- virtual/rust |
72 |
- test? ( dev-lang/perl ) |
73 |
-" |
74 |
-# Removed dependency on nvtt as we use the bundled one |
75 |
-# bug #768930 |
76 |
-DEPEND=" |
77 |
- dev-libs/boost:= |
78 |
- dev-libs/icu:= |
79 |
- dev-libs/libfmt:0= |
80 |
- dev-libs/libsodium |
81 |
- dev-libs/libxml2 |
82 |
- media-libs/libpng:0 |
83 |
- media-libs/libsdl2[X,opengl,video] |
84 |
- media-libs/libvorbis |
85 |
- media-libs/openal |
86 |
- net-libs/enet:1.3 |
87 |
- net-libs/miniupnpc:= |
88 |
- net-misc/curl |
89 |
- sys-libs/zlib |
90 |
- virtual/opengl |
91 |
- x11-libs/libX11 |
92 |
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) |
93 |
- lobby? ( >=net-libs/gloox-1.0.20 ) |
94 |
-" |
95 |
-RDEPEND=" |
96 |
- ${DEPEND} |
97 |
- !games-strategy/0ad-data |
98 |
-" |
99 |
- |
100 |
-PATCHES=( |
101 |
- "${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch |
102 |
- "${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch |
103 |
- "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch |
104 |
- "${FILESDIR}"/${PN}-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch |
105 |
-) |
106 |
- |
107 |
-pkg_setup() { |
108 |
- use editor && setup-wxwidgets |
109 |
- |
110 |
- python-any-r1_pkg_setup |
111 |
-} |
112 |
- |
113 |
-src_prepare() { |
114 |
- default |
115 |
- |
116 |
- # SpiderMonkey's configure no longer recognises --build for |
117 |
- # the build tuple |
118 |
- sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die |
119 |
- |
120 |
- # Originally from 0ad-data |
121 |
- rm binaries/data/tools/fontbuilder/fonts/*.txt || die |
122 |
-} |
123 |
- |
124 |
-src_configure() { |
125 |
- local myconf=( |
126 |
- --minimal-flags |
127 |
- $(usex nvtt "" "--without-nvtt") |
128 |
- $(usex pch "" "--without-pch") |
129 |
- $(usex test "" "--without-tests") |
130 |
- $(usex editor "--atlas" "") |
131 |
- $(usex lobby "" "--without-lobby") |
132 |
- --bindir="/usr/bin" |
133 |
- --libdir="/usr/$(get_libdir)"/${PN} |
134 |
- --datadir="/usr/share/${PN}" |
135 |
- ) |
136 |
- |
137 |
- tc-export AR CC CXX RANLIB |
138 |
- |
139 |
- # Stock premake5 does not work, use the shipped one |
140 |
- # TODO: revisit this, see above BDEPEND note re premake5 |
141 |
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix |
142 |
- |
143 |
- # Regenerate scripts.c so our patch applies |
144 |
- cd "${S}"/build/premake/premake5 || die |
145 |
- "${S}"/build/premake/premake5/bin/release/premake5 embed || die |
146 |
- |
147 |
- # Rebuild premake again |
148 |
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean |
149 |
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix |
150 |
- |
151 |
- # Run premake to create build scripts |
152 |
- cd "${S}"/build/premake || die |
153 |
- "${S}"/build/premake/premake5/bin/release/premake5 \ |
154 |
- --file="premake5.lua" \ |
155 |
- --outpath="../workspaces/gcc/" \ |
156 |
- --os=linux \ |
157 |
- "${myconf[@]}" \ |
158 |
- gmake2 \ |
159 |
- || die "Premake failed" |
160 |
-} |
161 |
- |
162 |
-src_compile() { |
163 |
- # Build 3rd party fcollada |
164 |
- einfo "Building bundled fcollada" |
165 |
- emake -C libraries/source/fcollada/src |
166 |
- |
167 |
- # Build bundled NVTT |
168 |
- # nvtt is abandoned upstream and 0ad have forked it and added fixes. |
169 |
- # Use their copy. bug #768930 |
170 |
- if use nvtt ; then |
171 |
- cd libraries/source/nvtt || die |
172 |
- elog "Building bundled NVTT (bug #768930)" |
173 |
- JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT" |
174 |
- cd "${S}" || die |
175 |
- fi |
176 |
- |
177 |
- # Build bundled SpiderMonkey |
178 |
- # We really can't use the system SpiderMonkey right now. |
179 |
- # Breakages occur even on minor bumps in upstream SM, |
180 |
- # e.g. bug #768840. |
181 |
- cd libraries/source/spidermonkey || die |
182 |
- elog "Building bundled SpiderMonkey (bug #768840)" |
183 |
- XARGS="${EPREFIX}/usr/bin/xargs" \ |
184 |
- JOBS="-j$(makeopts_jobs)" \ |
185 |
- ./build.sh \ |
186 |
- || die "Failed to build bundled SpiderMonkey" |
187 |
- |
188 |
- cd "${S}" || die |
189 |
- |
190 |
- # Build 0ad itself! |
191 |
- elog "Building 0ad" |
192 |
- JOBS="-j$(makeopts_jobs)" emake -C build/workspaces/gcc verbose=1 |
193 |
- |
194 |
- # Build assets |
195 |
- # (We only do this if we're using a snapshot/non-release) |
196 |
- # See bug #771147 (comment 3) and the old 0ad-data ebuild |
197 |
- # Warning: fragile! |
198 |
- if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then |
199 |
- # source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing. |
200 |
- addpredict /proc/self/task |
201 |
- |
202 |
- # Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh. |
203 |
- local archivebuild_input archivebuild_output mod_name |
204 |
- for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do |
205 |
- mod_name="${archivebuild_input##*/}" |
206 |
- archivebuild_output="archives/${mod_name}" |
207 |
- |
208 |
- mkdir -p "${archivebuild_output}" || die |
209 |
- |
210 |
- einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" |
211 |
- LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \ |
212 |
- -archivebuild="${archivebuild_input}" \ |
213 |
- -archivebuild-output="${archivebuild_output}/${mod_name}.zip" \ |
214 |
- || die "Failed to build assets" |
215 |
- |
216 |
- if [[ -f "${archivebuild_input}/mod.json" ]]; then |
217 |
- cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die |
218 |
- fi |
219 |
- |
220 |
- rm -r "${archivebuild_input}" || die |
221 |
- mv "${archivebuild_output}" "${archivebuild_input}" || die |
222 |
- done |
223 |
- |
224 |
- # Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh. |
225 |
- rm binaries/data/config/dev.cfg || die |
226 |
- rm -r binaries/data/mods/_test.* || die |
227 |
- fi |
228 |
-} |
229 |
- |
230 |
-src_test() { |
231 |
- cd binaries/system || die |
232 |
- ./test -libdir "${S}/binaries/system" || die "Failed tests" |
233 |
-} |
234 |
- |
235 |
-src_install() { |
236 |
- newbin binaries/system/pyrogenesis 0ad |
237 |
- use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor |
238 |
- |
239 |
- # Merged from 0ad-data |
240 |
- # bug #771147 (comment 3) |
241 |
- insinto /usr/share/${PN} |
242 |
- doins -r binaries/data/{l10n,config,mods,tools} |
243 |
- |
244 |
- # Install bundled SpiderMonkey and nvtt |
245 |
- # bug #771147 (comment 1) |
246 |
- exeinto /usr/$(get_libdir)/${PN} |
247 |
- doexe binaries/system/{libCollada,libmozjs78-ps-release}.so |
248 |
- |
249 |
- use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so |
250 |
- use editor && doexe binaries/system/libAtlasUI.so |
251 |
- |
252 |
- dodoc binaries/system/readme.txt |
253 |
- doicon -s 128 build/resources/${PN}.png |
254 |
- make_desktop_entry ${PN} |
255 |
-} |
256 |
|
257 |
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest |
258 |
index 923eae80585e..afaaebc4f848 100644 |
259 |
--- a/games-strategy/0ad/Manifest |
260 |
+++ b/games-strategy/0ad/Manifest |
261 |
@@ -1,5 +1,3 @@ |
262 |
-DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea |
263 |
-DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726 |
264 |
DIST 0ad-0.0.25b-alpha-unix-build.tar.xz 75579956 BLAKE2B 674d69d625137709a186f9273607dc353fc99aea68ef3f2ea5031dbe2f684176910d757c3f03c7fbdac475d30708be448b71f5020d27a65c346bf147223bcb9d SHA512 e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4 |
265 |
DIST 0ad-0.0.25b-alpha-unix-build.tar.xz.minisig 327 BLAKE2B 547a7a1c8a83167fa40976efb2efaf691fc5434eb1be227b481a70d308381b20dcdc90bb4652e190f8e329fb33cc19ebbaab43977329f8971e49436f7f1ce636 SHA512 9d6a235ea50183e1db16f4bf2dc59af9042a52e4e18ccd0c34c481a7e9021f19e2bc370e594aa97911bb7ca33bcc5ebe23a4b206cd74357060371ca06b6010d2 |
266 |
DIST 0ad-0.0.25b-alpha-unix-data.tar.xz 1249684600 BLAKE2B d77546ba9d21b512f106645c07fa92ecc343e0a01d9a70a83f2a2b3ade912e72d095982f7d4c4cd64e18fb71a67a01c419763744dd4cad1e8c081e5f77ec17c9 SHA512 d6bbe484acb7fbd507d303f5c75f8a2ccbaf8fe9dd30ff408b082f170bfd96eb9235db1b710c15656ef465b44fa5597679a694515e0c153a35fe24c0915f29f1 |
267 |
|
268 |
diff --git a/games-strategy/0ad/files/0ad-0.0.24_alpha_pre20210116040036-build.patch b/games-strategy/0ad/files/0ad-0.0.24_alpha_pre20210116040036-build.patch |
269 |
deleted file mode 100644 |
270 |
index 1e643adb41a9..000000000000 |
271 |
--- a/games-strategy/0ad/files/0ad-0.0.24_alpha_pre20210116040036-build.patch |
272 |
+++ /dev/null |
273 |
@@ -1,105 +0,0 @@ |
274 |
---- /build/premake/premake5/build/gmake2.bsd/Premake5.make |
275 |
-+++ /build/premake/premake5/build/gmake2.bsd/Premake5.make |
276 |
-@@ -36,19 +36,19 @@ |
277 |
- TARGET = $(TARGETDIR)/premake5 |
278 |
- OBJDIR = obj/Release/Premake5 |
279 |
- DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN |
280 |
--ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra |
281 |
--ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector |
282 |
-+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra |
283 |
-+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -fno-stack-protector |
284 |
- LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm |
285 |
- LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a |
286 |
--ALL_LDFLAGS += $(LDFLAGS) -s -rdynamic |
287 |
-+ALL_LDFLAGS += $(LDFLAGS) -rdynamic |
288 |
- |
289 |
- else ifeq ($(config),debug) |
290 |
- TARGETDIR = ../../bin/debug |
291 |
- TARGET = $(TARGETDIR)/premake5 |
292 |
- OBJDIR = obj/Debug/Premake5 |
293 |
- DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN |
294 |
--ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra |
295 |
--ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra |
296 |
-+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra |
297 |
-+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra |
298 |
- LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm |
299 |
- LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a |
300 |
- ALL_LDFLAGS += $(LDFLAGS) -rdynamic |
301 |
---- /build/premake/premake5/build/gmake2.macosx/Premake5.make |
302 |
-+++ /build/premake/premake5/build/gmake2.macosx/Premake5.make |
303 |
-@@ -45,8 +45,8 @@ |
304 |
- TARGET = $(TARGETDIR)/premake5 |
305 |
- OBJDIR = obj/Release/Premake5 |
306 |
- DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_MACOSX |
307 |
--ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra |
308 |
--ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector |
309 |
-+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra |
310 |
-+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -fno-stack-protector |
311 |
- LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a -framework CoreServices -framework Foundation -framework Security -lreadline |
312 |
- LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a |
313 |
- |
314 |
-@@ -55,8 +55,8 @@ |
315 |
- TARGET = $(TARGETDIR)/premake5 |
316 |
- OBJDIR = obj/Debug/Premake5 |
317 |
- DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_MACOSX |
318 |
--ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra |
319 |
--ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra |
320 |
-+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra |
321 |
-+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra |
322 |
- LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a -framework CoreServices -framework Foundation -framework Security -lreadline |
323 |
- LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a |
324 |
- |
325 |
---- /build/premake/premake5/build/gmake2.unix/Premake5.make |
326 |
-+++ /build/premake/premake5/build/gmake2.unix/Premake5.make |
327 |
-@@ -36,19 +36,19 @@ |
328 |
- TARGET = $(TARGETDIR)/premake5 |
329 |
- OBJDIR = obj/Release/Premake5 |
330 |
- DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN |
331 |
--ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra |
332 |
--ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector |
333 |
-+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra |
334 |
-+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -fno-stack-protector |
335 |
- LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm -ldl -lrt |
336 |
- LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a |
337 |
--ALL_LDFLAGS += $(LDFLAGS) -s -rdynamic |
338 |
-+ALL_LDFLAGS += $(LDFLAGS) -rdynamic |
339 |
- |
340 |
- else ifeq ($(config),debug) |
341 |
- TARGETDIR = ../../bin/debug |
342 |
- TARGET = $(TARGETDIR)/premake5 |
343 |
- OBJDIR = obj/Debug/Premake5 |
344 |
- DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN |
345 |
--ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra |
346 |
--ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra |
347 |
-+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra |
348 |
-+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra |
349 |
- LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm -ldl -lrt |
350 |
- LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a |
351 |
- ALL_LDFLAGS += $(LDFLAGS) -rdynamic |
352 |
---- /build/premake/premake5/src/tools/gcc.lua |
353 |
-+++ /build/premake/premake5/src/tools/gcc.lua |
354 |
-@@ -346,8 +346,7 @@ |
355 |
- -- |
356 |
- |
357 |
- function gcc.ldsymbols(cfg) |
358 |
-- -- OS X has a bug, see http://lists.apple.com/archives/Darwin-dev/2006/Sep/msg00084.html |
359 |
-- return iif(table.contains(os.getSystemTags(cfg.system), "darwin"), "-Wl,-x", "-s") |
360 |
-+ return "" |
361 |
- end |
362 |
- |
363 |
- gcc.ldflags = { |
364 |
---- /libraries/source/fcollada/src/Makefile |
365 |
-+++ /libraries/source/fcollada/src/Makefile |
366 |
-@@ -9,9 +9,9 @@ |
367 |
- |
368 |
- CXX ?= g++ |
369 |
- CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) |
370 |
--CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL |
371 |
--CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL |
372 |
--CXXFLAGS_TEST := -O0 -g -D_DEBUG |
373 |
-+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL |
374 |
-+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL |
375 |
-+CXXFLAGS_TEST := -D_DEBUG |
376 |
- LDFLAGS_TEST= -ldl |
377 |
- LIBS += `pkg-config libxml-2.0 --libs` |
378 |
- INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` |
379 |
|
380 |
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch |
381 |
deleted file mode 100644 |
382 |
index fe054eccac51..000000000000 |
383 |
--- a/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch |
384 |
+++ /dev/null |
385 |
@@ -1,98 +0,0 @@ |
386 |
-# Nils Freydank <holgersson@××××××.de> (2021-06-17) |
387 |
-Apply the patch from upstream with minor adoption. |
388 |
- |
389 |
-Gentoo bug: https://bugs.gentoo.org/779757 |
390 |
-Upstream Bug: https://trac.wildfiregames.com/ticket/6107 |
391 |
-Upstream Patch: https://trac.wildfiregames.com/changeset/25766 |
392 |
- |
393 |
---- a/source/graphics/TextureConverter.cpp (revision 25765) |
394 |
-+++ b/source/graphics/TextureConverter.cpp (revision 25766) |
395 |
-@@ -294,9 +294,8 @@ |
396 |
- m_VFS(vfs), m_HighQuality(highQuality), m_Shutdown(false) |
397 |
- { |
398 |
-+#if CONFIG2_NVTT |
399 |
- // Verify that we are running with at least the version we were compiled with, |
400 |
- // to avoid bugs caused by ABI changes |
401 |
--#if CONFIG2_NVTT |
402 |
- ENSURE(nvtt::version() >= NVTT_VERSION); |
403 |
--#endif |
404 |
- |
405 |
- m_WorkerThread = std::thread(Threading::HandleExceptions<RunThread>::Wrapper, this); |
406 |
-@@ -304,8 +303,10 @@ |
407 |
- // Maybe we should share some centralised pool of worker threads? |
408 |
- // For now we'll just stick with a single thread for this specific use. |
409 |
-+#endif // CONFIG2_NVTT |
410 |
- } |
411 |
- |
412 |
- CTextureConverter::~CTextureConverter() |
413 |
- { |
414 |
-+#if CONFIG2_NVTT |
415 |
- // Tell the thread to shut down |
416 |
- { |
417 |
-@@ -327,4 +328,5 @@ |
418 |
- // Wait for it to shut down cleanly |
419 |
- m_WorkerThread.join(); |
420 |
-+#endif // CONFIG2_NVTT |
421 |
- } |
422 |
- |
423 |
-@@ -477,8 +479,8 @@ |
424 |
- return true; |
425 |
- |
426 |
--#else |
427 |
-+#else // CONFIG2_NVTT |
428 |
- LOGERROR("Failed to convert texture \"%s\" (NVTT not available)", src.string8()); |
429 |
- return false; |
430 |
--#endif |
431 |
-+#endif // !CONFIG2_NVTT |
432 |
- } |
433 |
- |
434 |
-@@ -529,22 +531,24 @@ |
435 |
- return true; |
436 |
- |
437 |
--#else // #if CONFIG2_NVTT |
438 |
-+#else // CONFIG2_NVTT |
439 |
- return false; |
440 |
--#endif |
441 |
-+#endif // !CONFIG2_NVTT |
442 |
- } |
443 |
- |
444 |
- bool CTextureConverter::IsBusy() |
445 |
- { |
446 |
-+#if CONFIG2_NVTT |
447 |
- std::lock_guard<std::mutex> lock(m_WorkerMutex); |
448 |
- return !m_RequestQueue.empty(); |
449 |
-+#else // CONFIG2_NVTT |
450 |
-+ return false; |
451 |
-+#endif // !CONFIG2_NVTT |
452 |
- } |
453 |
- |
454 |
- void CTextureConverter::RunThread(CTextureConverter* textureConverter) |
455 |
- { |
456 |
-+#if CONFIG2_NVTT |
457 |
- debug_SetThreadName("TextureConverter"); |
458 |
- g_Profiler2.RegisterCurrentThread("texconv"); |
459 |
-- |
460 |
--#if CONFIG2_NVTT |
461 |
-- |
462 |
- // Wait until the main thread wakes us up |
463 |
- while (true) |
464 |
-@@ -596,4 +600,4 @@ |
465 |
- std::lock_guard<std::mutex> wait_lock(textureConverter->m_WorkerMutex); |
466 |
- textureConverter->m_Shutdown = false; |
467 |
--#endif |
468 |
--} |
469 |
-+#endif // CONFIG2_NVTT |
470 |
-+} |
471 |
- |
472 |
---- a/source/graphics/TextureConverter.h (revision 25765) |
473 |
-+++ b/source/graphics/TextureConverter.h (revision 25766) |
474 |
-@@ -208,7 +208,9 @@ |
475 |
- bool m_HighQuality; |
476 |
- |
477 |
-+#if CONFIG2_NVTT |
478 |
- std::thread m_WorkerThread; |
479 |
- std::mutex m_WorkerMutex; |
480 |
- std::condition_variable m_WorkerCV; |
481 |
-+#endif // CONFIG2_NVTT |
482 |
- |
483 |
- struct ConversionRequest; |
484 |
|
485 |
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch |
486 |
deleted file mode 100644 |
487 |
index f4436a7b92c4..000000000000 |
488 |
--- a/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch |
489 |
+++ /dev/null |
490 |
@@ -1,82 +0,0 @@ |
491 |
-https://bugs.gentoo.org/773493 |
492 |
---- a/libraries/source/spidermonkey/FixRust150.diff |
493 |
-+++ b/libraries/source/spidermonkey/FixRust150.diff |
494 |
-@@ -0,0 +1,65 @@ |
495 |
-+ |
496 |
-+# HG changeset patch |
497 |
-+# User Emilio Cobos Álvarez <emilio@××××××.io> |
498 |
-+# Date 1609006565 0 |
499 |
-+# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582 |
500 |
-+# Parent 55097a5cf353f1b2a2228820bdf26bb69a1372a0 |
501 |
-+Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM |
502 |
-+ |
503 |
-+Fixes errors like: |
504 |
-+ |
505 |
-+ dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed. |
506 |
-+ |
507 |
-+I've left the most specific dependency, but for wgpu the rev is not |
508 |
-+right, so I've kept the branch which effectively preserves behavior. |
509 |
-+ |
510 |
-+Differential Revision: https://phabricator.services.mozilla.com/D100485 |
511 |
-+ |
512 |
-+diff --git a/.cargo/config.in b/.cargo/config.in |
513 |
-+--- a/.cargo/config.in |
514 |
-++++ b/.cargo/config.in |
515 |
-+@@ -1,16 +1,16 @@ |
516 |
-+ # This file contains vendoring instructions for cargo. |
517 |
-+ # It was generated by `mach vendor rust`. |
518 |
-+ # Please do not edit. |
519 |
-+ |
520 |
-+ [source."https://github.com/shravanrn/nix/"] |
521 |
-+-branch = "r0.13.1" |
522 |
-+ git = "https://github.com/shravanrn/nix/" |
523 |
-+ replace-with = "vendored-sources" |
524 |
-++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e" |
525 |
-+ |
526 |
-+ [source."https://github.com/mozilla/rkv"] |
527 |
-+ git = "https://github.com/mozilla/rkv" |
528 |
-+ replace-with = "vendored-sources" |
529 |
-+ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731" |
530 |
-+ |
531 |
-+ [source."https://github.com/mozilla/neqo"] |
532 |
-+ git = "https://github.com/mozilla/neqo" |
533 |
-+diff --git a/Cargo.lock b/Cargo.lock |
534 |
-+--- a/Cargo.lock |
535 |
-++++ b/Cargo.lock |
536 |
-+@@ -3200,7 +3200,7 @@ |
537 |
-+ [[package]] |
538 |
-+ name = "nix" |
539 |
-+ version = "0.13.1" |
540 |
-+-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e" |
541 |
-++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e" |
542 |
-+ dependencies = [ |
543 |
-+ "bitflags", |
544 |
-+ "cc", |
545 |
-+diff --git a/Cargo.toml b/Cargo.toml |
546 |
-+--- a/Cargo.toml |
547 |
-++++ b/Cargo.toml |
548 |
-+@@ -60,8 +60,8 @@ |
549 |
-+ [patch.crates-io] |
550 |
-+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" } |
551 |
-+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" } |
552 |
-+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } |
553 |
-+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" } |
554 |
-++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } |
555 |
-++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" } |
556 |
-+ # failure's backtrace feature might break our builds, see bug 1608157. |
557 |
-+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } |
558 |
-+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } |
559 |
-+ |
560 |
---- a/libraries/source/spidermonkey/patch.sh |
561 |
-+++ b/libraries/source/spidermonkey/patch.sh |
562 |
-@@ -39,6 +39,10 @@ |
563 |
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491 |
564 |
- patch -p1 < ../FixRpiUnalignedFpAccess.diff |
565 |
- |
566 |
-+# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb |
567 |
-+# Note that this isn't quite the upstream patch to match our version. |
568 |
-+patch -p1 < ../FixRust150.diff |
569 |
-+ |
570 |
- # Patch those separately, as they might interfere with normal behaviour. |
571 |
- if [ "$(uname -s)" = "FreeBSD" ]; |
572 |
- then |