From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-958544-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B428D139694
for <garchives@archives.gentoo.org>; Fri, 30 Jun 2017 12:58:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E590EE0BE9;
Fri, 30 Jun 2017 12:58:50 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id BCC9CE0BE9
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Jun 2017 12:58:50 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 582EA341914
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Jun 2017 12:58:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BA5BA7490
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Jun 2017 12:58:47 +0000 (UTC)
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1498827439.0eafd4cd77602ccc5a1b0a487be6a2b47c402706.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/beignet/beignet-1.3.1-r1.ebuild dev-libs/beignet/beignet-9999.ebuild
X-VCS-Directories: dev-libs/beignet/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: 0eafd4cd77602ccc5a1b0a487be6a2b47c402706
X-VCS-Branch: master
Date: Fri, 30 Jun 2017 12:58:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9d94077a-6888-46e2-bfd6-749a05b399e5
X-Archives-Hash: 59ed6c2941bd27bf9f60adc2b55427da
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