[gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Jauhien Piatlicki" <jauhien@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/
Date: Thu, 17 Sep 2015 21:56:40 +0000 (UTC)	[thread overview]
Message-ID: <1442483326.13b76afbda30141acbdc0eabb3f9026f49d12eb1.jauhien@gentoo> (raw)

commit:     13b76afbda30141acbdc0eabb3f9026f49d12eb1
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Sep 17 09:48:16 2015 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 09:48:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=13b76afb

sci-libs/arrayfire: Add graphics use flag; Minor fixes

Package-Manager: portage-2.2.20.1

 sci-libs/arrayfire/ChangeLog                         |  7 +++++++
 ...ayfire-3.1.1.ebuild => arrayfire-3.1.1-r1.ebuild} | 18 ++++++++++++++----
 sci-libs/arrayfire/arrayfire-9999.ebuild             | 20 +++++++++++++++-----
 sci-libs/arrayfire/metadata.xml                      |  9 ++++++---
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index 3c8c0e2..acf4051 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*arrayfire-3.1.1-r1 (17 Sep 2015)
+
+  17 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +arrayfire-3.1.1-r1.ebuild, -arrayfire-3.1.1.ebuild, arrayfire-9999.ebuild,
+  metadata.xml:
+  sci-libs/arrayfire: Add graphics use flag; Minor fixes
+
   14 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
   -files/arrayfire-9999-FindCBLAS.patch,
   -files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch,

diff --git a/sci-libs/arrayfire/arrayfire-3.1.1.ebuild b/sci-libs/arrayfire/arrayfire-3.1.1-r1.ebuild
similarity index 82%
rename from sci-libs/arrayfire/arrayfire-3.1.1.ebuild
rename to sci-libs/arrayfire/arrayfire-3.1.1-r1.ebuild
index 360650c..2aa72aa 100644
--- a/sci-libs/arrayfire/arrayfire-3.1.1.ebuild
+++ b/sci-libs/arrayfire/arrayfire-3.1.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit cmake-utils
+inherit cmake-utils multilib
 
 GTEST_PV="1.7.0"
 
@@ -16,13 +16,13 @@ KEYWORDS="~amd64"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+examples +cpu cuda opencl test"
+IUSE="+examples +cpu cuda opencl test graphics"
 
 RDEPEND="
 	>=sys-devel/gcc-4.7:*
 	media-libs/freeimage
 	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-7.5
+		>=dev-util/nvidia-cuda-toolkit-7.5.18-r1
 		dev-libs/boost
 	)
 	cpu? (
@@ -39,6 +39,11 @@ RDEPEND="
 		dev-libs/boost-compute
 		>=sci-libs/clblas-2.4
 		>=sci-libs/clfft-2.6.1
+	)
+	graphics? (
+		media-libs/glew
+		>=media-libs/glfw-3.1.1
+		>=sci-visualization/forge-3.1
 	)"
 DEPEND="${RDEPEND}"
 
@@ -61,6 +66,8 @@ pkg_pretend() {
 src_unpack() {
 	default
 
+	find "${WORKDIR}" -name "*_nonfree*" -delete || die
+
 	if use test; then
 		mkdir -p "${BUILD_DIR}"/third_party/src/ || die
 		mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
@@ -80,10 +87,13 @@ src_configure() {
 	   $(cmake-utils_use_build opencl OPENCL)
 	   $(cmake-utils_use_build examples EXAMPLES)
 	   $(cmake-utils_use_build test TEST)
+	   $(cmake-utils_use_build graphics GRAPHICS)
+	   -DBUILD_NONFREE=OFF
 	   -DUSE_SYSTEM_BOOST_COMPUTE=ON
 	   -DUSE_SYSTEM_CLBLAS=ON
 	   -DUSE_SYSTEM_CLFFT=ON
-	   -DBUILD_GRAPHICS=OFF
+	   -DUSE_SYSTEM_FORGE=ON
+	   -DAF_INSTALL_CMAKE_DIR=/usr/${get_libdir}/cmake/ArrayFire
 	)
 	cmake-utils_src_configure
 }

diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild
index c84ddd6..593dc51 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-9999.ebuild
@@ -16,13 +16,13 @@ KEYWORDS=""
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+examples +cpu cuda opencl test"
+IUSE="+examples +cpu cuda opencl test graphics"
 
 RDEPEND="
 	>=sys-devel/gcc-4.7:*
 	media-libs/freeimage
 	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-6.0
+		>=dev-util/nvidia-cuda-toolkit-7.5.18-r1
 		dev-libs/boost
 	)
 	cpu? (
@@ -37,8 +37,13 @@ RDEPEND="
 		virtual/lapacke
 		dev-libs/boost
 		dev-libs/boost-compute
-		sci-libs/clblas
-		sci-libs/clfft
+		>=sci-libs/clblas-2.4
+		>=sci-libs/clfft-2.6.1
+	)
+	graphics? (
+		media-libs/glew
+		>=media-libs/glfw-3.1.1
+		>=sci-visualization/forge-3.1
 	)"
 DEPEND="${RDEPEND}"
 
@@ -60,6 +65,8 @@ pkg_pretend() {
 src_unpack() {
 	git-r3_src_unpack
 
+	find "${WORKDIR}" -name "*_nonfree*" -delete || die
+
 	if use test; then
 		mkdir -p "${BUILD_DIR}"/third_party/src/ || die
 		cd "${BUILD_DIR}"/third_party/src/ || die
@@ -81,10 +88,13 @@ src_configure() {
 	   $(cmake-utils_use_build opencl OPENCL)
 	   $(cmake-utils_use_build examples EXAMPLES)
 	   $(cmake-utils_use_build test TEST)
+	   $(cmake-utils_use_build graphics GRAPHICS)
+	   -DBUILD_NONFREE=OFF
 	   -DUSE_SYSTEM_BOOST_COMPUTE=ON
 	   -DUSE_SYSTEM_CLBLAS=ON
 	   -DUSE_SYSTEM_CLFFT=ON
-	   -DBUILD_GRAPHICS=OFF
+	   -DUSE_SYSTEM_FORGE=ON
+	   -DAF_INSTALL_CMAKE_DIR=/usr/${get_libdir}/cmake/ArrayFire
 	)
 	cmake-utils_src_configure
 }

diff --git a/sci-libs/arrayfire/metadata.xml b/sci-libs/arrayfire/metadata.xml
index d7715cb..884f1fa 100644
--- a/sci-libs/arrayfire/metadata.xml
+++ b/sci-libs/arrayfire/metadata.xml
@@ -15,13 +15,16 @@
   </longdescription>
   <use>
     <flag name="cpu">
-      Enable CPU Build.
+      Build CPU backend.
     </flag>
     <flag name="cuda">
-      Enable CUDA Build.
+      Build CUDA backend.
     </flag>
     <flag name="opencl">
-      Enable OpenCL Build.
+      Build OpenCL backend.
+    </flag>
+    <flag name="graphics">
+      Build with Forge graphics.
     </flag>
   </use>
 </pkgmetadata>

next             reply	other threads:[~2015-09-17 21:56 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-17 21:56 Jauhien Piatlicki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-22 12:00 [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/ Horea Christian
2021-01-20  8:40 Andrew Ammerlaan
2021-01-19  2:04 Aisha Tammy
2020-12-23  2:46 Aisha Tammy
2020-09-25 12:16 Aisha Tammy
2020-09-25  2:33 Aisha Tammy
2020-09-25  2:33 Aisha Tammy
2020-09-25  2:33 Aisha Tammy
2020-09-25  2:33 Aisha Tammy
2020-09-25  2:33 Aisha Tammy
2020-09-25  2:33 Aisha Tammy
2017-03-26  8:18 Justin Lecher
2017-01-02  8:42 Marius Brehler
2016-11-29 10:16 Marius Brehler
2016-11-24 10:55 Marius Brehler
2016-05-20 14:03 Marius Brehler
2016-05-19  7:14 Marius Brehler
2016-01-12 11:07 Marius Brehler
2016-01-12 11:07 Marius Brehler
2016-01-08 13:16 Marius Brehler
2015-12-19 12:36 Marius Brehler
2015-12-04 17:44 Marius Brehler
2015-11-28 18:21 Marius Brehler
2015-11-24 14:36 Marius Brehler
2015-11-02  7:49 Marius Brehler
2015-10-06 21:38 Marius Brehler
2015-10-06 21:38 Marius Brehler
2015-10-01  6:06 Justin Lecher
2015-09-15 13:34 Justin Lecher
2015-09-13 18:34 Justin Lecher
2015-09-09  7:11 Justin Lecher
2015-09-09  7:11 Justin Lecher
2015-08-27 15:01 Justin Lecher
2015-06-05 10:47 Justin Lecher
2015-06-03 10:21 Justin Lecher
2015-05-24  8:14 Justin Lecher
2015-02-20  2:02 Christoph Junghans
2015-02-02 12:06 Justin Lecher
2015-01-22 10:14 Justin Lecher
2015-01-22  0:09 Christoph Junghans
2015-01-15  6:53 Justin Lecher
2015-01-13  2:06 Christoph Junghans
2015-01-13  2:06 Christoph Junghans
2015-01-13  2:06 Christoph Junghans
2015-01-13  2:06 Christoph Junghans
2015-01-13  2:06 Christoph Junghans
2015-01-11  9:09 Justin Lecher
2015-01-11  9:09 Justin Lecher
2015-01-10 18:03 Justin Lecher
2015-01-10 18:03 Justin Lecher
2015-01-10 18:03 Justin Lecher
2015-01-10 18:03 Justin Lecher
2015-01-10 18:03 Justin Lecher
2015-01-10 18:03 Justin Lecher
2015-01-10 18:03 Justin Lecher
2015-01-10 18:03 Justin Lecher

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:3c8c0e2 dfblob:acf4051 dfblob:360650c dfblob:2aa72aa
dfblob:c84ddd6 dfblob:593dc51 dfblob:d7715cb dfblob:884f1fa )
 OR (
bs:"[gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442483326.13b76afbda30141acbdc0eabb3f9026f49d12eb1.jauhien@gentoo \
    --to=jauhien@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox