1 |
commit: 1c8cdb76debcadda786b60cda76a1c535841ac96 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 29 19:23:04 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=1c8cdb76 |
7 |
|
8 |
dev-util/apitrace: Drop 7.1-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-util/apitrace/Manifest | 1 - |
14 |
dev-util/apitrace/apitrace-7.1-r1.ebuild | 96 ---------------------- |
15 |
.../files/apitrace-7.1-disable-multiarch.patch | 35 -------- |
16 |
.../apitrace/files/apitrace-7.1-docs-install.patch | 23 ------ |
17 |
.../files/apitrace-7.1-glxtrace-only.patch | 32 -------- |
18 |
.../files/apitrace-7.1-snappy-license.patch | 11 --- |
19 |
6 files changed, 198 deletions(-) |
20 |
|
21 |
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest |
22 |
index 18ef76c6bb4..001d549c4d9 100644 |
23 |
--- a/dev-util/apitrace/Manifest |
24 |
+++ b/dev-util/apitrace/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST apitrace-7.1.tar.gz 2343156 BLAKE2B ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce SHA512 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84 |
27 |
DIST apitrace-8.0.tar.gz 3601109 BLAKE2B f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc SHA512 1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c |
28 |
|
29 |
diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild b/dev-util/apitrace/apitrace-7.1-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index c39555ef493..00000000000 |
32 |
--- a/dev-util/apitrace/apitrace-7.1-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,96 +0,0 @@ |
35 |
-# Copyright 1999-2018 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-PYTHON_COMPAT=( python2_7 ) |
41 |
-inherit cmake-multilib python-single-r1 |
42 |
- |
43 |
-DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs" |
44 |
-HOMEPAGE="https://github.com/apitrace/apitrace" |
45 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="MIT" |
48 |
-LICENSE+=" BSD CC-BY-3.0 CC-BY-4.0 public-domain" #bundled snappy |
49 |
-SLOT="0" |
50 |
-KEYWORDS="~amd64 ~arm ~x86" |
51 |
-IUSE="+cli egl qt5 system-snappy" |
52 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
53 |
- |
54 |
-RDEPEND="${PYTHON_DEPS} |
55 |
- media-libs/libpng:0= |
56 |
- media-libs/mesa[egl?,${MULTILIB_USEDEP}] |
57 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
58 |
- sys-process/procps |
59 |
- x11-libs/libX11 |
60 |
- egl? ( |
61 |
- >=media-libs/mesa-8.0[gles1,gles2] |
62 |
- media-libs/waffle[egl] |
63 |
- ) |
64 |
- qt5? ( |
65 |
- dev-qt/qtcore:5 |
66 |
- dev-qt/qtgui:5[-gles2] |
67 |
- dev-qt/qtnetwork:5 |
68 |
- dev-qt/qtwebkit:5 |
69 |
- dev-qt/qtwidgets:5[-gles2] |
70 |
- ) |
71 |
- system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] ) |
72 |
-" |
73 |
-DEPEND="${RDEPEND}" |
74 |
- |
75 |
-PATCHES=( |
76 |
- "${FILESDIR}"/${PN}-7.1-glxtrace-only.patch |
77 |
- "${FILESDIR}"/${PN}-7.1-disable-multiarch.patch |
78 |
- "${FILESDIR}"/${PN}-7.1-docs-install.patch |
79 |
- "${FILESDIR}"/${PN}-7.1-snappy-license.patch |
80 |
-) |
81 |
- |
82 |
-src_prepare() { |
83 |
- cmake-utils_src_prepare |
84 |
- |
85 |
- # The apitrace code grubs around in the internal zlib structures. |
86 |
- # We have to extract this header and clean it up to keep that working. |
87 |
- # Do not be surprised if a zlib upgrade breaks things ... |
88 |
- rm -rf "${S}"/thirdparty/{getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die |
89 |
- if use system-snappy ; then |
90 |
- rm -rf "${S}"/thirdparty/snappy || die |
91 |
- fi |
92 |
-} |
93 |
- |
94 |
-src_configure() { |
95 |
- my_configure() { |
96 |
- local mycmakeargs=( |
97 |
- -DENABLE_EGL=$(usex egl) |
98 |
- -DENABLE_STATIC_SNAPPY=$(usex !system-snappy) |
99 |
- ) |
100 |
- if multilib_is_native_abi ; then |
101 |
- mycmakeargs+=( |
102 |
- -DENABLE_CLI=$(usex cli) |
103 |
- -DENABLE_GUI=$(usex qt5) |
104 |
- ) |
105 |
- else |
106 |
- mycmakeargs+=( |
107 |
- -DBUILD_LIB_ONLY=ON |
108 |
- -DENABLE_CLI=OFF |
109 |
- -DENABLE_GUI=OFF |
110 |
- ) |
111 |
- fi |
112 |
- cmake-utils_src_configure |
113 |
- } |
114 |
- |
115 |
- multilib_parallel_foreach_abi my_configure |
116 |
-} |
117 |
- |
118 |
-src_install() { |
119 |
- cmake-multilib_src_install |
120 |
- |
121 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so |
122 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 |
123 |
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 |
124 |
- |
125 |
- rm docs/INSTALL.markdown || die |
126 |
- dodoc docs/* README.markdown |
127 |
- |
128 |
- exeinto /usr/$(get_libdir)/${PN}/scripts |
129 |
- doexe $(find scripts -type f -executable) |
130 |
-} |
131 |
|
132 |
diff --git a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch |
133 |
deleted file mode 100644 |
134 |
index 53d470d8705..00000000000 |
135 |
--- a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch |
136 |
+++ /dev/null |
137 |
@@ -1,35 +0,0 @@ |
138 |
-respect the libdir cmake already set up for us instead of using debian-specific multiarch paths |
139 |
- |
140 |
---- apitrace-7.1/CMakeLists.txt |
141 |
-+++ apitrace-7.1/CMakeLists.txt |
142 |
-@@ -359,15 +359,6 @@ |
143 |
- ############################################################################## |
144 |
- # Installation directories |
145 |
- |
146 |
--if (CMAKE_SYSTEM_NAME STREQUAL "Linux") |
147 |
-- # Debian multiarch support |
148 |
-- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH |
149 |
-- OUTPUT_VARIABLE ARCH_SUBDIR |
150 |
-- ERROR_QUIET |
151 |
-- OUTPUT_STRIP_TRAILING_WHITESPACE |
152 |
-- ) |
153 |
--endif() |
154 |
-- |
155 |
- if (WIN32 OR APPLE) |
156 |
- # On Windows/MacOSX, applications are usually installed on a directory of |
157 |
- # their own |
158 |
-@@ -376,12 +367,8 @@ |
159 |
- set (LIB_ARCH_INSTALL_DIR lib) |
160 |
- else () |
161 |
- set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME}) |
162 |
-- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) |
163 |
-- if (ARCH_SUBDIR) |
164 |
-- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) |
165 |
-- else () |
166 |
-- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) |
167 |
-- endif () |
168 |
-+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}) |
169 |
-+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}) |
170 |
- endif () |
171 |
- |
172 |
- set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts) |
173 |
|
174 |
diff --git a/dev-util/apitrace/files/apitrace-7.1-docs-install.patch b/dev-util/apitrace/files/apitrace-7.1-docs-install.patch |
175 |
deleted file mode 100644 |
176 |
index 9fdc04ffe99..00000000000 |
177 |
--- a/dev-util/apitrace/files/apitrace-7.1-docs-install.patch |
178 |
+++ /dev/null |
179 |
@@ -1,23 +0,0 @@ |
180 |
---- apitrace-7.1/CMakeLists.txt |
181 |
-+++ apitrace-7.1/CMakeLists.txt |
182 |
-@@ -553,20 +553,6 @@ |
183 |
- ############################################################################## |
184 |
- # Packaging |
185 |
- |
186 |
--install ( |
187 |
-- FILES |
188 |
-- README.markdown |
189 |
-- docs/BUGS.markdown |
190 |
-- docs/NEWS.markdown |
191 |
-- docs/USAGE.markdown |
192 |
-- DESTINATION ${DOC_INSTALL_DIR} |
193 |
--) |
194 |
--install ( |
195 |
-- FILES LICENSE |
196 |
-- DESTINATION ${DOC_INSTALL_DIR} |
197 |
-- RENAME LICENSE.txt |
198 |
--) |
199 |
-- |
200 |
- set (CPACK_PACKAGE_VERSION_MAJOR "7") |
201 |
- set (CPACK_PACKAGE_VERSION_MINOR "0") |
202 |
- |
203 |
|
204 |
diff --git a/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch |
205 |
deleted file mode 100644 |
206 |
index 91867affca2..00000000000 |
207 |
--- a/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch |
208 |
+++ /dev/null |
209 |
@@ -1,32 +0,0 @@ |
210 |
-Allow building of just glxtrace library for ebuilds without GUI tools. |
211 |
- |
212 |
-Updated from 5.0 version of patch to apply against 7.1. |
213 |
- |
214 |
---- a/CMakeLists.txt |
215 |
-+++ b/CMakeLists.txt |
216 |
-@@ -44,6 +44,8 @@ |
217 |
- |
218 |
- option (ENABLE_FRAME_POINTER "Disable frame pointer omission" ON) |
219 |
- |
220 |
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF) |
221 |
-+ |
222 |
- # Proprietary Linux games often ship their own libraries (zlib, libstdc++, |
223 |
- # etc.) in order to ship a single set of binaries across multiple |
224 |
- # distributions. Given that apitrace wrapper modules will be loaded into those |
225 |
---- a/retrace/CMakeLists.txt |
226 |
-+++ b/retrace/CMakeLists.txt |
227 |
-@@ -12,6 +12,8 @@ |
228 |
- |
229 |
- add_definitions (-DRETRACE) |
230 |
- |
231 |
-+if (NOT BUILD_LIB_ONLY) |
232 |
-+ |
233 |
- add_custom_command ( |
234 |
- OUTPUT glretrace_gl.cpp |
235 |
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp |
236 |
-@@ -368,3 +370,5 @@ |
237 |
- install (TARGETS d3dretrace RUNTIME DESTINATION bin) |
238 |
- install_pdb (d3dretrace DESTINATION bin) |
239 |
- endif () |
240 |
-+ |
241 |
-+endif (NOT BUILD_LIB_ONLY) |
242 |
|
243 |
diff --git a/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch b/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch |
244 |
deleted file mode 100644 |
245 |
index 2b211dc5ddb..00000000000 |
246 |
--- a/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch |
247 |
+++ /dev/null |
248 |
@@ -1,11 +0,0 @@ |
249 |
---- apitrace-7.1/thirdparty/snappy/CMakeLists.txt |
250 |
-+++ apitrace-7.1/thirdparty/snappy/CMakeLists.txt |
251 |
-@@ -16,8 +16,3 @@ |
252 |
- snappy-c.cc |
253 |
- ) |
254 |
- |
255 |
--install ( |
256 |
-- FILES COPYING |
257 |
-- DESTINATION ${DOC_INSTALL_DIR} |
258 |
-- RENAME LICENSE-snappy.txt |
259 |
--) |