dev-libs/beignet: make the live ebuild compile again

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
index 89862c1fc514fcff93f57ed8bd5bf9a0b4869335..d25a0abde8c91e6e66715ec89d2403dfd6802479 100644 (file)
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -40,7 +40,7 @@ DEPEND="${COMMON}
 
 PATCHES=(
        "${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch
-       "${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
+       "${FILESDIR}"/${PN}-1.4.0-oclicd_no_upstream_icdfile.patch
        "${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
        "${FILESDIR}"/llvm-terminfo.patch
 )

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
new file mode 100644 (file)
index 0000000..ddffcfc
--- /dev/null
+++ b/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
@@ -0,0 +1,17 @@
+--- 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.")