diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/beignet | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/beignet')
-rw-r--r-- | dev-libs/beignet/Manifest | 13 | ||||
-rw-r--r-- | dev-libs/beignet/beignet-1.3.2-r1.ebuild | 106 | ||||
-rw-r--r-- | dev-libs/beignet/beignet-1.3.2.ebuild | 105 | ||||
-rw-r--r-- | dev-libs/beignet/beignet-9999.ebuild | 102 | ||||
-rw-r--r-- | dev-libs/beignet/files/beignet-1.2.0_no-hardcoded-cflags.patch | 12 | ||||
-rw-r--r-- | dev-libs/beignet/files/beignet-1.3.1-oclicd_no_upstream_icdfile.patch | 14 | ||||
-rw-r--r-- | dev-libs/beignet/files/beignet-1.3.2_cmake-llvm-config-multilib.patch | 17 | ||||
-rw-r--r-- | dev-libs/beignet/files/beignet-1.3.2_llvm6.patch | 27 | ||||
-rw-r--r-- | dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch | 17 | ||||
-rw-r--r-- | dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch | 21 | ||||
-rw-r--r-- | dev-libs/beignet/files/llvm-terminfo.patch | 20 | ||||
-rw-r--r-- | dev-libs/beignet/files/no-debian-multiarch.patch | 39 | ||||
-rw-r--r-- | dev-libs/beignet/metadata.xml | 14 |
13 files changed, 0 insertions, 507 deletions
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest deleted file mode 100644 index eac6d2260967..000000000000 --- a/dev-libs/beignet/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX beignet-1.2.0_no-hardcoded-cflags.patch 721 BLAKE2B 033bd173462a38e9a35aedb7090adf6c621c040d3a732dfec12c2807a33ffeebbd3dac85a1bfc500f86b997604c6e66d144653cf2ada95b589fac6f6bd4f2600 SHA512 fdb922091986a60a416f9f7be3487e30974e085f8d1fddf0dba2fdcca155d26523c504289d8775e4943acce01bbb7bd3619c1af5e9a43af8afada276a52506e6 -AUX beignet-1.3.1-oclicd_no_upstream_icdfile.patch 564 BLAKE2B f90bdf1c1a795007e9c9322e43df988267eaa1544b2f896bfc1b0bf333647fff753cc7a2e0ec5715f4251b1c54220590d796e48b8a0d0d1681e30f51247639f3 SHA512 c26772accbd5c2a04f8b8a108b87a518cba5ee4fdd142c7514d67f387080d2d37d6d3e87020b4d44b602dfa0cd6387dad29d5fc1bb75e1d5d090f674f937ddd9 -AUX beignet-1.3.2_cmake-llvm-config-multilib.patch 950 BLAKE2B 9028eede7ee68dfd539bb268914c354eeaac8a9d26647c6dfb030078199e749cf67d2c396305ccaa7a139f10fcc8eca7b36657d4425439137e7199a4e62c4d13 SHA512 9a9a0348b39f0f9d256166141b48e255ccbc03e4d5150e660cfad2c23af8ff67b75049361fa84f2c2c26be2be914ad07efeae5e150f4f390ec7d5503c49b1c74 -AUX beignet-1.3.2_llvm6.patch 1039 BLAKE2B 990a653b7ff52ec89ec1204cc5bae1d0b041ae51da4a16fd1a459abfe083be1e5647e9fdac3b336284fcdb6c460dbd9c151d5818c084d49c0c2d68fb56aed905 SHA512 634ddb79878b017be984c0327160affc06d7acaf17b1030e55542d2d2cc873bebd3808638f0966538b0dd7bca763eda2263f22f818dd0b73167a4ba3f5933aaa -AUX beignet-1.4.0-oclicd_no_upstream_icdfile.patch 726 BLAKE2B 4d182497c099e174a95524b4bd7bda66c03e128cb089b7536716afda442d8959beab19f0e6015173fbe761f1f569ce065fd1701545ebfdd0680b070644a4d9c4 SHA512 3a77f85cb8f28096b21a77e70f901ccc64291e7439c5e4ae6d7259c30531ea550604f54d0cf910e4482089ab5782f50dcb1940e5df723b0457fdafd550b2b537 -AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c11696cf311d32863bdc36d9f4f4e946958233884f95ad9c212bf63f598e52ad054da79f453fb5a3208958de48e45bd9f21a010309edf SHA512 6760b3b7038ba0dc125998de65ec688b5eb840d8a41543ab35f6d6b6084a877fe0e383bd44b6947695ff835b391794547d7eec21bf787548e6bb03ccf2b73587 -AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312 -AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383 -DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a -EBUILD beignet-1.3.2-r1.ebuild 2668 BLAKE2B 12e4ec730bd82c38086c7b6516353c3d884cc6578f9b73a9d671b409ac1ac1e2c575887252c762b2df2323c098e89c134030850a7919acaa4ada20809d303557 SHA512 3e59792f8235d1f659abfff9be27b69384b01c1bd6cfc6fe15bfbc4d5da0860a12bfe13dd3c506d132695ee739631a413e5f4d70ac481f3348e9c4f5d90d1f57 -EBUILD beignet-1.3.2.ebuild 2630 BLAKE2B 09a301f4174494e0f8007de277f9c3d888361661631ace7e1858a0a4cfec7cac07f494b2187862e447e1079716b9561bc6526422ce8100df54bdaf282de8cf0b SHA512 823a890987d1c6e3c16f9127ebe20947ea09d9114f9e5e42fe97e212d32ae53d44dcfb37aead35608c8b3c2f2214f9c493c99381073cabd4d6ab8872f49762db -EBUILD beignet-9999.ebuild 2452 BLAKE2B 91b4102d667aa6e265c725f7e77a5bf66198b75569d15a6ea7ea6e89a064639a5783d7670dd7627e47b6ee90124a076fba3abc8a13aeb7f82d3aaf9a7e4ab7a0 SHA512 def37f0a7884bcf1f87f3ec1da46d499a7cb6f8dc216ce51212f72039490f70746a5ca3fe3ab1bc7da481834b16d54c0bdf11f7834de319b5e978e5b641d203b -MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186 diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild deleted file mode 100644 index c562b68c13b3..000000000000 --- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -CMAKE_BUILD_TYPE="Release" - -inherit python-any-r1 cmake-multilib flag-o-matic llvm 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="https://anongit.freedesktop.org/git/beignet.git" - 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[${MULTILIB_USEDEP}] - <sys-devel/clang-6.0.9999:=[${MULTILIB_USEDEP}] - >=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}]" -RDEPEND="${COMMON} - app-eselect/eselect-opencl" -DEPEND="${COMMON} - ${PYTHON_DEPS} - ocl-icd? ( dev-libs/ocl-icd ) - virtual/pkgconfig" - -LLVM_MAX_SLOT=6 - -PATCHES=( - "${FILESDIR}"/no-debian-multiarch.patch - "${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch - "${FILESDIR}"/${PN}-1.3.2_llvm6.patch - "${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.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() { - llvm_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) - $(usex ocl20 "" "-DENABLE_OPENCL_20=OFF") - ) - - 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.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild deleted file mode 100644 index b586f5b888a2..000000000000 --- a/dev-libs/beignet/beignet-1.3.2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -CMAKE_BUILD_TYPE="Release" - -inherit python-any-r1 cmake-multilib flag-o-matic llvm 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="https://anongit.freedesktop.org/git/beignet.git" - KEYWORDS="amd64" -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[${MULTILIB_USEDEP}] - <sys-devel/clang-6.0.0:=[${MULTILIB_USEDEP}] - >=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}]" -RDEPEND="${COMMON} - app-eselect/eselect-opencl" -DEPEND="${COMMON} - ${PYTHON_DEPS} - ocl-icd? ( dev-libs/ocl-icd ) - virtual/pkgconfig" - -LLVM_MAX_SLOT=5 - -PATCHES=( - "${FILESDIR}"/no-debian-multiarch.patch - "${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch - "${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.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() { - llvm_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) - $(usex ocl20 "" "-DENABLE_OPENCL_20=OFF") - ) - - 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-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild deleted file mode 100644 index 5c7dd730a34c..000000000000 --- a/dev-libs/beignet/beignet-9999.ebuild +++ /dev/null @@ -1,102 +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,3_6} ) -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="https://anongit.freedesktop.org/git/beignet.git" - 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:= - sys-devel/llvm:= - >=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}"/${PN}-1.4.0_no-debian-multiarch.patch - "${FILESDIR}"/${PN}-1.4.0-oclicd_no_upstream_icdfile.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) - $(usex ocl20 "" "-DENABLE_OPENCL_20=OFF") - ) - - 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_no-hardcoded-cflags.patch b/dev-libs/beignet/files/beignet-1.2.0_no-hardcoded-cflags.patch deleted file mode 100644 index 3f9875930b50..000000000000 --- a/dev-libs/beignet/files/beignet-1.2.0_no-hardcoded-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/CMakeLists.txt 2016-08-30 10:06:31.000000000 +0000 -+++ b/CMakeLists.txt 2016-09-16 06:55:28.975772954 +0000 -@@ -89,8 +89,7 @@ - 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_CXX_FLAGS} ${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof") --set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_CXX_FLAGS}") -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof") - 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") diff --git a/dev-libs/beignet/files/beignet-1.3.1-oclicd_no_upstream_icdfile.patch b/dev-libs/beignet/files/beignet-1.3.1-oclicd_no_upstream_icdfile.patch deleted file mode 100644 index 7e9e88361b42..000000000000 --- a/dev-libs/beignet/files/beignet-1.3.1-oclicd_no_upstream_icdfile.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -213,11 +213,6 @@ - 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") - MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.") diff --git a/dev-libs/beignet/files/beignet-1.3.2_cmake-llvm-config-multilib.patch b/dev-libs/beignet/files/beignet-1.3.2_cmake-llvm-config-multilib.patch deleted file mode 100644 index 5add6a1bbda8..000000000000 --- a/dev-libs/beignet/files/beignet-1.3.2_cmake-llvm-config-multilib.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/CMake/FindLLVM.cmake -+++ b/CMake/FindLLVM.cmake -@@ -8,12 +8,12 @@ - # LLVM_FOUND - True if llvm found. - if (LLVM_INSTALL_DIR) - find_program(LLVM_CONFIG_EXECUTABLE -- NAMES llvm-config-37 llvm-config-3.7 llvm-config-36 llvm-config-3.6 llvm-config-38 llvm-config-3.8 llvm-config-39 llvm-config-3.9 llvm-config llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4 -+ NAMES $ENV{CHOST}-llvm-config - DOC "llvm-config executable" - PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) - else (LLVM_INSTALL_DIR) - find_program(LLVM_CONFIG_EXECUTABLE -- NAMES llvm-config-37 llvm-config-3.7 llvm-config-36 llvm-config-3.6 llvm-config-38 llvm-config-3.8 llvm-config-39 llvm-config-3.9 llvm-config llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4 -+ NAMES $ENV{CHOST}-llvm-config - DOC "llvm-config executable") - endif (LLVM_INSTALL_DIR) - diff --git a/dev-libs/beignet/files/beignet-1.3.2_llvm6.patch b/dev-libs/beignet/files/beignet-1.3.2_llvm6.patch deleted file mode 100644 index be3ccbc44325..000000000000 --- a/dev-libs/beignet/files/beignet-1.3.2_llvm6.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/backend/src/llvm/llvm_to_gen.cpp -+++ b/backend/src/llvm/llvm_to_gen.cpp -@@ -322,7 +322,11 @@ namespace gbe - DataLayout DL(&mod); - - gbeDiagnosticContext dc; -+#if LLVM_VERSION_MAJOR >= 6 -+ mod.getContext().setDiagnosticHandlerCallBack(&gbeDiagnosticHandler,&dc); -+#else - mod.getContext().setDiagnosticHandler(&gbeDiagnosticHandler,&dc); -+#endif - - #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37 - mod.setDataLayout(DL); ---- a/backend/src/llvm/llvm_unroll.cpp -+++ b/backend/src/llvm/llvm_unroll.cpp -@@ -205,7 +205,9 @@ namespace gbe { - if (parentTripCount != 0 && currTripCount * parentTripCount > 32) { - //Don't change the unrollID if doesn't force unroll. - //setUnrollID(parentL, false); --#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38 -+#if LLVM_VERSION_MAJOR >= 6 -+ loopInfo.erase(parentL); -+#elif LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38 - loopInfo.markAsRemoved(parentL); - #else - LPM.deleteLoopFromQueue(parentL); 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 deleted file mode 100644 index ddffcfc8aff4..000000000000 --- a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -214,14 +214,6 @@ - Find_Package(OCLIcd) - IF(OCLIcd_FOUND) - MESSAGE(STATUS "Looking for OCL ICD header file - found") -- configure_file ( -- "intel-beignet.icd.in" -- "${ICD_FILE_NAME}" -- ) -- IF(NOT OCL_ICD_INSTALL_PREFIX) -- set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors") -- ENDIF(NOT OCL_ICD_INSTALL_PREFIX) -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${OCL_ICD_INSTALL_PREFIX}) - ELSE(OCLIcd_FOUND) - MESSAGE(STATUS "Looking for OCL ICD header file - not found") - MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.") 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 deleted file mode 100644 index 983ba61ff38f..000000000000 --- a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,15 +33,9 @@ - - SET(CMAKE_VERBOSE_MAKEFILE "false") - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/") --INCLUDE (GNUInstallDirs OPTIONAL) --# support old CMake without GNUInstallDirs --if (NOT CMAKE_INSTALL_FULL_LIBDIR) -- set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") -- set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share") -- set (BEIGNET_LIBRARY_ARCHITECTURE "") --else (NOT CMAKE_INSTALL_FULL_LIBDIR) -- set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}") --endif (NOT CMAKE_INSTALL_FULL_LIBDIR) -+set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") -+set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share") -+set (BEIGNET_LIBRARY_ARCHITECTURE "") - - if (NOT LIB_INSTALL_DIR) - set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") diff --git a/dev-libs/beignet/files/llvm-terminfo.patch b/dev-libs/beignet/files/llvm-terminfo.patch deleted file mode 100644 index afbbc26a33de..000000000000 --- a/dev-libs/beignet/files/llvm-terminfo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/backend/src/CMakeLists.txt 2015-12-18 07:40:03.000000000 +0100 -+++ b/backend/src/CMakeLists.txt 2016-08-01 13:44:31.475875150 +0200 -@@ -153,7 +153,7 @@ - - add_library(gbeinterp SHARED gbe_bin_interpreter.cpp) - --if (LLVM_VERSION_NODOT VERSION_EQUAL 34) -+if (NOT (LLVM_VERSION_NODOT LESS 34)) - find_library(TERMINFO NAMES tinfo ncurses) - if (${TERMINFO} STREQUAL TERMINFO-NOTFOUND) - message(FATAL_ERROR "no libtinfo or libncurses is found in system") -@@ -161,7 +161,7 @@ - target_link_libraries(gbe ${TERMINFO}) - message(STATUS "use ${TERMINFO} as terminal control library") - endif (${TERMINFO} STREQUAL TERMINFO-NOTFOUND) --endif(LLVM_VERSION_NODOT VERSION_EQUAL 34) -+endif(NOT (LLVM_VERSION_NODOT LESS 34)) - - link_directories (${LLVM_LIBRARY_DIR} ${DRM_LIBDIR}) - diff --git a/dev-libs/beignet/files/no-debian-multiarch.patch b/dev-libs/beignet/files/no-debian-multiarch.patch deleted file mode 100644 index c9aef4d9dafc..000000000000 --- a/dev-libs/beignet/files/no-debian-multiarch.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/CMakeLists.txt 2015-04-17 04:27:51.000000000 +0200 -+++ b/CMakeLists.txt 2015-05-20 20:59:17.895041760 +0200 -@@ -39,14 +39,9 @@ - - SET(CMAKE_VERBOSE_MAKEFILE "false") - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/") --INCLUDE (GNUInstallDirs OPTIONAL) --# support old CMake without GNUInstallDirs --if (NOT CMAKE_INSTALL_FULL_LIBDIR) -- set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") -- set (BEIGNET_LIBRARY_ARCHITECTURE "") --else (NOT CMAKE_INSTALL_FULL_LIBDIR) -- set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}") --endif (NOT CMAKE_INSTALL_FULL_LIBDIR) -+ -+set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") -+set (BEIGNET_LIBRARY_ARCHITECTURE "") - - if (NOT LIB_INSTALL_DIR) - set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") -@@ -55,17 +50,7 @@ - set (BEIGNET_INSTALL_DIR "${LIB_INSTALL_DIR}/beignet/") - endif (NOT BEIGNET_INSTALL_DIR) - --# allow co-installation of 32- and 64-bit versions: --# https://wiki.debian.org/Multiarch --if (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/") -- set (ICD_FILE_NAME "intel-beignet.icd") --else (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/") -- if (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "") -- set (ICD_FILE_NAME "intel-beignet.icd") -- else (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "") -- set (ICD_FILE_NAME "intel-beignet-${BEIGNET_LIBRARY_ARCHITECTURE}.icd") -- endif (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "") --endif (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/") -+set (ICD_FILE_NAME "intel-beignet.icd") - - # Force Release with debug info - if (NOT CMAKE_BUILD_TYPE) diff --git a/dev-libs/beignet/metadata.xml b/dev-libs/beignet/metadata.xml deleted file mode 100644 index 917f7f9527a5..000000000000 --- a/dev-libs/beignet/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> - <use> - <flag name="ocl-icd">Enable compatibility with the - <pkg>dev-libs/ocl-icd</pkg> OpenCL ICD loader</flag> - <flag name="ocl20">Enable experimental OpenCL 2.0 support on Skylake - and newer architectures</flag> - </use> -</pkgmetadata> |