Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/, dev-libs/beignet/files/
Date: Fri, 24 May 2019 14:20:56
Message-Id: 1558707626.09d3a7a7d6c604d5a14f8cf98482c18228618e09.marecki@gentoo
1 commit: 09d3a7a7d6c604d5a14f8cf98482c18228618e09
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 24 11:16:31 2019 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Fri May 24 14:20:26 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d3a7a7
7
8 dev-libs/beignet: remove live ebuild
9
10 There haven't been any commits to the Beignet Git repository since July
11 2018, and what is there right now causes LuxMark to segfault almost
12 immediately.
13
14 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
15 Package-Manager: Portage-2.3.62, Repoman-2.3.11
16
17 dev-libs/beignet/beignet-9999.ebuild | 102 ---------------------
18 .../beignet-1.4.0-oclicd_no_upstream_icdfile.patch | 17 ----
19 .../files/beignet-1.4.0_no-debian-multiarch.patch | 21 -----
20 3 files changed, 140 deletions(-)
21
22 diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
23 deleted file mode 100644
24 index 735edfd2e51..00000000000
25 --- a/dev-libs/beignet/beignet-9999.ebuild
26 +++ /dev/null
27 @@ -1,102 +0,0 @@
28 -# Copyright 1999-2019 Gentoo Authors
29 -# Distributed under the terms of the GNU General Public License v2
30 -
31 -EAPI=6
32 -
33 -PYTHON_COMPAT=( python{2_7,3_5,3_6} )
34 -CMAKE_BUILD_TYPE="Release"
35 -
36 -inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
37 -
38 -DESCRIPTION="OpenCL implementation for Intel GPUs"
39 -HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
40 -
41 -LICENSE="LGPL-2.1+"
42 -SLOT="0"
43 -IUSE="ocl-icd ocl20"
44 -
45 -if [[ "${PV}" == "9999" ]]; then
46 - inherit git-r3
47 - EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
48 - KEYWORDS=""
49 -else
50 - KEYWORDS="~amd64"
51 - SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
52 - S=${WORKDIR}/Beignet-${PV}-Source
53 -fi
54 -
55 -COMMON="media-libs/mesa
56 - sys-devel/clang:=
57 - sys-devel/llvm:=
58 - >=x11-libs/libdrm-2.4.70[video_cards_intel]
59 - x11-libs/libXext
60 - x11-libs/libXfixes"
61 -RDEPEND="${COMMON}
62 - app-eselect/eselect-opencl"
63 -DEPEND="${COMMON}
64 - ${PYTHON_DEPS}
65 - ocl-icd? ( dev-libs/ocl-icd )
66 - virtual/pkgconfig"
67 -
68 -PATCHES=(
69 - "${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch
70 - "${FILESDIR}"/${PN}-1.4.0-oclicd_no_upstream_icdfile.patch
71 - "${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
72 - "${FILESDIR}"/llvm-terminfo.patch
73 -)
74 -
75 -DOCS=(
76 - docs/.
77 -)
78 -
79 -pkg_pretend() {
80 - if [[ ${MERGE_TYPE} != "binary" ]]; then
81 - if tc-is-gcc; then
82 - if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
83 - eerror "Compilation with gcc older than 4.6 is not supported"
84 - die "Too old gcc found."
85 - fi
86 - fi
87 - fi
88 -}
89 -
90 -pkg_setup() {
91 - python_setup
92 -}
93 -
94 -src_prepare() {
95 - # See Bug #593968
96 - append-flags -fPIC
97 -
98 - cmake-utils_src_prepare
99 - # We cannot run tests because they require permissions to access
100 - # the hardware, and building them is very time-consuming.
101 - cmake_comment_add_subdirectory utests
102 -}
103 -
104 -multilib_src_configure() {
105 - VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
106 -
107 - local mycmakeargs=(
108 - -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
109 - -DOCLICD_COMPAT=$(usex ocl-icd)
110 - $(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
111 - )
112 -
113 - cmake-utils_src_configure
114 -}
115 -
116 -multilib_src_install() {
117 - VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
118 -
119 - cmake-utils_src_install
120 -
121 - insinto /etc/OpenCL/vendors/
122 - echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
123 - doins "${PN}-${ABI}.icd"
124 -
125 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
126 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
127 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
128 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
129 -}
130
131 diff --git a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch b/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
132 deleted file mode 100644
133 index ddffcfc8aff..00000000000
134 --- a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
135 +++ /dev/null
136 @@ -1,17 +0,0 @@
137 ---- a/CMakeLists.txt
138 -+++ b/CMakeLists.txt
139 -@@ -214,14 +214,6 @@
140 - Find_Package(OCLIcd)
141 - IF(OCLIcd_FOUND)
142 - MESSAGE(STATUS "Looking for OCL ICD header file - found")
143 -- configure_file (
144 -- "intel-beignet.icd.in"
145 -- "${ICD_FILE_NAME}"
146 -- )
147 -- IF(NOT OCL_ICD_INSTALL_PREFIX)
148 -- set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors")
149 -- ENDIF(NOT OCL_ICD_INSTALL_PREFIX)
150 -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${OCL_ICD_INSTALL_PREFIX})
151 - ELSE(OCLIcd_FOUND)
152 - MESSAGE(STATUS "Looking for OCL ICD header file - not found")
153 - MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.")
154
155 diff --git a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch b/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch
156 deleted file mode 100644
157 index 983ba61ff38..00000000000
158 --- a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch
159 +++ /dev/null
160 @@ -1,21 +0,0 @@
161 ---- a/CMakeLists.txt
162 -+++ b/CMakeLists.txt
163 -@@ -33,15 +33,9 @@
164 -
165 - SET(CMAKE_VERBOSE_MAKEFILE "false")
166 - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
167 --INCLUDE (GNUInstallDirs OPTIONAL)
168 --# support old CMake without GNUInstallDirs
169 --if (NOT CMAKE_INSTALL_FULL_LIBDIR)
170 -- set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
171 -- set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
172 -- set (BEIGNET_LIBRARY_ARCHITECTURE "")
173 --else (NOT CMAKE_INSTALL_FULL_LIBDIR)
174 -- set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
175 --endif (NOT CMAKE_INSTALL_FULL_LIBDIR)
176 -+set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
177 -+set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
178 -+set (BEIGNET_LIBRARY_ARCHITECTURE "")
179 -
180 - if (NOT LIB_INSTALL_DIR)
181 - set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")