[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     0eafd4cd77602ccc5a1b0a487be6a2b47c402706
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 12:51:24 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=0eafd4cd

dev-libs/beignet: do not try enabling OpenCL 2.0 support on unsupported ABIs

Beignet CMake scripts handle this the right way so let's work with them instead
of against them. Now if USE=ocl20 it will get enabled for abi_x86_64 and
gracefully fall back to 1.2 for the others, whereas USE=-ocl20 still explicitly
disables it for all ABIs.

With many thanks to aballier.

Gentoo-Bug: 622964

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../beignet/{beignet-9999.ebuild => beignet-1.3.1-r1.ebuild}  | 11 ++++++-----
 dev-libs/beignet/beignet-9999.ebuild                          |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-libs/beignet/beignet-9999.ebuild 
b/dev-libs/beignet/beignet-1.3.1-r1.ebuild
similarity index 91%
copy from dev-libs/beignet/beignet-9999.ebuild
copy to dev-libs/beignet/beignet-1.3.1-r1.ebuild
index e842fbc1517..44c6896db12 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-1.3.1-r1.ebuild
@@ -26,8 +26,9 @@ else
 fi
 
 COMMON="media-libs/mesa
-       sys-devel/clang:=
-       sys-devel/llvm:=
+       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"
@@ -39,8 +40,8 @@ DEPEND="${COMMON}
        virtual/pkgconfig"
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch
-       "${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
+       "${FILESDIR}"/no-debian-multiarch.patch
+       "${FILESDIR}"/${P}-oclicd_no_upstream_icdfile.patch
        "${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
        "${FILESDIR}"/llvm-terminfo.patch
 )
@@ -80,7 +81,7 @@ multilib_src_configure() {
        local mycmakeargs=(
                -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
                -DOCLICD_COMPAT=$(usex ocl-icd)
-               -DENABLE_OPENCL_20=$(usex ocl20)
+               $(usex ocl2 "" "-DENABLE_OPENCL_20=OFF")
        )
 
        cmake-utils_src_configure

diff --git a/dev-libs/beignet/beignet-9999.ebuild 
b/dev-libs/beignet/beignet-9999.ebuild
index e842fbc1517..9e1ae6ff87f 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -80,7 +80,7 @@ multilib_src_configure() {
        local mycmakeargs=(
                -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
                -DOCLICD_COMPAT=$(usex ocl-icd)
-               -DENABLE_OPENCL_20=$(usex ocl20)
+               $(usex ocl2 "" "-DENABLE_OPENCL_20=OFF")
        )
 
        cmake-utils_src_configure