1 |
commit: 0b35080bbdf8e7afd9b7d19b2c90eb72ed060b0b |
2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 30 12:56:08 2017 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 30 12:57:19 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b35080b |
7 |
|
8 |
dev-libs/beignet: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
dev-libs/beignet/Manifest | 2 - |
13 |
dev-libs/beignet/beignet-1.2.1-r1.ebuild | 101 -------------------- |
14 |
dev-libs/beignet/beignet-1.3.0.ebuild | 104 --------------------- |
15 |
.../beignet-1.2.1-oclicd_optional_gentoo.patch | 23 ----- |
16 |
.../beignet-1.3.0-ocl20_no_platform_check.patch | 21 ----- |
17 |
.../beignet-1.3.0-oclicd_optional_gentoo.patch | 23 ----- |
18 |
6 files changed, 274 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest |
21 |
index 3fe61eede1c..37d86d79568 100644 |
22 |
--- a/dev-libs/beignet/Manifest |
23 |
+++ b/dev-libs/beignet/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST beignet-1.2.1-source.tar.gz 1080590 SHA256 b74eb03534a12b86a896cdbd8209b072c8a38e7af456195793a498428a7ac81f SHA512 f0d0d0590be1624928d9ee1a0666f49d908eff1ee9c1a7a28c4e680523419e544f607899bcfdae7f4ce5d32d411739afb481c0c22383db4a7381ccc71326e7f2 WHIRLPOOL 74bb72220e865406100a232fd8755b37746acf3616adbc7c66389a7a7ef3d7ca959ea1234d167091161019c1c3fc0fb9b877fc70af695bd2d2bb232c83725322 |
26 |
-DIST beignet-1.3.0-source.tar.gz 1133643 SHA256 63d98b4fe8fba3dbc0299d29fef84560625e5ac51b16b8fed453021d4afb5cd5 SHA512 7eb3c8bca484462787a6b4d360059b63608305b171e33078f1b65dcbcbf6831bcca95e762af3f4f0b9c99449c7d607e63ea138149b9f3a854d7017df927aa7ee WHIRLPOOL cbaa92f67a5f53b3d3243dd08c9a680c734b732601667a40ba147023fa96c0b4f78794f76011ab172c66265ad4bf0eddd5b6b301fc0a67790dc3d30c23d7ec83 |
27 |
DIST beignet-1.3.1-source.tar.gz 1136608 SHA256 399b7bc64d674b3092683263f7c085c5592686b9d837817e77857248e5cb561f SHA512 727c8ce68dc39672aa37370ebf2748955925a7cfd58c970c9a641706b45cc31d4a7d3eeebc366ed32ef69add5dd36189814454e5b31f12a6f09ea1a51c810338 WHIRLPOOL 528667a58fbd446e7177edc578543b301205a05fae99d3b1d3782792cac564683e7318fe4e83d81c194ee29fa6cca613e86ce8064f26b551385c8b6c51f4b21e |
28 |
|
29 |
diff --git a/dev-libs/beignet/beignet-1.2.1-r1.ebuild b/dev-libs/beignet/beignet-1.2.1-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 2bc05baf071..00000000000 |
32 |
--- a/dev-libs/beignet/beignet-1.2.1-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,101 +0,0 @@ |
35 |
-# Copyright 1999-2017 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 |
-CMAKE_BUILD_TYPE="Release" |
42 |
- |
43 |
-inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs |
44 |
- |
45 |
-DESCRIPTION="OpenCL implementation for Intel GPUs" |
46 |
-HOMEPAGE="https://01.org/beignet" |
47 |
- |
48 |
-LICENSE="LGPL-2.1+" |
49 |
-SLOT="0" |
50 |
-IUSE="ocl-icd" |
51 |
- |
52 |
-if [[ "${PV}" == "9999" ]]; then |
53 |
- inherit git-r3 |
54 |
- EGIT_REPO_URI="git://anongit.freedesktop.org/beignet" |
55 |
- KEYWORDS="" |
56 |
-else |
57 |
- KEYWORDS="~amd64" |
58 |
- SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz" |
59 |
- S=${WORKDIR}/Beignet-${PV}-Source |
60 |
-fi |
61 |
- |
62 |
-COMMON="media-libs/mesa |
63 |
- sys-devel/clang:0 |
64 |
- >=sys-devel/llvm-3.5:0 |
65 |
- >=x11-libs/libdrm-2.4.70[video_cards_intel] |
66 |
- x11-libs/libXext |
67 |
- x11-libs/libXfixes" |
68 |
-RDEPEND="${COMMON} |
69 |
- app-eselect/eselect-opencl" |
70 |
-DEPEND="${COMMON} |
71 |
- ${PYTHON_DEPS} |
72 |
- ocl-icd? ( dev-libs/ocl-icd ) |
73 |
- virtual/pkgconfig" |
74 |
- |
75 |
-PATCHES=( |
76 |
- "${FILESDIR}"/no-debian-multiarch.patch |
77 |
- "${FILESDIR}"/${P}-oclicd_optional_gentoo.patch |
78 |
- "${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch |
79 |
- "${FILESDIR}"/llvm-terminfo.patch |
80 |
-) |
81 |
- |
82 |
-DOCS=( |
83 |
- docs/. |
84 |
-) |
85 |
- |
86 |
-pkg_pretend() { |
87 |
- if [[ ${MERGE_TYPE} != "binary" ]]; then |
88 |
- if tc-is-gcc; then |
89 |
- if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then |
90 |
- eerror "Compilation with gcc older than 4.6 is not supported" |
91 |
- die "Too old gcc found." |
92 |
- fi |
93 |
- fi |
94 |
- fi |
95 |
-} |
96 |
- |
97 |
-pkg_setup() { |
98 |
- python_setup |
99 |
-} |
100 |
- |
101 |
-src_prepare() { |
102 |
- # See Bug #593968 |
103 |
- append-flags -fPIC |
104 |
- |
105 |
- cmake-utils_src_prepare |
106 |
- # We cannot run tests because they require permissions to access |
107 |
- # the hardware, and building them is very time-consuming. |
108 |
- cmake_comment_add_subdirectory utests |
109 |
-} |
110 |
- |
111 |
-multilib_src_configure() { |
112 |
- VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" |
113 |
- |
114 |
- local mycmakeargs=( |
115 |
- -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}" |
116 |
- -DOCLICD_COMPAT=$(usex ocl-icd) |
117 |
- ) |
118 |
- |
119 |
- cmake-utils_src_configure |
120 |
-} |
121 |
- |
122 |
-multilib_src_install() { |
123 |
- VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" |
124 |
- |
125 |
- cmake-utils_src_install |
126 |
- |
127 |
- insinto /etc/OpenCL/vendors/ |
128 |
- echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file" |
129 |
- doins "${PN}-${ABI}.icd" |
130 |
- |
131 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1 |
132 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so |
133 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1 |
134 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so |
135 |
-} |
136 |
|
137 |
diff --git a/dev-libs/beignet/beignet-1.3.0.ebuild b/dev-libs/beignet/beignet-1.3.0.ebuild |
138 |
deleted file mode 100644 |
139 |
index 1eb9bb857ca..00000000000 |
140 |
--- a/dev-libs/beignet/beignet-1.3.0.ebuild |
141 |
+++ /dev/null |
142 |
@@ -1,104 +0,0 @@ |
143 |
-# Copyright 1999-2017 Gentoo Foundation |
144 |
-# Distributed under the terms of the GNU General Public License v2 |
145 |
- |
146 |
-EAPI=6 |
147 |
- |
148 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
149 |
-CMAKE_BUILD_TYPE="Release" |
150 |
- |
151 |
-inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs |
152 |
- |
153 |
-DESCRIPTION="OpenCL implementation for Intel GPUs" |
154 |
-HOMEPAGE="https://01.org/beignet" |
155 |
- |
156 |
-LICENSE="LGPL-2.1+" |
157 |
-SLOT="0" |
158 |
-IUSE="ocl-icd ocl20" |
159 |
- |
160 |
-if [[ "${PV}" == "9999" ]]; then |
161 |
- inherit git-r3 |
162 |
- EGIT_REPO_URI="git://anongit.freedesktop.org/beignet" |
163 |
- KEYWORDS="" |
164 |
-else |
165 |
- KEYWORDS="~amd64" |
166 |
- SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz" |
167 |
- S=${WORKDIR}/Beignet-${PV}-Source |
168 |
-fi |
169 |
- |
170 |
-COMMON="media-libs/mesa |
171 |
- sys-devel/clang:0= |
172 |
- >=sys-devel/llvm-3.6:0= |
173 |
- ocl20? ( >=sys-devel/llvm-3.9:0= ) |
174 |
- >=x11-libs/libdrm-2.4.70[video_cards_intel] |
175 |
- x11-libs/libXext |
176 |
- x11-libs/libXfixes" |
177 |
-RDEPEND="${COMMON} |
178 |
- app-eselect/eselect-opencl" |
179 |
-DEPEND="${COMMON} |
180 |
- ${PYTHON_DEPS} |
181 |
- ocl-icd? ( dev-libs/ocl-icd ) |
182 |
- virtual/pkgconfig" |
183 |
- |
184 |
-PATCHES=( |
185 |
- "${FILESDIR}"/no-debian-multiarch.patch |
186 |
- "${FILESDIR}"/${P}-ocl20_no_platform_check.patch |
187 |
- "${FILESDIR}"/${P}-oclicd_optional_gentoo.patch |
188 |
- "${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch |
189 |
- "${FILESDIR}"/llvm-terminfo.patch |
190 |
-) |
191 |
- |
192 |
-DOCS=( |
193 |
- docs/. |
194 |
-) |
195 |
- |
196 |
-pkg_pretend() { |
197 |
- if [[ ${MERGE_TYPE} != "binary" ]]; then |
198 |
- if tc-is-gcc; then |
199 |
- if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then |
200 |
- eerror "Compilation with gcc older than 4.6 is not supported" |
201 |
- die "Too old gcc found." |
202 |
- fi |
203 |
- fi |
204 |
- fi |
205 |
-} |
206 |
- |
207 |
-pkg_setup() { |
208 |
- python_setup |
209 |
-} |
210 |
- |
211 |
-src_prepare() { |
212 |
- # See Bug #593968 |
213 |
- append-flags -fPIC |
214 |
- |
215 |
- cmake-utils_src_prepare |
216 |
- # We cannot run tests because they require permissions to access |
217 |
- # the hardware, and building them is very time-consuming. |
218 |
- cmake_comment_add_subdirectory utests |
219 |
-} |
220 |
- |
221 |
-multilib_src_configure() { |
222 |
- VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" |
223 |
- |
224 |
- local mycmakeargs=( |
225 |
- -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}" |
226 |
- -DOCLICD_COMPAT=$(usex ocl-icd) |
227 |
- -DENABLE_OPENCL_20=$(usex ocl20) |
228 |
- ) |
229 |
- |
230 |
- cmake-utils_src_configure |
231 |
-} |
232 |
- |
233 |
-multilib_src_install() { |
234 |
- VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" |
235 |
- |
236 |
- cmake-utils_src_install |
237 |
- |
238 |
- insinto /etc/OpenCL/vendors/ |
239 |
- echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file" |
240 |
- doins "${PN}-${ABI}.icd" |
241 |
- |
242 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1 |
243 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so |
244 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1 |
245 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so |
246 |
-} |
247 |
|
248 |
diff --git a/dev-libs/beignet/files/beignet-1.2.1-oclicd_optional_gentoo.patch b/dev-libs/beignet/files/beignet-1.2.1-oclicd_optional_gentoo.patch |
249 |
deleted file mode 100644 |
250 |
index 89fed330876..00000000000 |
251 |
--- a/dev-libs/beignet/files/beignet-1.2.1-oclicd_optional_gentoo.patch |
252 |
+++ /dev/null |
253 |
@@ -1,23 +0,0 @@ |
254 |
---- a/CMakeLists.txt |
255 |
-+++ b/CMakeLists.txt |
256 |
-@@ -223,17 +223,15 @@ |
257 |
- # MESSAGE(STATUS "Looking for mesa source code - not found, cl_khr_gl_sharing will be disabled.") |
258 |
- #ENDIF(MESA_SOURCE_FOUND) |
259 |
- |
260 |
-+OPTION(OCLICD_COMPAT "OCL ICD compatibility mode" ON) |
261 |
-+IF(OCLICD_COMPAT) |
262 |
- Find_Package(OCLIcd) |
263 |
- IF(OCLIcd_FOUND) |
264 |
- MESSAGE(STATUS "Looking for OCL ICD header file - found") |
265 |
-- configure_file ( |
266 |
-- "intel-beignet.icd.in" |
267 |
-- "${ICD_FILE_NAME}" |
268 |
-- ) |
269 |
-- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors) |
270 |
- ELSE(OCLIcd_FOUND) |
271 |
- MESSAGE(STATUS "Looking for OCL ICD header file - not found") |
272 |
- ENDIF(OCLIcd_FOUND) |
273 |
-+ENDIF(OCLICD_COMPAT) |
274 |
- |
275 |
- Find_Package(PythonInterp) |
276 |
- |
277 |
|
278 |
diff --git a/dev-libs/beignet/files/beignet-1.3.0-ocl20_no_platform_check.patch b/dev-libs/beignet/files/beignet-1.3.0-ocl20_no_platform_check.patch |
279 |
deleted file mode 100644 |
280 |
index d7cd8ed7238..00000000000 |
281 |
--- a/dev-libs/beignet/files/beignet-1.3.0-ocl20_no_platform_check.patch |
282 |
+++ /dev/null |
283 |
@@ -1,21 +0,0 @@ |
284 |
---- a/CMakeLists.txt |
285 |
-+++ b/CMakeLists.txt |
286 |
-@@ -215,18 +215,6 @@ |
287 |
- |
288 |
- OPTION(ENABLE_OPENCL_20 "Enable opencl 2.0 support" OFF) |
289 |
- IF (ENABLE_OPENCL_20) |
290 |
-- Find_Program(LSPCI lspci) |
291 |
-- IF (NOT LSPCI) |
292 |
-- MESSAGE(FATAL_ERROR "Looking for lspci - not found") |
293 |
-- ENDIF (NOT LSPCI) |
294 |
-- EXECUTE_PROCESS(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/GetGenID.sh" |
295 |
-- RESULT_VARIABLE SUPPORT_OCL20_DEVICE |
296 |
-- OUTPUT_VARIABLE PCI_ID_NOT_USED) |
297 |
-- |
298 |
-- IF (NOT SUPPORT_OCL20_DEVICE EQUAL 1) |
299 |
-- MESSAGE(FATAL_ERROR "Only SKL and newer devices support OpenCL 2.0 now, your device don't support.") |
300 |
-- ENDIF (NOT SUPPORT_OCL20_DEVICE EQUAL 1) |
301 |
-- |
302 |
- IF (NOT HAVE_DRM_INTEL_BO_SET_SOFTPIN) |
303 |
- MESSAGE(FATAL_ERROR "Please update libdrm to version 2.4.66 or later to enable OpenCL 2.0.") |
304 |
- ENDIF (NOT HAVE_DRM_INTEL_BO_SET_SOFTPIN) |
305 |
|
306 |
diff --git a/dev-libs/beignet/files/beignet-1.3.0-oclicd_optional_gentoo.patch b/dev-libs/beignet/files/beignet-1.3.0-oclicd_optional_gentoo.patch |
307 |
deleted file mode 100644 |
308 |
index b51af161717..00000000000 |
309 |
--- a/dev-libs/beignet/files/beignet-1.3.0-oclicd_optional_gentoo.patch |
310 |
+++ /dev/null |
311 |
@@ -1,23 +0,0 @@ |
312 |
---- a/CMakeLists.txt |
313 |
-+++ b/CMakeLists.txt |
314 |
-@@ -197,17 +197,15 @@ |
315 |
- ENDIF(EGL_FOUND) |
316 |
- ENDIF(ENABLE_GL_SHARING) |
317 |
- |
318 |
-+OPTION(OCLICD_COMPAT "OCL ICD compatibility mode" ON) |
319 |
-+IF(OCLICD_COMPAT) |
320 |
- Find_Package(OCLIcd) |
321 |
- IF(OCLIcd_FOUND) |
322 |
- MESSAGE(STATUS "Looking for OCL ICD header file - found") |
323 |
-- configure_file ( |
324 |
-- "intel-beignet.icd.in" |
325 |
-- "${ICD_FILE_NAME}" |
326 |
-- ) |
327 |
-- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors) |
328 |
- ELSE(OCLIcd_FOUND) |
329 |
- MESSAGE(STATUS "Looking for OCL ICD header file - not found") |
330 |
- ENDIF(OCLIcd_FOUND) |
331 |
-+ENDIF(OCLICD_COMPAT) |
332 |
- |
333 |
- Find_Package(PythonInterp) |
334 |
- |