1 |
commit: 7151840bfeaf4a2c5bd3416f3dc464c43b08e91e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 14 20:42:36 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 14 20:46:40 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7151840b |
7 |
|
8 |
dev-util/apitrace: Cleanup old, Qt4WebKit-rdeps |
9 |
|
10 |
Gentoo-bug: 631806 |
11 |
Package-Manager: Portage-2.3.11, Repoman-2.3.3 |
12 |
|
13 |
dev-util/apitrace/Manifest | 4 - |
14 |
dev-util/apitrace/apitrace-4.0.ebuild | 95 ---------------------- |
15 |
dev-util/apitrace/apitrace-5.0.ebuild | 91 --------------------- |
16 |
dev-util/apitrace/apitrace-6.0.ebuild | 91 --------------------- |
17 |
dev-util/apitrace/apitrace-6.1.ebuild | 91 --------------------- |
18 |
.../files/apitrace-4.0-disable-multiarch.patch | 32 -------- |
19 |
.../files/apitrace-4.0-glext-texture-storage.patch | 73 ----------------- |
20 |
.../files/apitrace-4.0-glxcopysubbuffermesa.patch | 80 ------------------ |
21 |
.../files/apitrace-4.0-glxtrace-only.patch | 49 ----------- |
22 |
dev-util/apitrace/files/apitrace-4.0-memcpy.patch | 13 --- |
23 |
.../apitrace/files/apitrace-4.0-multilib.patch | 59 -------------- |
24 |
.../apitrace/files/apitrace-4.0-system-libs.patch | 72 ---------------- |
25 |
.../files/apitrace-5.0-disable-multiarch.patch | 34 -------- |
26 |
.../files/apitrace-5.0-glxtrace-only.patch | 53 ------------ |
27 |
.../files/apitrace-6.0-disable-multiarch.patch | 35 -------- |
28 |
15 files changed, 872 deletions(-) |
29 |
|
30 |
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest |
31 |
index 80ca682896a..822be0470bb 100644 |
32 |
--- a/dev-util/apitrace/Manifest |
33 |
+++ b/dev-util/apitrace/Manifest |
34 |
@@ -1,5 +1 @@ |
35 |
-DIST apitrace-4.0.tar.gz 1736912 SHA256 078cfe09a5a021559326e8ee92ce863dd99d48c36433ac37140233616bb6cbd3 SHA512 063e1dfc7993b6d014a8e62e5d038318b22a7cfdaac1970714cf6bcb7e31079f552ad198f2992f042b05a027322f86e58d77a0e3aa2e0b266b278c8d0708200c WHIRLPOOL a1b251929ffade5f5b498428d942a01fd6c141494e3de09520e7bcd5aa5b4e15e50144ccf6ef979650e75ddb03373a3f5c198a3554448161623c3e33d8a9160a |
36 |
-DIST apitrace-5.0.tar.gz 1868044 SHA256 c11e97452b3b74533b82af28951382c77e3d639bd434cbc4e1dc43bc799c8ea6 SHA512 af83860c8bfd49a2a2b1483fe13a83f2e1aa93ca474f1efb12cb311a99f2ca29ce4c39831a941efdde80fe2ae76b11cdfc6fde3349d325c71fc2a3ecae6b1424 WHIRLPOOL ba6fe7c354db3e6ba8edd46675631ef6d2edfc01c9201ffd951fc48110d0120463d52b4778984b01ae766d662edfc386a1965240377bcd2b2bae71936e94d42a |
37 |
-DIST apitrace-6.0.tar.gz 1738830 SHA256 4ac99fbd5076c9e4db9d09ef22fb1958f28115f162b6ee40a23130aacc1e2acb SHA512 e937ca8ddece11d180ed306083788fc7e5fa5d4ceeef0ae69ab5a8140e4169c583b281f6f4806b5c4d71c72fb79ac8399e2f0f49fa1052b90f14306247a4091c WHIRLPOOL 1d5f43f5576a4f258f249f3d2777ad221dce3d7dc9489db924568c5c26af3542d016d722ef9c9be7ae50e380684c597840cc869c4d11cf3f3dcb96f952cc4ee0 |
38 |
-DIST apitrace-6.1.tar.gz 1741041 SHA256 0285610a6afbe9fbc47c0ecb80cafabb34dc1998c1c8308bacb7fdd15817930b SHA512 218fc8e59bc6cff6733c98f53c57b0e793d2f7aa530560f8da0dff83c4fa255c5fd5db97a9a43c364490c355ddb1ea6557ced64eae3e6c5e0c6f4504b9299bcd WHIRLPOOL 6334a96a0d70fce927faed0923efe1e320d4a52909ab01223f0486774a13e3cef53d2920933bc3167d9d766d647da6ab36b95ccbbcf78a0af55d16775000f2ea |
39 |
DIST apitrace-7.1.tar.gz 2343156 SHA256 2103386d747d34f3d6fb1d01fde9078a45ad2e9976afab3a7489c95b08dde0a2 SHA512 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84 WHIRLPOOL d61aa9470faf61d4ffa3cd12a24fa13f993f9e21fc0bfcf0f2b9bf3d15803bc1c2120a1ed7e8c43668082dfe61f86434d5e297c5e21e4f2bbb1b88bf80b9bbe3 |
40 |
|
41 |
diff --git a/dev-util/apitrace/apitrace-4.0.ebuild b/dev-util/apitrace/apitrace-4.0.ebuild |
42 |
deleted file mode 100644 |
43 |
index 9b529af0490..00000000000 |
44 |
--- a/dev-util/apitrace/apitrace-4.0.ebuild |
45 |
+++ /dev/null |
46 |
@@ -1,95 +0,0 @@ |
47 |
-# Copyright 1999-2017 Gentoo Foundation |
48 |
-# Distributed under the terms of the GNU General Public License v2 |
49 |
- |
50 |
-EAPI="5" |
51 |
-PYTHON_COMPAT=( python2_7 ) |
52 |
- |
53 |
-inherit cmake-multilib eutils python-single-r1 vcs-snapshot |
54 |
- |
55 |
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs" |
56 |
-HOMEPAGE="https://github.com/apitrace/apitrace" |
57 |
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" |
58 |
- |
59 |
-LICENSE="MIT" |
60 |
-SLOT="0" |
61 |
-KEYWORDS="~amd64 ~arm ~x86" |
62 |
-IUSE="+cli egl qt4" |
63 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
64 |
- |
65 |
-RDEPEND="${PYTHON_DEPS} |
66 |
- >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] |
67 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
68 |
- >=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}] |
69 |
- egl? ( || ( |
70 |
- >=media-libs/mesa-8.0[gles1,gles2] |
71 |
- <media-libs/mesa-8.0[gles] |
72 |
- ) ) |
73 |
- media-libs/libpng:0= |
74 |
- sys-process/procps |
75 |
- x11-libs/libX11 |
76 |
- qt4? ( |
77 |
- >=dev-qt/qtcore-4.7:4 |
78 |
- >=dev-qt/qtgui-4.7:4 |
79 |
- >=dev-qt/qtwebkit-4.7:4 |
80 |
- >=dev-libs/qjson-0.5 |
81 |
- )" |
82 |
-DEPEND="${RDEPEND}" |
83 |
- |
84 |
-PATCHES=( |
85 |
- "${FILESDIR}"/${P}-system-libs.patch |
86 |
- "${FILESDIR}"/${P}-glxtrace-only.patch |
87 |
- "${FILESDIR}"/${P}-glext-texture-storage.patch |
88 |
- "${FILESDIR}"/${P}-glxcopysubbuffermesa.patch |
89 |
- "${FILESDIR}"/${P}-multilib.patch |
90 |
- "${FILESDIR}"/${P}-disable-multiarch.patch |
91 |
- "${FILESDIR}"/${P}-memcpy.patch |
92 |
-) |
93 |
- |
94 |
-src_prepare() { |
95 |
- cmake-utils_src_prepare |
96 |
- |
97 |
- # The apitrace code grubs around in the internal zlib structures. |
98 |
- # We have to extract this header and clean it up to keep that working. |
99 |
- # Do not be surprised if a zlib upgrade breaks things ... |
100 |
- sed -r \ |
101 |
- -e 's:OF[(]([^)]*)[)]:\1:' \ |
102 |
- thirdparty/zlib/gzguts.h > gzguts.h |
103 |
- rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib} |
104 |
-} |
105 |
- |
106 |
-src_configure() { |
107 |
- my_configure() { |
108 |
- mycmakeargs=( |
109 |
- -DARCH_SUBDIR= |
110 |
- $(cmake-utils_use_enable egl EGL) |
111 |
- ) |
112 |
- if multilib_is_native_abi ; then |
113 |
- mycmakeargs+=( |
114 |
- $(cmake-utils_use_enable cli CLI) |
115 |
- $(cmake-utils_use_enable qt4 GUI) |
116 |
- ) |
117 |
- else |
118 |
- mycmakeargs+=( |
119 |
- -DBUILD_LIB_ONLY=ON |
120 |
- -DENABLE_CLI=OFF |
121 |
- -DENABLE_GUI=OFF |
122 |
- ) |
123 |
- fi |
124 |
- cmake-utils_src_configure |
125 |
- } |
126 |
- |
127 |
- multilib_parallel_foreach_abi my_configure |
128 |
-} |
129 |
- |
130 |
-src_install() { |
131 |
- cmake-multilib_src_install |
132 |
- |
133 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so |
134 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 |
135 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 |
136 |
- |
137 |
- dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown |
138 |
- |
139 |
- exeinto /usr/$(get_libdir)/${PN}/scripts |
140 |
- doexe $(find scripts -type f -executable) |
141 |
-} |
142 |
|
143 |
diff --git a/dev-util/apitrace/apitrace-5.0.ebuild b/dev-util/apitrace/apitrace-5.0.ebuild |
144 |
deleted file mode 100644 |
145 |
index 712b310b558..00000000000 |
146 |
--- a/dev-util/apitrace/apitrace-5.0.ebuild |
147 |
+++ /dev/null |
148 |
@@ -1,91 +0,0 @@ |
149 |
-# Copyright 1999-2017 Gentoo Foundation |
150 |
-# Distributed under the terms of the GNU General Public License v2 |
151 |
- |
152 |
-EAPI="5" |
153 |
-PYTHON_COMPAT=( python2_7 ) |
154 |
- |
155 |
-inherit cmake-multilib eutils python-single-r1 vcs-snapshot |
156 |
- |
157 |
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs" |
158 |
-HOMEPAGE="https://github.com/apitrace/apitrace" |
159 |
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" |
160 |
- |
161 |
-LICENSE="MIT" |
162 |
-SLOT="0" |
163 |
-KEYWORDS="~amd64 ~arm ~x86" |
164 |
-IUSE="+cli egl qt4" |
165 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
166 |
- |
167 |
-RDEPEND="${PYTHON_DEPS} |
168 |
- >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] |
169 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
170 |
- >=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}] |
171 |
- egl? ( || ( |
172 |
- >=media-libs/mesa-8.0[gles1,gles2] |
173 |
- <media-libs/mesa-8.0[gles] |
174 |
- ) ) |
175 |
- media-libs/libpng:0= |
176 |
- sys-process/procps |
177 |
- x11-libs/libX11 |
178 |
- qt4? ( |
179 |
- >=dev-qt/qtcore-4.7:4 |
180 |
- >=dev-qt/qtgui-4.7:4 |
181 |
- >=dev-qt/qtwebkit-4.7:4 |
182 |
- >=dev-libs/qjson-0.5 |
183 |
- )" |
184 |
-DEPEND="${RDEPEND}" |
185 |
- |
186 |
-PATCHES=( |
187 |
- "${FILESDIR}"/${PN}-4.0-system-libs.patch |
188 |
- "${FILESDIR}"/${P}-glxtrace-only.patch |
189 |
- "${FILESDIR}"/${P}-disable-multiarch.patch |
190 |
-) |
191 |
- |
192 |
-src_prepare() { |
193 |
- cmake-utils_src_prepare |
194 |
- |
195 |
- # The apitrace code grubs around in the internal zlib structures. |
196 |
- # We have to extract this header and clean it up to keep that working. |
197 |
- # Do not be surprised if a zlib upgrade breaks things ... |
198 |
- sed -r \ |
199 |
- -e 's:OF[(]([^)]*)[)]:\1:' \ |
200 |
- thirdparty/zlib/gzguts.h > gzguts.h |
201 |
- rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib} |
202 |
-} |
203 |
- |
204 |
-src_configure() { |
205 |
- my_configure() { |
206 |
- mycmakeargs=( |
207 |
- -DARCH_SUBDIR= |
208 |
- $(cmake-utils_use_enable egl EGL) |
209 |
- ) |
210 |
- if multilib_is_native_abi ; then |
211 |
- mycmakeargs+=( |
212 |
- $(cmake-utils_use_enable cli CLI) |
213 |
- $(cmake-utils_use_enable qt4 GUI) |
214 |
- ) |
215 |
- else |
216 |
- mycmakeargs+=( |
217 |
- -DBUILD_LIB_ONLY=ON |
218 |
- -DENABLE_CLI=OFF |
219 |
- -DENABLE_GUI=OFF |
220 |
- ) |
221 |
- fi |
222 |
- cmake-utils_src_configure |
223 |
- } |
224 |
- |
225 |
- multilib_parallel_foreach_abi my_configure |
226 |
-} |
227 |
- |
228 |
-src_install() { |
229 |
- cmake-multilib_src_install |
230 |
- |
231 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so |
232 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 |
233 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 |
234 |
- |
235 |
- dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown |
236 |
- |
237 |
- exeinto /usr/$(get_libdir)/${PN}/scripts |
238 |
- doexe $(find scripts -type f -executable) |
239 |
-} |
240 |
|
241 |
diff --git a/dev-util/apitrace/apitrace-6.0.ebuild b/dev-util/apitrace/apitrace-6.0.ebuild |
242 |
deleted file mode 100644 |
243 |
index 9e36010d4e4..00000000000 |
244 |
--- a/dev-util/apitrace/apitrace-6.0.ebuild |
245 |
+++ /dev/null |
246 |
@@ -1,91 +0,0 @@ |
247 |
-# Copyright 1999-2017 Gentoo Foundation |
248 |
-# Distributed under the terms of the GNU General Public License v2 |
249 |
- |
250 |
-EAPI="5" |
251 |
-PYTHON_COMPAT=( python2_7 ) |
252 |
- |
253 |
-inherit cmake-multilib eutils python-single-r1 |
254 |
- |
255 |
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs" |
256 |
-HOMEPAGE="https://github.com/apitrace/apitrace" |
257 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
258 |
- |
259 |
-LICENSE="MIT" |
260 |
-SLOT="0" |
261 |
-KEYWORDS="~amd64 ~arm ~x86" |
262 |
-IUSE="+cli egl qt4" |
263 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
264 |
- |
265 |
-RDEPEND="${PYTHON_DEPS} |
266 |
- >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] |
267 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
268 |
- >=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}] |
269 |
- egl? ( || ( |
270 |
- >=media-libs/mesa-8.0[gles1,gles2] |
271 |
- <media-libs/mesa-8.0[gles] |
272 |
- ) ) |
273 |
- media-libs/libpng:0= |
274 |
- sys-process/procps |
275 |
- x11-libs/libX11 |
276 |
- qt4? ( |
277 |
- >=dev-qt/qtcore-4.7:4 |
278 |
- >=dev-qt/qtgui-4.7:4 |
279 |
- >=dev-qt/qtwebkit-4.7:4 |
280 |
- >=dev-libs/qjson-0.5 |
281 |
- )" |
282 |
-DEPEND="${RDEPEND}" |
283 |
- |
284 |
-PATCHES=( |
285 |
- "${FILESDIR}"/${PN}-4.0-system-libs.patch |
286 |
- "${FILESDIR}"/${PN}-5.0-glxtrace-only.patch |
287 |
- "${FILESDIR}"/${P}-disable-multiarch.patch |
288 |
-) |
289 |
- |
290 |
-src_prepare() { |
291 |
- cmake-utils_src_prepare |
292 |
- |
293 |
- # The apitrace code grubs around in the internal zlib structures. |
294 |
- # We have to extract this header and clean it up to keep that working. |
295 |
- # Do not be surprised if a zlib upgrade breaks things ... |
296 |
- sed -r \ |
297 |
- -e 's:OF[(]([^)]*)[)]:\1:' \ |
298 |
- thirdparty/zlib/gzguts.h > gzguts.h |
299 |
- rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib} |
300 |
-} |
301 |
- |
302 |
-src_configure() { |
303 |
- my_configure() { |
304 |
- mycmakeargs=( |
305 |
- -DARCH_SUBDIR= |
306 |
- $(cmake-utils_use_enable egl EGL) |
307 |
- ) |
308 |
- if multilib_is_native_abi ; then |
309 |
- mycmakeargs+=( |
310 |
- $(cmake-utils_use_enable cli CLI) |
311 |
- $(cmake-utils_use_enable qt4 GUI) |
312 |
- ) |
313 |
- else |
314 |
- mycmakeargs+=( |
315 |
- -DBUILD_LIB_ONLY=ON |
316 |
- -DENABLE_CLI=OFF |
317 |
- -DENABLE_GUI=OFF |
318 |
- ) |
319 |
- fi |
320 |
- cmake-utils_src_configure |
321 |
- } |
322 |
- |
323 |
- multilib_parallel_foreach_abi my_configure |
324 |
-} |
325 |
- |
326 |
-src_install() { |
327 |
- cmake-multilib_src_install |
328 |
- |
329 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so |
330 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 |
331 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 |
332 |
- |
333 |
- dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown |
334 |
- |
335 |
- exeinto /usr/$(get_libdir)/${PN}/scripts |
336 |
- doexe $(find scripts -type f -executable) |
337 |
-} |
338 |
|
339 |
diff --git a/dev-util/apitrace/apitrace-6.1.ebuild b/dev-util/apitrace/apitrace-6.1.ebuild |
340 |
deleted file mode 100644 |
341 |
index 3439c4a2830..00000000000 |
342 |
--- a/dev-util/apitrace/apitrace-6.1.ebuild |
343 |
+++ /dev/null |
344 |
@@ -1,91 +0,0 @@ |
345 |
-# Copyright 1999-2017 Gentoo Foundation |
346 |
-# Distributed under the terms of the GNU General Public License v2 |
347 |
- |
348 |
-EAPI="5" |
349 |
-PYTHON_COMPAT=( python2_7 ) |
350 |
- |
351 |
-inherit cmake-multilib eutils python-single-r1 |
352 |
- |
353 |
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs" |
354 |
-HOMEPAGE="https://github.com/apitrace/apitrace" |
355 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
356 |
- |
357 |
-LICENSE="MIT" |
358 |
-SLOT="0" |
359 |
-KEYWORDS="~amd64 ~arm ~x86" |
360 |
-IUSE="+cli egl qt4" |
361 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
362 |
- |
363 |
-RDEPEND="${PYTHON_DEPS} |
364 |
- >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] |
365 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
366 |
- >=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}] |
367 |
- egl? ( || ( |
368 |
- >=media-libs/mesa-8.0[gles1,gles2] |
369 |
- <media-libs/mesa-8.0[gles] |
370 |
- ) ) |
371 |
- media-libs/libpng:0= |
372 |
- sys-process/procps |
373 |
- x11-libs/libX11 |
374 |
- qt4? ( |
375 |
- >=dev-qt/qtcore-4.7:4 |
376 |
- >=dev-qt/qtgui-4.7:4 |
377 |
- >=dev-qt/qtwebkit-4.7:4 |
378 |
- >=dev-libs/qjson-0.5 |
379 |
- )" |
380 |
-DEPEND="${RDEPEND}" |
381 |
- |
382 |
-PATCHES=( |
383 |
- "${FILESDIR}"/${PN}-4.0-system-libs.patch |
384 |
- "${FILESDIR}"/${PN}-5.0-glxtrace-only.patch |
385 |
- "${FILESDIR}"/${PN}-6.0-disable-multiarch.patch |
386 |
-) |
387 |
- |
388 |
-src_prepare() { |
389 |
- cmake-utils_src_prepare |
390 |
- |
391 |
- # The apitrace code grubs around in the internal zlib structures. |
392 |
- # We have to extract this header and clean it up to keep that working. |
393 |
- # Do not be surprised if a zlib upgrade breaks things ... |
394 |
- sed -r \ |
395 |
- -e 's:OF[(]([^)]*)[)]:\1:' \ |
396 |
- thirdparty/zlib/gzguts.h > gzguts.h |
397 |
- rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib} |
398 |
-} |
399 |
- |
400 |
-src_configure() { |
401 |
- my_configure() { |
402 |
- mycmakeargs=( |
403 |
- -DARCH_SUBDIR= |
404 |
- $(cmake-utils_use_enable egl EGL) |
405 |
- ) |
406 |
- if multilib_is_native_abi ; then |
407 |
- mycmakeargs+=( |
408 |
- $(cmake-utils_use_enable cli CLI) |
409 |
- $(cmake-utils_use_enable qt4 GUI) |
410 |
- ) |
411 |
- else |
412 |
- mycmakeargs+=( |
413 |
- -DBUILD_LIB_ONLY=ON |
414 |
- -DENABLE_CLI=OFF |
415 |
- -DENABLE_GUI=OFF |
416 |
- ) |
417 |
- fi |
418 |
- cmake-utils_src_configure |
419 |
- } |
420 |
- |
421 |
- multilib_parallel_foreach_abi my_configure |
422 |
-} |
423 |
- |
424 |
-src_install() { |
425 |
- cmake-multilib_src_install |
426 |
- |
427 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so |
428 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 |
429 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 |
430 |
- |
431 |
- dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown |
432 |
- |
433 |
- exeinto /usr/$(get_libdir)/${PN}/scripts |
434 |
- doexe $(find scripts -type f -executable) |
435 |
-} |
436 |
|
437 |
diff --git a/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch |
438 |
deleted file mode 100644 |
439 |
index 0ced4d84cbf..00000000000 |
440 |
--- a/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch |
441 |
+++ /dev/null |
442 |
@@ -1,32 +0,0 @@ |
443 |
-respect the libdir cmake already set up for us instead of using the multiarch crap |
444 |
- |
445 |
---- a/CMakeLists.txt |
446 |
-+++ b/CMakeLists.txt |
447 |
-@@ -184,12 +184,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |
448 |
- # Installation directories |
449 |
- |
450 |
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
451 |
-- # Debian multiarch support |
452 |
-- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH |
453 |
-- OUTPUT_VARIABLE ARCH_SUBDIR |
454 |
-- ERROR_QUIET |
455 |
-- OUTPUT_STRIP_TRAILING_WHITESPACE |
456 |
-- ) |
457 |
- CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND) |
458 |
- if (READPROC_H_FOUND) |
459 |
- add_definitions (-DHAVE_READPROC_H) |
460 |
-@@ -205,11 +205,11 @@ if (WIN32 OR APPLE) |
461 |
- set (LIB_ARCH_INSTALL_DIR lib) |
462 |
- else () |
463 |
- set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME}) |
464 |
-- set (LIB_INSTALL_DIR lib/${CMAKE_PROJECT_NAME}) |
465 |
-+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}) |
466 |
- if (ARCH_SUBDIR) |
467 |
-- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) |
468 |
-+ set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) |
469 |
- else () |
470 |
-- set (LIB_ARCH_INSTALL_DIR lib/${CMAKE_PROJECT_NAME}) |
471 |
-+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}) |
472 |
- endif () |
473 |
- endif () |
474 |
- |
475 |
|
476 |
diff --git a/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch b/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch |
477 |
deleted file mode 100644 |
478 |
index 2d04db40869..00000000000 |
479 |
--- a/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch |
480 |
+++ /dev/null |
481 |
@@ -1,73 +0,0 @@ |
482 |
-Upstream commit to support GL_EXT_texture_storage. |
483 |
- |
484 |
-commit 0436cc01329b6be60801dd7bfe641be7d8be5bc7 |
485 |
-Author: José Fonseca <jfonseca@××××××.com> |
486 |
-Date: Wed Nov 13 13:57:43 2013 +0000 |
487 |
- |
488 |
- egltrace: Add GL_EXT_texture_storage entrypoints |
489 |
- |
490 |
- Prototypes obtained through: |
491 |
- |
492 |
- specs/scripts/gltxt.py http://www.khronos.org/registry/gles/extensions/EXT/EXT_texture_storage.txt |
493 |
- |
494 |
- Issue #184. |
495 |
- |
496 |
-commit 0bacf23eacd15c8f15413b85bdcb6ccc4d288f37 |
497 |
-Author: José Fonseca <jfonseca@××××××.com> |
498 |
-Date: Wed Nov 13 13:59:51 2013 +0000 |
499 |
- |
500 |
- glxtrace: Add GLES prototypes too. |
501 |
- |
502 |
- Some applications seem to fail to distinguish GLES and GL entrypoints |
503 |
- apart. To have complete traces in that situation, generate wrappers |
504 |
- for both GLES and GL prototypes. |
505 |
- |
506 |
- Issue #184. |
507 |
- |
508 |
---- apitrace/specs/glesapi.py |
509 |
-+++ apitrace/specs/glesapi.py |
510 |
-@@ -255,4 +255,16 @@ glesapi.addFunctions([ |
511 |
- #GlFunction(Void, "glProgramUniformMatrix4fvEXT", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Array(Const(GLfloat), "count*4*4"), "value")]), |
512 |
- GlFunction(Void, "glValidateProgramPipelineEXT", [(GLpipeline, "pipeline")]), |
513 |
- GlFunction(Void, "glGetProgramPipelineInfoLogEXT", [(GLpipeline, "pipeline"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstring, "infoLog")], sideeffects=False), |
514 |
-+ |
515 |
-+ # GL_EXT_multisampled_render_to_texture |
516 |
-+ #GlFunction(Void, "glRenderbufferStorageMultisampleEXT", [(GLenum, "target"), (GLsizei, "samples"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]), |
517 |
-+ GlFunction(Void, "glFramebufferTexture2DMultisampleEXT", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "textarget"), (GLtexture, "texture"), (GLint, "level"), (GLsizei, "samples")]), |
518 |
-+ |
519 |
-+ # GL_EXT_texture_storage |
520 |
-+ GlFunction(Void, "glTexStorage1DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]), |
521 |
-+ GlFunction(Void, "glTexStorage2DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]), |
522 |
-+ GlFunction(Void, "glTexStorage3DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]), |
523 |
-+ #GlFunction(Void, "glTextureStorage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]), |
524 |
-+ #GlFunction(Void, "glTextureStorage2DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]), |
525 |
-+ #GlFunction(Void, "glTextureStorage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]), |
526 |
- ]) |
527 |
---- apitrace/wrappers/CMakeLists.txt |
528 |
-+++ apitrace/wrappers/CMakeLists.txt |
529 |
-@@ -393,6 +393,7 @@ elseif (X11_FOUND) |
530 |
- gltrace.py |
531 |
- trace.py |
532 |
- ${CMAKE_SOURCE_DIR}/specs/glxapi.py |
533 |
-+ ${CMAKE_SOURCE_DIR}/specs/glesapi.py |
534 |
- ${CMAKE_SOURCE_DIR}/specs/glapi.py |
535 |
- ${CMAKE_SOURCE_DIR}/specs/glparams.py |
536 |
- ${CMAKE_SOURCE_DIR}/specs/gltypes.py |
537 |
---- apitrace/wrappers/glxtrace.py |
538 |
-+++ apitrace/wrappers/glxtrace.py |
539 |
-@@ -32,6 +32,7 @@ from gltrace import GlTracer |
540 |
- from specs.stdapi import Module, API |
541 |
- from specs.glapi import glapi |
542 |
- from specs.glxapi import glxapi |
543 |
-+from specs.glesapi import glesapi |
544 |
- |
545 |
- |
546 |
- class GlxTracer(GlTracer): |
547 |
-@@ -104,6 +105,7 @@ if __name__ == '__main__': |
548 |
- module = Module() |
549 |
- module.mergeModule(glxapi) |
550 |
- module.mergeModule(glapi) |
551 |
-+ module.mergeModule(glesapi) |
552 |
- api = API() |
553 |
- api.addModule(module) |
554 |
- tracer = GlxTracer() |
555 |
|
556 |
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch b/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch |
557 |
deleted file mode 100644 |
558 |
index 4dd3cdc6be3..00000000000 |
559 |
--- a/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch |
560 |
+++ /dev/null |
561 |
@@ -1,80 +0,0 @@ |
562 |
-Upstream commit to support glxCopySubBufferMESA. Modified to fix compile error with egl. |
563 |
- |
564 |
-commit 4dc3f3bdc3611ca1b3dec402f9242a036db8c8e4 |
565 |
-Author: Carl Worth <cworth@××××××.org> |
566 |
-Date: Thu Oct 17 14:52:21 2013 -0700 |
567 |
- |
568 |
- retrace: Implement glxCopySubBufferMESA |
569 |
- |
570 |
- This enables replay of a trace captured on ChromeOS. |
571 |
- |
572 |
- Note: Replaying on EGL is not supported, (will trigger a warning), |
573 |
- since, as far as I know, EGL does not provide an equivalent function. |
574 |
- |
575 |
---- apitrace/retrace/glretrace_glx.cpp |
576 |
-+++ apitrace/retrace/glretrace_glx.cpp |
577 |
-@@ -111,6 +111,16 @@ static void retrace_glXDestroyContext(trace::Call &call) { |
578 |
- delete context; |
579 |
- } |
580 |
- |
581 |
-+static void retrace_glXCopySubBufferMESA(trace::Call &call) { |
582 |
-+ glws::Drawable *drawable = getDrawable(call.arg(1).toUInt()); |
583 |
-+ int x = call.arg(2).toSInt(); |
584 |
-+ int y = call.arg(3).toSInt(); |
585 |
-+ int width = call.arg(4).toSInt(); |
586 |
-+ int height = call.arg(5).toSInt(); |
587 |
-+ |
588 |
-+ drawable->copySubBuffer(x, y, width, height); |
589 |
-+} |
590 |
-+ |
591 |
- static void retrace_glXSwapBuffers(trace::Call &call) { |
592 |
- glws::Drawable *drawable = getDrawable(call.arg(1).toUInt()); |
593 |
- |
594 |
-@@ -173,7 +183,7 @@ const retrace::Entry glretrace::glx_callbacks[] = { |
595 |
- {"glXChooseVisual", &retrace::ignore}, |
596 |
- //{"glXCopyContext", &retrace_glXCopyContext}, |
597 |
- //{"glXCopyImageSubDataNV", &retrace_glXCopyImageSubDataNV}, |
598 |
-- //{"glXCopySubBufferMESA", &retrace_glXCopySubBufferMESA}, |
599 |
-+ {"glXCopySubBufferMESA", &retrace_glXCopySubBufferMESA}, |
600 |
- {"glXCreateContextAttribsARB", &retrace_glXCreateContextAttribsARB}, |
601 |
- {"glXCreateContext", &retrace_glXCreateContext}, |
602 |
- //{"glXCreateContextWithConfigSGIX", &retrace_glXCreateContextWithConfigSGIX}, |
603 |
---- apitrace/retrace/glws.hpp |
604 |
-+++ apitrace/retrace/glws.hpp |
605 |
-@@ -127,6 +127,8 @@ public: |
606 |
- visible = true; |
607 |
- } |
608 |
- |
609 |
-+ virtual void copySubBuffer(int x, int y, int width, int height) = 0; |
610 |
-+ |
611 |
- virtual void swapBuffers(void) = 0; |
612 |
- }; |
613 |
- |
614 |
---- apitrace/retrace/glws_egl_xlib.cpp |
615 |
-+++ apitrace/retrace/glws_egl_xlib.cpp |
616 |
-@@ -244,6 +244,10 @@ public: |
617 |
- Drawable::show(); |
618 |
- } |
619 |
- |
620 |
-+ void copySubBuffer(int x, int y, int width, int height) { |
621 |
-+ std::cerr << "glws_egl_xlib: Warning: copySubBuffer Not yet implemented\n"; |
622 |
-+ } |
623 |
-+ |
624 |
- void swapBuffers(void) { |
625 |
- eglBindAPI(api); |
626 |
- eglSwapBuffers(eglDisplay, surface); |
627 |
---- apitrace/retrace/glws_glx.cpp |
628 |
-+++ apitrace/retrace/glws_glx.cpp |
629 |
-@@ -213,6 +213,12 @@ public: |
630 |
- Drawable::show(); |
631 |
- } |
632 |
- |
633 |
-+ void copySubBuffer(int x, int y, int width, int height) { |
634 |
-+ glXCopySubBufferMESA(display, window, x, y, width, height); |
635 |
-+ |
636 |
-+ processKeys(); |
637 |
-+ } |
638 |
-+ |
639 |
- void swapBuffers(void) { |
640 |
- glXSwapBuffers(display, window); |
641 |
- |
642 |
|
643 |
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch |
644 |
deleted file mode 100644 |
645 |
index 08ce65e2fc0..00000000000 |
646 |
--- a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch |
647 |
+++ /dev/null |
648 |
@@ -1,49 +0,0 @@ |
649 |
-Allow building of just glxtrace library for ebuilds without GUI tools. |
650 |
- |
651 |
-Updated from 3.0 version of patch to apply against 4.0. |
652 |
- |
653 |
---- apitrace/CMakeLists.txt |
654 |
-+++ apitrace/CMakeLists.txt |
655 |
-@@ -30,6 +30,7 @@ set (ENABLE_CLI true CACHE BOOL "Enable command Line interface.") |
656 |
- |
657 |
- set (ENABLE_EGL true CACHE BOOL "Enable EGL support.") |
658 |
- |
659 |
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF) |
660 |
- |
661 |
- ############################################################################## |
662 |
- # Find dependencies |
663 |
-@@ -248,6 +255,8 @@ endif () |
664 |
- # - The packaged versions QJson are very old, and do not support NaN/Infinity. |
665 |
- # - To make it easier to build the GUI on Windows and MacOSX, as there are no |
666 |
- # binaries at all. |
667 |
-+if (NOT BUILD_LIB_ONLY) |
668 |
-+ |
669 |
- if (QT4_FOUND) |
670 |
- add_definitions (-DQJSON_EXPORT=) |
671 |
- add_subdirectory (thirdparty/qjson) |
672 |
-@@ -257,6 +266,8 @@ if (QT4_FOUND) |
673 |
- set (QJSON_FOUND TRUE) |
674 |
- endif () |
675 |
- |
676 |
-+endif (NOT BUILD_LIB_ONLY) |
677 |
-+ |
678 |
- # We use bundled headers for all Khronos APIs, to guarantee support for both |
679 |
- # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs |
680 |
- # are so intertwined that conditional compilation extremely difficult. This |
681 |
---- apitrace/retrace/CMakeLists.txt |
682 |
-+++ apitrace/retrace/CMakeLists.txt |
683 |
-@@ -11,6 +11,8 @@ include_directories ( |
684 |
- |
685 |
- add_definitions (-DRETRACE) |
686 |
- |
687 |
-+if (NOT BUILD_LIB_ONLY) |
688 |
-+ |
689 |
- add_custom_command ( |
690 |
- OUTPUT glretrace_gl.cpp |
691 |
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp |
692 |
-@@ -259,3 +261,5 @@ if (WIN32) |
693 |
- |
694 |
- install (TARGETS d3dretrace RUNTIME DESTINATION bin) |
695 |
- endif () |
696 |
-+ |
697 |
-+endif (NOT BUILD_LIB_ONLY) |
698 |
|
699 |
diff --git a/dev-util/apitrace/files/apitrace-4.0-memcpy.patch b/dev-util/apitrace/files/apitrace-4.0-memcpy.patch |
700 |
deleted file mode 100644 |
701 |
index 5b49808ada9..00000000000 |
702 |
--- a/dev-util/apitrace/files/apitrace-4.0-memcpy.patch |
703 |
+++ /dev/null |
704 |
@@ -1,13 +0,0 @@ |
705 |
-http://bugs.gentoo.org/465504 |
706 |
-http://github.com/apitrace/apitrace/issues/118 |
707 |
- |
708 |
---- a/image/image_png.cpp |
709 |
-+++ b/image/image_png.cpp |
710 |
-@@ -31,6 +31,7 @@ |
711 |
- #include <assert.h> |
712 |
- #include <stdint.h> |
713 |
- #include <stdlib.h> |
714 |
-+#include <string.h> |
715 |
- |
716 |
- #include <fstream> |
717 |
- |
718 |
|
719 |
diff --git a/dev-util/apitrace/files/apitrace-4.0-multilib.patch b/dev-util/apitrace/files/apitrace-4.0-multilib.patch |
720 |
deleted file mode 100644 |
721 |
index 6ad78c7cde0..00000000000 |
722 |
--- a/dev-util/apitrace/files/apitrace-4.0-multilib.patch |
723 |
+++ /dev/null |
724 |
@@ -1,59 +0,0 @@ |
725 |
-Upstream commit to find wrappers in lib64 directory. |
726 |
- |
727 |
-commit 3f9c2ecf18d8fa37fad5a7062f80952692eaa8e7 |
728 |
-Author: Alexander Monakov <amonakov@××××××.ru> |
729 |
-Date: Wed Oct 16 20:51:47 2013 +0400 |
730 |
- |
731 |
- cli: use $LIB to handle multilib automagically on glibc |
732 |
- |
733 |
---- apitrace/cli/CMakeLists.txt |
734 |
-+++ apitrace/cli/CMakeLists.txt |
735 |
-@@ -31,6 +31,7 @@ target_link_libraries (apitrace |
736 |
- ${ZLIB_LIBRARIES} |
737 |
- ${SNAPPY_LIBRARIES} |
738 |
- ${GETOPT_LIBRARIES} |
739 |
-+ dl |
740 |
- ) |
741 |
- |
742 |
- if (NOT CMAKE_CROSSCOMPILING) |
743 |
---- apitrace/cli/cli_resources.cpp |
744 |
-+++ apitrace/cli/cli_resources.cpp |
745 |
-@@ -32,6 +32,20 @@ |
746 |
- |
747 |
- #include "cli_resources.hpp" |
748 |
- |
749 |
-+#ifdef __GLIBC__ |
750 |
-+ |
751 |
-+#include <dlfcn.h> |
752 |
-+ |
753 |
-+static bool |
754 |
-+tryLib(const os::String &path) |
755 |
-+{ |
756 |
-+ void *handle = dlopen(path.str(), RTLD_LAZY); |
757 |
-+ bool exists = (handle != NULL); |
758 |
-+ if (exists) |
759 |
-+ dlclose(handle); |
760 |
-+ return exists; |
761 |
-+} |
762 |
-+#endif |
763 |
- |
764 |
- os::String |
765 |
- findProgram(const char*programFilename) |
766 |
-@@ -76,6 +90,17 @@ findWrapper(const char *wrapperFilename) |
767 |
- return wrapperPath; |
768 |
- } |
769 |
- |
770 |
-+#ifdef __GLIBC__ |
771 |
-+ // We want to take advantage of $LIB dynamic string token expansion in |
772 |
-+ // glibc dynamic linker to handle multilib layout for us |
773 |
-+ wrapperPath = processDir; |
774 |
-+ wrapperPath.join("../$LIB/apitrace/wrappers"); |
775 |
-+ wrapperPath.join(wrapperFilename); |
776 |
-+ if (tryLib(wrapperPath)) { |
777 |
-+ return wrapperPath; |
778 |
-+ } |
779 |
-+#endif |
780 |
-+ |
781 |
- // Try relative install directory |
782 |
- wrapperPath = processDir; |
783 |
- #if defined(_WIN32) |
784 |
|
785 |
diff --git a/dev-util/apitrace/files/apitrace-4.0-system-libs.patch b/dev-util/apitrace/files/apitrace-4.0-system-libs.patch |
786 |
deleted file mode 100644 |
787 |
index 68468a30bde..00000000000 |
788 |
--- a/dev-util/apitrace/files/apitrace-4.0-system-libs.patch |
789 |
+++ /dev/null |
790 |
@@ -1,72 +0,0 @@ |
791 |
-Find external system libraries for ebuild. |
792 |
- |
793 |
-Updated from 3.0 version of patch to apply against 4.0. |
794 |
- |
795 |
---- apitrace/CMakeLists.txt |
796 |
-+++ apitrace/CMakeLists.txt |
797 |
-@@ -224,23 +224,14 @@ set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers) |
798 |
- # - on unices to prevent symbol collisions when tracing applications that link |
799 |
- # against other versions of these libraries |
800 |
- |
801 |
--set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib) |
802 |
--set (ZLIB_LIBRARIES z_bundled) |
803 |
--add_subdirectory (thirdparty/zlib) |
804 |
-- |
805 |
--include_directories (${ZLIB_INCLUDE_DIRS}) |
806 |
-- |
807 |
--set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy) |
808 |
--set (SNAPPY_LIBRARIES snappy_bundled) |
809 |
--add_subdirectory (thirdparty/snappy) |
810 |
-+find_package (ZLIB REQUIRED) |
811 |
-+include_directories (${ZLIB_INCLUDE_DIRS}) |
812 |
- |
813 |
-+find_package (SNAPPY REQUIRED) |
814 |
- include_directories (${SNAPPY_INCLUDE_DIRS}) |
815 |
- |
816 |
--set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng) |
817 |
--set (PNG_DEFINITIONS "") |
818 |
--set (PNG_LIBRARIES png_bundled) |
819 |
-- |
820 |
--add_subdirectory (thirdparty/libpng) |
821 |
-+find_package (PNG REQUIRED) |
822 |
-+include_directories (${PNG_INCLUDE_DIRS}) |
823 |
- |
824 |
- if (MSVC) |
825 |
- add_subdirectory (thirdparty/getopt) |
826 |
-diff --git a/cmake/FindSNAPPY.cmake b/cmake/FindSNAPPY.cmake |
827 |
-new file mode 100644 |
828 |
-index 0000000..5cd64c3 |
829 |
---- /dev/null |
830 |
-+++ apitrace/cmake/FindSNAPPY.cmake |
831 |
-@@ -0,0 +1,31 @@ |
832 |
-+# Find SNAPPY - A fast compressor/decompressor |
833 |
-+# |
834 |
-+# This module defines |
835 |
-+# SNAPPY_FOUND - whether the qsjon library was found |
836 |
-+# SNAPPY_LIBRARIES - the snappy library |
837 |
-+# SNAPPY_INCLUDE_DIR - the include path of the snappy library |
838 |
-+# |
839 |
-+ |
840 |
-+if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES) |
841 |
-+ |
842 |
-+ # Already in cache |
843 |
-+ set (SNAPPY_FOUND TRUE) |
844 |
-+ |
845 |
-+else (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES) |
846 |
-+ |
847 |
-+ find_library (SNAPPY_LIBRARIES |
848 |
-+ NAMES |
849 |
-+ snappy |
850 |
-+ PATHS |
851 |
-+ ) |
852 |
-+ |
853 |
-+ find_path (SNAPPY_INCLUDE_DIR |
854 |
-+ NAMES |
855 |
-+ snappy.h |
856 |
-+ PATHS |
857 |
-+ ) |
858 |
-+ |
859 |
-+ include(FindPackageHandleStandardArgs) |
860 |
-+ find_package_handle_standard_args(SNAPPY DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR) |
861 |
-+ |
862 |
-+endif (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES) |
863 |
|
864 |
diff --git a/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch |
865 |
deleted file mode 100644 |
866 |
index aac018e6581..00000000000 |
867 |
--- a/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch |
868 |
+++ /dev/null |
869 |
@@ -1,34 +0,0 @@ |
870 |
-respect the libdir cmake already set up for us instead of using the multiarch crap |
871 |
- |
872 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
873 |
-index 17f3dce..c3fe52e 100644 |
874 |
---- a/CMakeLists.txt |
875 |
-+++ b/CMakeLists.txt |
876 |
-@@ -216,12 +216,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |
877 |
- # Installation directories |
878 |
- |
879 |
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
880 |
-- # Debian multiarch support |
881 |
-- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH |
882 |
-- OUTPUT_VARIABLE ARCH_SUBDIR |
883 |
-- ERROR_QUIET |
884 |
-- OUTPUT_STRIP_TRAILING_WHITESPACE |
885 |
-- ) |
886 |
- CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND) |
887 |
- if (READPROC_H_FOUND) |
888 |
- add_definitions (-DHAVE_READPROC_H) |
889 |
-@@ -237,11 +231,11 @@ if (WIN32 OR APPLE) |
890 |
- set (LIB_ARCH_INSTALL_DIR lib) |
891 |
- else () |
892 |
- set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME}) |
893 |
-- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) |
894 |
-+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}) |
895 |
- if (ARCH_SUBDIR) |
896 |
-- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) |
897 |
-+ set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) |
898 |
- else () |
899 |
-- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) |
900 |
-+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}) |
901 |
- endif () |
902 |
- endif () |
903 |
- |
904 |
|
905 |
diff --git a/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch |
906 |
deleted file mode 100644 |
907 |
index 03e6143afff..00000000000 |
908 |
--- a/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch |
909 |
+++ /dev/null |
910 |
@@ -1,53 +0,0 @@ |
911 |
-Allow building of just glxtrace library for ebuilds without GUI tools. |
912 |
- |
913 |
-Updated from 4.0 version of patch to apply against 5.0. |
914 |
- |
915 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
916 |
-index 17f3dce..3bba2a9 100644 |
917 |
---- a/CMakeLists.txt |
918 |
-+++ b/CMakeLists.txt |
919 |
-@@ -33,6 +33,7 @@ set (ENABLE_EGL true CACHE BOOL "Enable EGL support.") |
920 |
- |
921 |
- set (ENABLE_WAFFLE false CACHE BOOL "Enable WAFFLE support.") |
922 |
- |
923 |
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF) |
924 |
- |
925 |
- ############################################################################## |
926 |
- # Find dependencies |
927 |
-@@ -301,6 +302,8 @@ set (MD5_LIBRARIES md5_bundled) |
928 |
- # - The packaged versions QJson are very old, and do not support NaN/Infinity. |
929 |
- # - To make it easier to build the GUI on Windows and MacOSX, as there are no |
930 |
- # binaries at all. |
931 |
-+if (NOT BUILD_LIB_ONLY) |
932 |
-+ |
933 |
- if (QT4_FOUND) |
934 |
- add_definitions (-DQJSON_EXPORT=) |
935 |
- add_subdirectory (thirdparty/qjson) |
936 |
-@@ -310,6 +313,8 @@ if (QT4_FOUND) |
937 |
- set (QJSON_FOUND TRUE) |
938 |
- endif () |
939 |
- |
940 |
-+endif (NOT BUILD_LIB_ONLY) |
941 |
-+ |
942 |
- # We use bundled headers for all Khronos APIs, to guarantee support for both |
943 |
- # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs |
944 |
- # are so intertwined that conditional compilation extremely difficult. This |
945 |
-diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt |
946 |
-index 4e37979..2607ddf 100644 |
947 |
---- a/retrace/CMakeLists.txt |
948 |
-+++ b/retrace/CMakeLists.txt |
949 |
-@@ -11,6 +11,8 @@ include_directories ( |
950 |
- |
951 |
- add_definitions (-DRETRACE) |
952 |
- |
953 |
-+if (NOT BUILD_LIB_ONLY) |
954 |
-+ |
955 |
- add_custom_command ( |
956 |
- OUTPUT glretrace_gl.cpp |
957 |
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp |
958 |
-@@ -282,3 +284,5 @@ if (WIN32) |
959 |
- |
960 |
- install (TARGETS d3dretrace RUNTIME DESTINATION bin) |
961 |
- endif () |
962 |
-+ |
963 |
-+endif (NOT BUILD_LIB_ONLY) |
964 |
|
965 |
diff --git a/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch |
966 |
deleted file mode 100644 |
967 |
index bc6ba03060a..00000000000 |
968 |
--- a/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch |
969 |
+++ /dev/null |
970 |
@@ -1,35 +0,0 @@ |
971 |
-respect the libdir cmake already set up for us instead of using debian-specific multiarch paths |
972 |
- |
973 |
---- apitrace-6.0/CMakeLists.txt |
974 |
-+++ apitrace-6.0/CMakeLists.txt |
975 |
-@@ -280,15 +280,6 @@ |
976 |
- ############################################################################## |
977 |
- # Installation directories |
978 |
- |
979 |
--if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
980 |
-- # Debian multiarch support |
981 |
-- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH |
982 |
-- OUTPUT_VARIABLE ARCH_SUBDIR |
983 |
-- ERROR_QUIET |
984 |
-- OUTPUT_STRIP_TRAILING_WHITESPACE |
985 |
-- ) |
986 |
--endif() |
987 |
-- |
988 |
- if (WIN32 OR APPLE) |
989 |
- # On Windows/MacOSX, applications are usually installed on a directory of |
990 |
- # their own |
991 |
-@@ -297,12 +288,8 @@ |
992 |
- set (LIB_ARCH_INSTALL_DIR lib) |
993 |
- else () |
994 |
- set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME}) |
995 |
-- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) |
996 |
-- if (ARCH_SUBDIR) |
997 |
-- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) |
998 |
-- else () |
999 |
-- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) |
1000 |
-- endif () |
1001 |
-+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}) |
1002 |
-+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}) |
1003 |
- endif () |
1004 |
- |
1005 |
- set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts) |