From 8bff9d950738b5df18001baa07e39527bee46970 Mon Sep 17 00:00:00 2001 From: Marek Szuba Date: Sun, 19 Feb 2017 18:42:59 +0100 Subject: [PATCH] dev-libs/beignet: remove old Package-Manager: portage-2.3.3 --- dev-libs/beignet/Manifest | 2 - dev-libs/beignet/beignet-1.1.2.ebuild | 97 ----------------- dev-libs/beignet/beignet-1.2.0-r1.ebuild | 101 ------------------ dev-libs/beignet/beignet-1.2.0.ebuild | 100 ----------------- dev-libs/beignet/beignet-1.2.1.ebuild | 99 ----------------- ...eignet-1.2.0-drm_intel_get_pooled_eu.patch | 23 ---- .../files/llvm-empty-system-libs.patch | 11 -- .../beignet/files/no-hardcoded-cflags.patch | 13 --- 8 files changed, 446 deletions(-) delete mode 100644 dev-libs/beignet/beignet-1.1.2.ebuild delete mode 100644 dev-libs/beignet/beignet-1.2.0-r1.ebuild delete mode 100644 dev-libs/beignet/beignet-1.2.0.ebuild delete mode 100644 dev-libs/beignet/beignet-1.2.1.ebuild delete mode 100644 dev-libs/beignet/files/beignet-1.2.0-drm_intel_get_pooled_eu.patch delete mode 100644 dev-libs/beignet/files/llvm-empty-system-libs.patch delete mode 100644 dev-libs/beignet/files/no-hardcoded-cflags.patch diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest index 5319fe670ac7..1314f8e25fe6 100644 --- a/dev-libs/beignet/Manifest +++ b/dev-libs/beignet/Manifest @@ -1,4 +1,2 @@ -DIST beignet-1.1.2-source.tar.gz 948241 SHA256 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96 SHA512 25b7118976c385ad3b9db01afd3c9494ff9d050d44ee4266042abb4215747d8bb5086c06697f754956f562ea2b6e5ec51d51bbd651e8cd7cd0eb14eb8c83fbd4 WHIRLPOOL c3bfb7f4fa3c97bbd202ace868a08dce48753cac547b075e4c30cfff21cffcc5520ef4ef77b4e15fa8574a798f41a920e44503a160a1888e9ee4f2a737b37e82 -DIST beignet-1.2.0-source.tar.gz 1076674 SHA256 fc7af19efb7596b04510d26c558a576eba3e95e1ef86fd6951213c6a4bf58bff SHA512 f6c0de7d6a301352125d53c843d8c4a9728526b06b215093424720e7c17eb99f8cfc4b70c61e035d5cb36ca7666c6e772fe0d7818d91421104fa1ed350d637f1 WHIRLPOOL 9ac0195b16ff0ed186dbc5e0bfb6ee3027d0426d7e2401238b69b934a010d365eb6941cd80e3650e600cbcac8d31f819e2adb67452394b07a903aad72c1e11d7 DIST beignet-1.2.1-source.tar.gz 1080590 SHA256 b74eb03534a12b86a896cdbd8209b072c8a38e7af456195793a498428a7ac81f SHA512 f0d0d0590be1624928d9ee1a0666f49d908eff1ee9c1a7a28c4e680523419e544f607899bcfdae7f4ce5d32d411739afb481c0c22383db4a7381ccc71326e7f2 WHIRLPOOL 74bb72220e865406100a232fd8755b37746acf3616adbc7c66389a7a7ef3d7ca959ea1234d167091161019c1c3fc0fb9b877fc70af695bd2d2bb232c83725322 DIST beignet-1.3.0-source.tar.gz 1133643 SHA256 63d98b4fe8fba3dbc0299d29fef84560625e5ac51b16b8fed453021d4afb5cd5 SHA512 7eb3c8bca484462787a6b4d360059b63608305b171e33078f1b65dcbcbf6831bcca95e762af3f4f0b9c99449c7d607e63ea138149b9f3a854d7017df927aa7ee WHIRLPOOL cbaa92f67a5f53b3d3243dd08c9a680c734b732601667a40ba147023fa96c0b4f78794f76011ab172c66265ad4bf0eddd5b6b301fc0a67790dc3d30c23d7ec83 diff --git a/dev-libs/beignet/beignet-1.1.2.ebuild b/dev-libs/beignet/beignet-1.1.2.ebuild deleted file mode 100644 index 6a46dbaefa23..000000000000 --- a/dev-libs/beignet/beignet-1.1.2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -CMAKE_BUILD_TYPE="Release" - -inherit python-any-r1 cmake-multilib toolchain-funcs - -DESCRIPTION="OpenCL implementation for Intel GPUs" -HOMEPAGE="https://01.org/beignet" - -LICENSE="LGPL-2.1+" -SLOT="0" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="git://anongit.freedesktop.org/beignet" - KEYWORDS="" -else - KEYWORDS="~amd64" - SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz" - S=${WORKDIR}/Beignet-${PV}-Source -fi - -COMMON="${PYTHON_DEPS} - media-libs/mesa - sys-devel/clang - >=sys-devel/llvm-3.5 - "${PN}-${ABI}.icd" || die "Failed to generate ICD file" - doins "${PN}-${ABI}.icd" - - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so -} diff --git a/dev-libs/beignet/beignet-1.2.0-r1.ebuild b/dev-libs/beignet/beignet-1.2.0-r1.ebuild deleted file mode 100644 index 67c4cb11e6c9..000000000000 --- a/dev-libs/beignet/beignet-1.2.0-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -CMAKE_BUILD_TYPE="Release" - -inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs - -DESCRIPTION="OpenCL implementation for Intel GPUs" -HOMEPAGE="https://01.org/beignet" - -LICENSE="LGPL-2.1+" -SLOT="0" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="git://anongit.freedesktop.org/beignet" - KEYWORDS="" -else - KEYWORDS="~amd64" - SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz" - S=${WORKDIR}/Beignet-${PV}-Source -fi - -COMMON="${PYTHON_DEPS} - media-libs/mesa - sys-devel/clang - >=sys-devel/llvm-3.5 - =x11-libs/libdrm-2.4.70[video_cards_intel] - x11-libs/libXext - x11-libs/libXfixes" -RDEPEND="${COMMON} - app-eselect/eselect-opencl" -DEPEND="${COMMON} - ${PYTHON_DEPS} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/no-debian-multiarch.patch - "${FILESDIR}"/${P}_no-hardcoded-cflags.patch - "${FILESDIR}"/llvm-terminfo.patch - "${FILESDIR}"/${P}-drm_intel_get_pooled_eu.patch -) - -DOCS=( - docs/. -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]]; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then - eerror "Compilation with gcc older than 4.6 is not supported" - die "Too old gcc found." - fi - fi - fi -} - -pkg_setup() { - python_setup -} - -src_prepare() { - # See Bug #593968 - append-flags -fPIC - - cmake-utils_src_prepare - # We cannot run tests because they require permissions to access - # the hardware, and building them is very time-consuming. - cmake_comment_add_subdirectory utests -} - -multilib_src_configure() { - VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" - - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}" - ) - - cmake-utils_src_configure -} - -multilib_src_install() { - VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" - - cmake-utils_src_install - - insinto /etc/OpenCL/vendors/ - echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file" - doins "${PN}-${ABI}.icd" - - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so -} diff --git a/dev-libs/beignet/beignet-1.2.0.ebuild b/dev-libs/beignet/beignet-1.2.0.ebuild deleted file mode 100644 index 929b79463716..000000000000 --- a/dev-libs/beignet/beignet-1.2.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -CMAKE_BUILD_TYPE="Release" - -inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs - -DESCRIPTION="OpenCL implementation for Intel GPUs" -HOMEPAGE="https://01.org/beignet" - -LICENSE="LGPL-2.1+" -SLOT="0" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="git://anongit.freedesktop.org/beignet" - KEYWORDS="" -else - KEYWORDS="~amd64" - SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz" - S=${WORKDIR}/Beignet-${PV}-Source -fi - -COMMON="${PYTHON_DEPS} - media-libs/mesa - sys-devel/clang - >=sys-devel/llvm-3.5 - "${PN}-${ABI}.icd" || die "Failed to generate ICD file" - doins "${PN}-${ABI}.icd" - - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so -} diff --git a/dev-libs/beignet/beignet-1.2.1.ebuild b/dev-libs/beignet/beignet-1.2.1.ebuild deleted file mode 100644 index e675f6bcd317..000000000000 --- a/dev-libs/beignet/beignet-1.2.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -CMAKE_BUILD_TYPE="Release" - -inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs - -DESCRIPTION="OpenCL implementation for Intel GPUs" -HOMEPAGE="https://01.org/beignet" - -LICENSE="LGPL-2.1+" -SLOT="0" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="git://anongit.freedesktop.org/beignet" - KEYWORDS="" -else - KEYWORDS="~amd64" - SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz" - S=${WORKDIR}/Beignet-${PV}-Source -fi - -COMMON="${PYTHON_DEPS} - media-libs/mesa - sys-devel/clang - >=sys-devel/llvm-3.5 - >=x11-libs/libdrm-2.4.70[video_cards_intel] - x11-libs/libXext - x11-libs/libXfixes" -RDEPEND="${COMMON} - app-eselect/eselect-opencl" -DEPEND="${COMMON} - ${PYTHON_DEPS} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/no-debian-multiarch.patch - "${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch - "${FILESDIR}"/llvm-terminfo.patch -) - -DOCS=( - docs/. -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]]; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then - eerror "Compilation with gcc older than 4.6 is not supported" - die "Too old gcc found." - fi - fi - fi -} - -pkg_setup() { - python_setup -} - -src_prepare() { - # See Bug #593968 - append-flags -fPIC - - cmake-utils_src_prepare - # We cannot run tests because they require permissions to access - # the hardware, and building them is very time-consuming. - cmake_comment_add_subdirectory utests -} - -multilib_src_configure() { - VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" - - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}" - ) - - cmake-utils_src_configure -} - -multilib_src_install() { - VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" - - cmake-utils_src_install - - insinto /etc/OpenCL/vendors/ - echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file" - doins "${PN}-${ABI}.icd" - - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so -} diff --git a/dev-libs/beignet/files/beignet-1.2.0-drm_intel_get_pooled_eu.patch b/dev-libs/beignet/files/beignet-1.2.0-drm_intel_get_pooled_eu.patch deleted file mode 100644 index 9ffaee039b64..000000000000 --- a/dev-libs/beignet/files/beignet-1.2.0-drm_intel_get_pooled_eu.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/intel/intel_driver.c b/src/intel/intel_driver.c -index 5f4afda..cf8f829 100644 ---- a/src/intel/intel_driver.c -+++ b/src/intel/intel_driver.c -@@ -958,14 +958,14 @@ intel_update_device_info(cl_device_id device) - - #ifdef HAS_POOLED_EU - /* BXT pooled eu, 3*6 to 2*9, like sub slice count is 2 */ -- unsigned int has_pooled_eu = 0; -- if(!drm_intel_get_pooled_eu(driver->fd, &has_pooled_eu) && has_pooled_eu) -+ int has_pooled_eu; -+ if((has_pooled_eu = drm_intel_get_pooled_eu(driver->fd)) > 0) - device->sub_slice_count = 2; - - #ifdef HAS_MIN_EU_IN_POOL -- unsigned int min_eu; -+ int min_eu; - /* for fused down 2x6 devices, beignet don't support. */ -- if (has_pooled_eu && !drm_intel_get_min_eu_in_pool(driver->fd, &min_eu)) { -+ if (has_pooled_eu > 0 && (min_eu = drm_intel_get_min_eu_in_pool(driver->fd)) > 0) { - assert(min_eu == 9); //don't support fuse down device. - } - #endif //HAS_MIN_EU_IN_POOL diff --git a/dev-libs/beignet/files/llvm-empty-system-libs.patch b/dev-libs/beignet/files/llvm-empty-system-libs.patch deleted file mode 100644 index d5e0cd704a7d..000000000000 --- a/dev-libs/beignet/files/llvm-empty-system-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMake/FindLLVM.cmake 2015-12-18 06:39:59.000000000 +0000 -+++ b/CMake/FindLLVM.cmake 2016-08-31 15:05:11.210679204 +0000 -@@ -99,7 +99,7 @@ - OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_ORIG - OUTPUT_STRIP_TRAILING_WHITESPACE - ) --string(REGEX REPLACE " *\n" "" LLVM_SYSTEM_LIBS ${LLVM_SYSTEM_LIBS_ORIG}) -+string(REGEX REPLACE " *\n" "" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_ORIG}") - endif (LLVM_VERSION_NODOT VERSION_GREATER 34) - - macro(add_one_lib name) diff --git a/dev-libs/beignet/files/no-hardcoded-cflags.patch b/dev-libs/beignet/files/no-hardcoded-cflags.patch deleted file mode 100644 index 3dd67b741733..000000000000 --- a/dev-libs/beignet/files/no-hardcoded-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt 2016-08-31 17:13:26.000000000 +0000 -+++ b/CMakeLists.txt 2016-08-31 17:00:40.000000000 +0000 -@@ -70,8 +70,8 @@ - elseif (COMPILER STREQUAL "ICC") - set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -wd2928 -Wall -fPIC -fstrict-aliasing -fp-model fast -msse4.1 -Wl,-E") - endif () --set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof") --set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}") -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof") -+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") - set (CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DGBE_DEBUG=1") - set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1") - set (CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG -DGBE_DEBUG=0") -- 2.26.2