commit: 0b35080bbdf8e7afd9b7d19b2c90eb72ed060b0b Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Fri Jun 30 12:56:08 2017 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Fri Jun 30 12:57:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b35080b
dev-libs/beignet: remove old Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-libs/beignet/Manifest | 2 - dev-libs/beignet/beignet-1.2.1-r1.ebuild | 101 -------------------- dev-libs/beignet/beignet-1.3.0.ebuild | 104 --------------------- .../beignet-1.2.1-oclicd_optional_gentoo.patch | 23 ----- .../beignet-1.3.0-ocl20_no_platform_check.patch | 21 ----- .../beignet-1.3.0-oclicd_optional_gentoo.patch | 23 ----- 6 files changed, 274 deletions(-) diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest index 3fe61eede1c..37d86d79568 100644 --- a/dev-libs/beignet/Manifest +++ b/dev-libs/beignet/Manifest @@ -1,3 +1 @@ -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 DIST beignet-1.3.1-source.tar.gz 1136608 SHA256 399b7bc64d674b3092683263f7c085c5592686b9d837817e77857248e5cb561f SHA512 727c8ce68dc39672aa37370ebf2748955925a7cfd58c970c9a641706b45cc31d4a7d3eeebc366ed32ef69add5dd36189814454e5b31f12a6f09ea1a51c810338 WHIRLPOOL 528667a58fbd446e7177edc578543b301205a05fae99d3b1d3782792cac564683e7318fe4e83d81c194ee29fa6cca613e86ce8064f26b551385c8b6c51f4b21e diff --git a/dev-libs/beignet/beignet-1.2.1-r1.ebuild b/dev-libs/beignet/beignet-1.2.1-r1.ebuild deleted file mode 100644 index 2bc05baf071..00000000000 --- a/dev-libs/beignet/beignet-1.2.1-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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" -IUSE="ocl-icd" - -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="media-libs/mesa - sys-devel/clang:0 - >=sys-devel/llvm-3.5:0 - >=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} - ocl-icd? ( dev-libs/ocl-icd ) - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/no-debian-multiarch.patch - "${FILESDIR}"/${P}-oclicd_optional_gentoo.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}" - -DOCLICD_COMPAT=$(usex ocl-icd) - ) - - 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.3.0.ebuild b/dev-libs/beignet/beignet-1.3.0.ebuild deleted file mode 100644 index 1eb9bb857ca..00000000000 --- a/dev-libs/beignet/beignet-1.3.0.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -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" -IUSE="ocl-icd ocl20" - -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="media-libs/mesa - sys-devel/clang:0= - >=sys-devel/llvm-3.6:0= - ocl20? ( >=sys-devel/llvm-3.9:0= ) - >=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} - ocl-icd? ( dev-libs/ocl-icd ) - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/no-debian-multiarch.patch - "${FILESDIR}"/${P}-ocl20_no_platform_check.patch - "${FILESDIR}"/${P}-oclicd_optional_gentoo.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}" - -DOCLICD_COMPAT=$(usex ocl-icd) - -DENABLE_OPENCL_20=$(usex ocl20) - ) - - 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.1-oclicd_optional_gentoo.patch b/dev-libs/beignet/files/beignet-1.2.1-oclicd_optional_gentoo.patch deleted file mode 100644 index 89fed330876..00000000000 --- a/dev-libs/beignet/files/beignet-1.2.1-oclicd_optional_gentoo.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -223,17 +223,15 @@ - # MESSAGE(STATUS "Looking for mesa source code - not found, cl_khr_gl_sharing will be disabled.") - #ENDIF(MESA_SOURCE_FOUND) - -+OPTION(OCLICD_COMPAT "OCL ICD compatibility mode" ON) -+IF(OCLICD_COMPAT) - Find_Package(OCLIcd) - IF(OCLIcd_FOUND) - MESSAGE(STATUS "Looking for OCL ICD header file - found") -- configure_file ( -- "intel-beignet.icd.in" -- "${ICD_FILE_NAME}" -- ) -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors) - ELSE(OCLIcd_FOUND) - MESSAGE(STATUS "Looking for OCL ICD header file - not found") - ENDIF(OCLIcd_FOUND) -+ENDIF(OCLICD_COMPAT) - - Find_Package(PythonInterp) - 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 deleted file mode 100644 index d7cd8ed7238..00000000000 --- a/dev-libs/beignet/files/beignet-1.3.0-ocl20_no_platform_check.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -215,18 +215,6 @@ - - OPTION(ENABLE_OPENCL_20 "Enable opencl 2.0 support" OFF) - IF (ENABLE_OPENCL_20) -- Find_Program(LSPCI lspci) -- IF (NOT LSPCI) -- MESSAGE(FATAL_ERROR "Looking for lspci - not found") -- ENDIF (NOT LSPCI) -- EXECUTE_PROCESS(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/GetGenID.sh" -- RESULT_VARIABLE SUPPORT_OCL20_DEVICE -- OUTPUT_VARIABLE PCI_ID_NOT_USED) -- -- IF (NOT SUPPORT_OCL20_DEVICE EQUAL 1) -- MESSAGE(FATAL_ERROR "Only SKL and newer devices support OpenCL 2.0 now, your device don't support.") -- ENDIF (NOT SUPPORT_OCL20_DEVICE EQUAL 1) -- - IF (NOT HAVE_DRM_INTEL_BO_SET_SOFTPIN) - MESSAGE(FATAL_ERROR "Please update libdrm to version 2.4.66 or later to enable OpenCL 2.0.") - ENDIF (NOT HAVE_DRM_INTEL_BO_SET_SOFTPIN) 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 deleted file mode 100644 index b51af161717..00000000000 --- a/dev-libs/beignet/files/beignet-1.3.0-oclicd_optional_gentoo.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -197,17 +197,15 @@ - ENDIF(EGL_FOUND) - ENDIF(ENABLE_GL_SHARING) - -+OPTION(OCLICD_COMPAT "OCL ICD compatibility mode" ON) -+IF(OCLICD_COMPAT) - Find_Package(OCLIcd) - IF(OCLIcd_FOUND) - MESSAGE(STATUS "Looking for OCL ICD header file - found") -- configure_file ( -- "intel-beignet.icd.in" -- "${ICD_FILE_NAME}" -- ) -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors) - ELSE(OCLIcd_FOUND) - MESSAGE(STATUS "Looking for OCL ICD header file - not found") - ENDIF(OCLIcd_FOUND) -+ENDIF(OCLICD_COMPAT) - - Find_Package(PythonInterp) -
