1 |
commit: 88dc354ba18d93a07d46164bcb22bade72989186 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 29 19:21:28 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 29 19:44:28 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88dc354b |
7 |
|
8 |
dev-util/apitrace: 8.0 version bump, EAPI-7, unbundle brotli |
9 |
|
10 |
Getting rid of deprecated dev-qt/qtwebkit:5 dependency. |
11 |
|
12 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
dev-util/apitrace/Manifest | 1 + |
16 |
dev-util/apitrace/apitrace-8.0.ebuild | 97 +++++++++++++ |
17 |
.../files/apitrace-8.0-brotli-unbundle.patch | 159 +++++++++++++++++++++ |
18 |
.../files/apitrace-8.0-disable-multiarch.patch | 53 +++++++ |
19 |
.../apitrace/files/apitrace-8.0-docs-install.patch | 54 +++++++ |
20 |
.../files/apitrace-8.0-glxtrace-only.patch | 49 +++++++ |
21 |
6 files changed, 413 insertions(+) |
22 |
|
23 |
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest |
24 |
index 659d9519d6d..18ef76c6bb4 100644 |
25 |
--- a/dev-util/apitrace/Manifest |
26 |
+++ b/dev-util/apitrace/Manifest |
27 |
@@ -1 +1,2 @@ |
28 |
DIST apitrace-7.1.tar.gz 2343156 BLAKE2B ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce SHA512 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84 |
29 |
+DIST apitrace-8.0.tar.gz 3601109 BLAKE2B f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc SHA512 1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c |
30 |
|
31 |
diff --git a/dev-util/apitrace/apitrace-8.0.ebuild b/dev-util/apitrace/apitrace-8.0.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..96e336ad5ad |
34 |
--- /dev/null |
35 |
+++ b/dev-util/apitrace/apitrace-8.0.ebuild |
36 |
@@ -0,0 +1,97 @@ |
37 |
+# Copyright 1999-2019 Gentoo Authors |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=7 |
41 |
+ |
42 |
+PYTHON_COMPAT=( python2_7 ) |
43 |
+inherit cmake-multilib python-single-r1 |
44 |
+ |
45 |
+DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs" |
46 |
+HOMEPAGE="https://github.com/apitrace/apitrace" |
47 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
48 |
+ |
49 |
+LICENSE="MIT !system-snappy? ( BSD CC-BY-3.0 CC-BY-4.0 public-domain )" #bundled snappy |
50 |
+SLOT="0" |
51 |
+KEYWORDS="~amd64 ~arm ~x86" |
52 |
+IUSE="+cli egl qt5 system-snappy" |
53 |
+ |
54 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
55 |
+ |
56 |
+DEPEND="${PYTHON_DEPS} |
57 |
+ app-arch/brotli:= |
58 |
+ media-libs/libpng:0= |
59 |
+ media-libs/mesa[egl?,${MULTILIB_USEDEP}] |
60 |
+ sys-libs/zlib[${MULTILIB_USEDEP}] |
61 |
+ sys-process/procps:= |
62 |
+ x11-libs/libX11 |
63 |
+ egl? ( |
64 |
+ >=media-libs/mesa-8.0[gles1,gles2] |
65 |
+ media-libs/waffle[egl] |
66 |
+ ) |
67 |
+ qt5? ( |
68 |
+ dev-qt/qtcore:5 |
69 |
+ dev-qt/qtgui:5[-gles2] |
70 |
+ dev-qt/qtnetwork:5 |
71 |
+ dev-qt/qtwidgets:5[-gles2] |
72 |
+ ) |
73 |
+ system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] ) |
74 |
+" |
75 |
+RDEPEND="${DEPEND}" |
76 |
+ |
77 |
+PATCHES=( |
78 |
+ "${FILESDIR}"/${P}-disable-multiarch.patch |
79 |
+ "${FILESDIR}"/${P}-glxtrace-only.patch |
80 |
+ "${FILESDIR}"/${P}-docs-install.patch |
81 |
+ "${FILESDIR}"/${P}-brotli-unbundle.patch |
82 |
+) |
83 |
+ |
84 |
+src_prepare() { |
85 |
+ cmake-utils_src_prepare |
86 |
+ |
87 |
+ # The apitrace code grubs around in the internal zlib structures. |
88 |
+ # We have to extract this header and clean it up to keep that working. |
89 |
+ # Do not be surprised if a zlib upgrade breaks things ... |
90 |
+ rm -rf thirdparty/{brotli,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die |
91 |
+ if use system-snappy ; then |
92 |
+ rm -rf thirdparty/snappy || die |
93 |
+ fi |
94 |
+} |
95 |
+ |
96 |
+src_configure() { |
97 |
+ my_configure() { |
98 |
+ local mycmakeargs=( |
99 |
+ -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} |
100 |
+ -DENABLE_EGL=$(usex egl) |
101 |
+ -DENABLE_STATIC_SNAPPY=$(usex !system-snappy) |
102 |
+ ) |
103 |
+ if multilib_is_native_abi ; then |
104 |
+ mycmakeargs+=( |
105 |
+ -DENABLE_CLI=$(usex cli) |
106 |
+ -DENABLE_GUI=$(usex qt5) |
107 |
+ ) |
108 |
+ else |
109 |
+ mycmakeargs+=( |
110 |
+ -DBUILD_LIB_ONLY=ON |
111 |
+ -DENABLE_CLI=OFF |
112 |
+ -DENABLE_GUI=OFF |
113 |
+ ) |
114 |
+ fi |
115 |
+ cmake-utils_src_configure |
116 |
+ } |
117 |
+ |
118 |
+ multilib_parallel_foreach_abi my_configure |
119 |
+} |
120 |
+ |
121 |
+src_install() { |
122 |
+ cmake-multilib_src_install |
123 |
+ |
124 |
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so |
125 |
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 |
126 |
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 |
127 |
+ |
128 |
+ rm docs/INSTALL.markdown || die |
129 |
+ dodoc docs/* README.markdown |
130 |
+ |
131 |
+ exeinto /usr/$(get_libdir)/${PN}/scripts |
132 |
+ doexe $(find scripts -type f -executable) |
133 |
+} |
134 |
|
135 |
diff --git a/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch b/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch |
136 |
new file mode 100644 |
137 |
index 00000000000..09ed21c0c54 |
138 |
--- /dev/null |
139 |
+++ b/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch |
140 |
@@ -0,0 +1,159 @@ |
141 |
+From b0f5a220c41af013da3362e5c9751b593b22754a Mon Sep 17 00:00:00 2001 |
142 |
+From: Andreas Sturmlechner <asturm@g.o> |
143 |
+Date: Mon, 29 Apr 2019 21:08:02 +0200 |
144 |
+Subject: [PATCH 1/2] Import FindBrotliDec.cmake and FindBrotliEnc.cmake from |
145 |
+ Igalia S.L. |
146 |
+ |
147 |
+MIT License, which fits well. |
148 |
+ |
149 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
150 |
+--- |
151 |
+ cmake/FindBrotliDec.cmake | 35 +++++++++++++++++++++++++++++++++++ |
152 |
+ cmake/FindBrotliEnc.cmake | 35 +++++++++++++++++++++++++++++++++++ |
153 |
+ 2 files changed, 70 insertions(+) |
154 |
+ create mode 100644 cmake/FindBrotliDec.cmake |
155 |
+ create mode 100644 cmake/FindBrotliEnc.cmake |
156 |
+ |
157 |
+diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake |
158 |
+new file mode 100644 |
159 |
+index 00000000..abb06f44 |
160 |
+--- /dev/null |
161 |
++++ b/cmake/FindBrotliDec.cmake |
162 |
+@@ -0,0 +1,35 @@ |
163 |
++# Copyright 2017 Igalia S.L. All Rights Reserved. |
164 |
++# |
165 |
++# Distributed under MIT license. |
166 |
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT |
167 |
++ |
168 |
++# Try to find BrotliDec. Once done, this will define |
169 |
++# |
170 |
++# BROTLIDEC_FOUND - system has BrotliDec. |
171 |
++# BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories |
172 |
++# BROTLIDEC_LIBRARIES - link these to use BrotliDec. |
173 |
++ |
174 |
++find_package(PkgConfig) |
175 |
++ |
176 |
++pkg_check_modules(PC_BROTLIDEC libbrotlidec) |
177 |
++ |
178 |
++find_path(BROTLIDEC_INCLUDE_DIRS |
179 |
++ NAMES brotli/decode.h |
180 |
++ HINTS ${PC_BROTLIDEC_INCLUDEDIR} |
181 |
++) |
182 |
++ |
183 |
++find_library(BROTLIDEC_LIBRARIES |
184 |
++ NAMES brotlidec |
185 |
++ HINTS ${PC_BROTLIDEC_LIBDIR} |
186 |
++) |
187 |
++ |
188 |
++include(FindPackageHandleStandardArgs) |
189 |
++find_package_handle_standard_args(BrotliDec |
190 |
++ REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES |
191 |
++ FOUND_VAR BROTLIDEC_FOUND |
192 |
++ VERSION_VAR PC_BROTLIDEC_VERSION) |
193 |
++ |
194 |
++mark_as_advanced( |
195 |
++ BROTLIDEC_INCLUDE_DIRS |
196 |
++ BROTLIDEC_LIBRARIES |
197 |
++) |
198 |
+diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake |
199 |
+new file mode 100644 |
200 |
+index 00000000..4be347db |
201 |
+--- /dev/null |
202 |
++++ b/cmake/FindBrotliEnc.cmake |
203 |
+@@ -0,0 +1,35 @@ |
204 |
++# Copyright 2017 Igalia S.L. All Rights Reserved. |
205 |
++# |
206 |
++# Distributed under MIT license. |
207 |
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT |
208 |
++ |
209 |
++# Try to find BrotliEnc. Once done, this will define |
210 |
++# |
211 |
++# BROTLIENC_FOUND - system has BrotliEnc. |
212 |
++# BROTLIENC_INCLUDE_DIRS - the BrotliEnc include directories |
213 |
++# BROTLIENC_LIBRARIES - link these to use BrotliEnc. |
214 |
++ |
215 |
++find_package(PkgConfig) |
216 |
++ |
217 |
++pkg_check_modules(PC_BROTLIENC libbrotlienc) |
218 |
++ |
219 |
++find_path(BROTLIENC_INCLUDE_DIRS |
220 |
++ NAMES brotli/encode.h |
221 |
++ HINTS ${PC_BROTLIENC_INCLUDEDIR} |
222 |
++) |
223 |
++ |
224 |
++find_library(BROTLIENC_LIBRARIES |
225 |
++ NAMES brotlienc |
226 |
++ HINTS ${PC_BROTLIENC_LIBDIR} |
227 |
++) |
228 |
++ |
229 |
++include(FindPackageHandleStandardArgs) |
230 |
++find_package_handle_standard_args(BrotliEnc |
231 |
++ REQUIRED_VARS BROTLIENC_INCLUDE_DIRS BROTLIENC_LIBRARIES |
232 |
++ FOUND_VAR BROTLIENC_FOUND |
233 |
++ VERSION_VAR PC_BROTLIENC_VERSION) |
234 |
++ |
235 |
++mark_as_advanced( |
236 |
++ BROTLIENC_INCLUDE_DIRS |
237 |
++ BROTLIENC_LIBRARIES |
238 |
++) |
239 |
+-- |
240 |
+2.21.0 |
241 |
+ |
242 |
+ |
243 |
+From cd3486343001d6a47e4a468caa425ef835012463 Mon Sep 17 00:00:00 2001 |
244 |
+From: Andreas Sturmlechner <asturm@g.o> |
245 |
+Date: Mon, 29 Apr 2019 21:11:57 +0200 |
246 |
+Subject: [PATCH 2/2] Find system brotli instead of bundled |
247 |
+ |
248 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
249 |
+--- |
250 |
+ CMakeLists.txt | 5 +++-- |
251 |
+ cli/CMakeLists.txt | 2 +- |
252 |
+ lib/trace/CMakeLists.txt | 2 +- |
253 |
+ 3 files changed, 5 insertions(+), 4 deletions(-) |
254 |
+ |
255 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
256 |
+index bc988e95..6a62b3b7 100644 |
257 |
+--- a/CMakeLists.txt |
258 |
++++ b/CMakeLists.txt |
259 |
+@@ -483,8 +483,9 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND) |
260 |
+ endif () |
261 |
+ include_directories (${SNAPPY_INCLUDE_DIRS}) |
262 |
+ |
263 |
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include) |
264 |
+-add_subdirectory (thirdparty/brotli) |
265 |
++find_package(BrotliDec REQUIRED) |
266 |
++find_package(BrotliEnc REQUIRED) |
267 |
++include_directories (${BROTLIDEC_INCLUDE_DIRS} ${BROTLIENC_INCLUDE_DIRS}) |
268 |
+ |
269 |
+ if (NOT WIN32 AND NOT ENABLE_STATIC_EXE) |
270 |
+ # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete |
271 |
+diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt |
272 |
+index a0189202..16428c63 100644 |
273 |
+--- a/cli/CMakeLists.txt |
274 |
++++ b/cli/CMakeLists.txt |
275 |
+@@ -39,7 +39,7 @@ add_executable (apitrace |
276 |
+ |
277 |
+ target_link_libraries (apitrace |
278 |
+ common |
279 |
+- brotli_dec brotli_enc brotli_common |
280 |
++ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES} |
281 |
+ ${ZLIB_LIBRARIES} |
282 |
+ ${SNAPPY_LIBRARIES} |
283 |
+ ${GETOPT_LIBRARIES} |
284 |
+diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt |
285 |
+index c68bd00f..ce2e469e 100644 |
286 |
+--- a/lib/trace/CMakeLists.txt |
287 |
++++ b/lib/trace/CMakeLists.txt |
288 |
+@@ -31,7 +31,7 @@ target_link_libraries (common |
289 |
+ guids |
290 |
+ highlight |
291 |
+ os |
292 |
+- brotli_dec brotli_common |
293 |
++ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES} |
294 |
+ ) |
295 |
+ |
296 |
+ add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp) |
297 |
+-- |
298 |
+2.21.0 |
299 |
+ |
300 |
|
301 |
diff --git a/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch |
302 |
new file mode 100644 |
303 |
index 00000000000..9ab6ca27f63 |
304 |
--- /dev/null |
305 |
+++ b/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch |
306 |
@@ -0,0 +1,53 @@ |
307 |
+From 849289703b1c8ef1461d0d0f6a5465e20f3c0932 Mon Sep 17 00:00:00 2001 |
308 |
+From: Mike Frysinger <vapier@g.o> |
309 |
+Date: Mon, 29 Apr 2019 20:32:04 +0200 |
310 |
+Subject: [PATCH 1/3] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR |
311 |
+ |
312 |
+Respect the libdir cmake already set up for us instead of using |
313 |
+debian-specific multiarch paths. |
314 |
+ |
315 |
+Patch was rebased multiple times from 4.0 to 8.0 now. |
316 |
+ |
317 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
318 |
+--- |
319 |
+ CMakeLists.txt | 17 ++--------------- |
320 |
+ 1 file changed, 2 insertions(+), 15 deletions(-) |
321 |
+ |
322 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
323 |
+index 34b55554..36879db6 100644 |
324 |
+--- a/CMakeLists.txt |
325 |
++++ b/CMakeLists.txt |
326 |
+@@ -429,15 +429,6 @@ endif () |
327 |
+ ############################################################################## |
328 |
+ # Installation directories |
329 |
+ |
330 |
+-if (CMAKE_SYSTEM_NAME STREQUAL "Linux") |
331 |
+- # Debian multiarch support |
332 |
+- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH |
333 |
+- OUTPUT_VARIABLE ARCH_SUBDIR |
334 |
+- ERROR_QUIET |
335 |
+- OUTPUT_STRIP_TRAILING_WHITESPACE |
336 |
+- ) |
337 |
+-endif() |
338 |
+- |
339 |
+ if (WIN32 OR APPLE) |
340 |
+ # On Windows/MacOSX, applications are usually installed on a directory of |
341 |
+ # their own |
342 |
+@@ -446,12 +437,8 @@ if (WIN32 OR APPLE) |
343 |
+ set (LIB_ARCH_INSTALL_DIR lib) |
344 |
+ else () |
345 |
+ set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME}) |
346 |
+- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) |
347 |
+- if (ARCH_SUBDIR) |
348 |
+- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) |
349 |
+- else () |
350 |
+- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) |
351 |
+- endif () |
352 |
++ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}) |
353 |
++ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}) |
354 |
+ endif () |
355 |
+ |
356 |
+ # Allow customization of the doc installation dir (Slackware uses different |
357 |
+-- |
358 |
+2.21.0 |
359 |
+ |
360 |
|
361 |
diff --git a/dev-util/apitrace/files/apitrace-8.0-docs-install.patch b/dev-util/apitrace/files/apitrace-8.0-docs-install.patch |
362 |
new file mode 100644 |
363 |
index 00000000000..4c8e215ff70 |
364 |
--- /dev/null |
365 |
+++ b/dev-util/apitrace/files/apitrace-8.0-docs-install.patch |
366 |
@@ -0,0 +1,54 @@ |
367 |
+From 17864ae1e14362d56bbd7dd75149e094a4716bc6 Mon Sep 17 00:00:00 2001 |
368 |
+From: Michael Weber <xmw@g.o> |
369 |
+Date: Mon, 29 Apr 2019 20:56:28 +0200 |
370 |
+Subject: [PATCH 3/3] Disable doc files installation by build system |
371 |
+ |
372 |
+Patch was rebased from 7.1 on top of 8.0. |
373 |
+ |
374 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
375 |
+--- |
376 |
+ CMakeLists.txt | 14 -------------- |
377 |
+ thirdparty/snappy/CMakeLists.txt | 5 ----- |
378 |
+ 2 files changed, 19 deletions(-) |
379 |
+ |
380 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
381 |
+index 6466cd8a..84fd0ae1 100644 |
382 |
+--- a/CMakeLists.txt |
383 |
++++ b/CMakeLists.txt |
384 |
+@@ -604,20 +604,6 @@ endif () |
385 |
+ ############################################################################## |
386 |
+ # Packaging |
387 |
+ |
388 |
+-install ( |
389 |
+- FILES |
390 |
+- README.markdown |
391 |
+- docs/BUGS.markdown |
392 |
+- docs/NEWS.markdown |
393 |
+- docs/USAGE.markdown |
394 |
+- DESTINATION ${DOC_INSTALL_DIR} |
395 |
+-) |
396 |
+-install ( |
397 |
+- FILES LICENSE |
398 |
+- DESTINATION ${DOC_INSTALL_DIR} |
399 |
+- RENAME LICENSE.txt |
400 |
+-) |
401 |
+- |
402 |
+ set (CPACK_PACKAGE_VERSION_MAJOR "8") |
403 |
+ set (CPACK_PACKAGE_VERSION_MINOR "0") |
404 |
+ |
405 |
+diff --git a/thirdparty/snappy/CMakeLists.txt b/thirdparty/snappy/CMakeLists.txt |
406 |
+index 84ecbac8..f732dbc0 100644 |
407 |
+--- a/thirdparty/snappy/CMakeLists.txt |
408 |
++++ b/thirdparty/snappy/CMakeLists.txt |
409 |
+@@ -26,8 +26,3 @@ add_convenience_library (snappy_bundled EXCLUDE_FROM_ALL |
410 |
+ snappy-stubs-public.h |
411 |
+ ) |
412 |
+ |
413 |
+-install ( |
414 |
+- FILES COPYING |
415 |
+- DESTINATION ${DOC_INSTALL_DIR} |
416 |
+- RENAME LICENSE-snappy.txt |
417 |
+-) |
418 |
+-- |
419 |
+2.21.0 |
420 |
+ |
421 |
|
422 |
diff --git a/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch |
423 |
new file mode 100644 |
424 |
index 00000000000..2655e0abfc0 |
425 |
--- /dev/null |
426 |
+++ b/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch |
427 |
@@ -0,0 +1,49 @@ |
428 |
+From 747fe00d3b4e2648003715f949cf2ac18e32862a Mon Sep 17 00:00:00 2001 |
429 |
+From: Tim Harder <radhermit@g.o> |
430 |
+Date: Mon, 29 Apr 2019 20:45:42 +0200 |
431 |
+Subject: [PATCH 2/3] Allow building of just glxtrace library (without GUI |
432 |
+ tools) |
433 |
+ |
434 |
+Patch was rebased multiple times from 1.0 to 8.0 now. |
435 |
+ |
436 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
437 |
+--- |
438 |
+ CMakeLists.txt | 2 ++ |
439 |
+ retrace/CMakeLists.txt | 4 ++++ |
440 |
+ 2 files changed, 6 insertions(+) |
441 |
+ |
442 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
443 |
+index 36879db6..6466cd8a 100644 |
444 |
+--- a/CMakeLists.txt |
445 |
++++ b/CMakeLists.txt |
446 |
+@@ -47,6 +47,8 @@ if (ANDROID) |
447 |
+ message (FATAL_ERROR "Android is no longer supported (https://git.io/vH2gW)") |
448 |
+ endif () |
449 |
+ |
450 |
++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF) |
451 |
++ |
452 |
+ # Proprietary Linux games often ship their own libraries (zlib, libstdc++, |
453 |
+ # etc.) in order to ship a single set of binaries across multiple |
454 |
+ # distributions. Given that apitrace wrapper modules will be loaded into those |
455 |
+diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt |
456 |
+index 76dc8362..e1bad990 100644 |
457 |
+--- a/retrace/CMakeLists.txt |
458 |
++++ b/retrace/CMakeLists.txt |
459 |
+@@ -15,6 +15,8 @@ include_directories ( |
460 |
+ |
461 |
+ add_definitions (-DRETRACE) |
462 |
+ |
463 |
++if (NOT BUILD_LIB_ONLY) |
464 |
++ |
465 |
+ add_custom_command ( |
466 |
+ OUTPUT glretrace_gl.cpp |
467 |
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp |
468 |
+@@ -343,3 +345,5 @@ if (WIN32) |
469 |
+ install (TARGETS d3dretrace RUNTIME DESTINATION bin) |
470 |
+ install_pdb (d3dretrace DESTINATION bin) |
471 |
+ endif () |
472 |
++ |
473 |
++endif (NOT BUILD_LIB_ONLY) |
474 |
+-- |
475 |
+2.21.0 |
476 |
+ |