diff options
| -rw-r--r-- | dev-util/nvidia-cuda-gdk/ChangeLog | 4 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-352.39.ebuild | 4 | ||||
| -rw-r--r-- | licenses/OpenSIFT | 57 | ||||
| -rw-r--r-- | profiles/license_groups | 2 | ||||
| -rw-r--r-- | sci-libs/arrayfire/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/arrayfire/arrayfire-3.1.1-r2.ebuild (renamed from sci-libs/arrayfire/arrayfire-3.1.1-r1.ebuild) | 11 | ||||
| -rw-r--r-- | sci-libs/arrayfire/metadata.xml | 3 |
7 files changed, 82 insertions, 5 deletions
diff --git a/dev-util/nvidia-cuda-gdk/ChangeLog b/dev-util/nvidia-cuda-gdk/ChangeLog index 822b3048e..bb2337821 100644 --- a/dev-util/nvidia-cuda-gdk/ChangeLog +++ b/dev-util/nvidia-cuda-gdk/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 21 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> + nvidia-cuda-gdk-352.39.ebuild: + dev-util/nvidia-cuda-gdk: Add dependency on drivers for nvvs use flag + *nvidia-cuda-gdk-352.39 (12 Sep 2015) 12 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> diff --git a/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-352.39.ebuild b/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-352.39.ebuild index b8db25915..9e3c4e6e0 100644 --- a/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-352.39.ebuild +++ b/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-352.39.ebuild @@ -24,6 +24,10 @@ RDEPEND=" >=dev-util/nvidia-cuda-toolkit-7.5 media-libs/freeglut examples? ( >=x11-drivers/nvidia-drivers-352.39[uvm] ) + nvvs? ( + >=x11-drivers/nvidia-drivers-352.39[uvm] + <x11-drivers/nvidia-drivers-355.00[uvm] + ) " DEPEND="${RDEPEND}" diff --git a/licenses/OpenSIFT b/licenses/OpenSIFT new file mode 100644 index 000000000..e6f59ba51 --- /dev/null +++ b/licenses/OpenSIFT @@ -0,0 +1,57 @@ +Copyright (c) 2006-2012, Rob Hess <rob@iqengines.com> +All rights reserved. + +The following patent has been issued for methods embodied in this +software: "Method and apparatus for identifying scale invariant features +in an image and use of same for locating an object in an image," David +G. Lowe, US Patent 6,711,293 (March 23, 2004). Provisional application +filed March 8, 1999. Asignee: The University of British Columbia. For +further details, contact David Lowe (lowe@cs.ubc.ca) or the +University-Industry Liaison Office of the University of British +Columbia. + +Note that restrictions imposed by this patent (and possibly others) +exist independently of and may be in conflict with the freedoms granted +in this license, which refers to copyright of the program, not patents +for any methods that it implements. Both copyright and patent law must +be obeyed to legally use and redistribute this program and it is not the +purpose of this license to induce you to infringe any patents or other +property right claims or to contest validity of any such claims. If you +redistribute or use the program, then this license merely protects you +from committing copyright infringement. It does not protect you from +committing patent infringement. So, before you do anything with this +program, make sure that you have permission to do so not merely in terms +of copyright, but also in terms of patent law. + +Please note that this license is not to be understood as a guarantee +either. If you use the program according to this license, but in +conflict with patent law, it does not mean that the licensor will refund +you for any losses that you incur if you are sued for your patent +infringement. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright and + patent notices, this list of conditions and the following + disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name of Oregon State University nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/profiles/license_groups b/profiles/license_groups index 66f869f4c..78ea7d424 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1 +1 @@ -EULA ACML-EULA AMD-APPSDK NVIDIA-gdk NVIDIA-CUDA +EULA ACML-EULA AMD-APPSDK NVIDIA-gdk NVIDIA-CUDA OpenSIFT diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog index d7a241bf2..7c122a194 100644 --- a/sci-libs/arrayfire/ChangeLog +++ b/sci-libs/arrayfire/ChangeLog @@ -1,6 +1,12 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ +*arrayfire-3.1.1-r2 (20 Sep 2015) + + 20 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> + +arrayfire-3.1.1-r2.ebuild, -arrayfire-3.1.1-r1.ebuild, metadata.xml: + sci-libs/arrayfire: Add nonfree use flag + 18 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> -arrayfire-3.0.2.ebuild, -arrayfire-3.0_beta.ebuild, -arrayfire-3.1.0.ebuild, -files/arrayfire-3.0_beta-FindBoostCompute.patch, diff --git a/sci-libs/arrayfire/arrayfire-3.1.1-r1.ebuild b/sci-libs/arrayfire/arrayfire-3.1.1-r2.ebuild index 2aa72aa1f..929f4e22d 100644 --- a/sci-libs/arrayfire/arrayfire-3.1.1-r1.ebuild +++ b/sci-libs/arrayfire/arrayfire-3.1.1-r2.ebuild @@ -14,9 +14,10 @@ SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}. test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )" KEYWORDS="~amd64" -LICENSE="BSD" +LICENSE="BSD + nonfree? ( OpenSIFT )" SLOT="0" -IUSE="+examples +cpu cuda opencl test graphics" +IUSE="+examples +cpu cuda nonfree opencl test graphics" RDEPEND=" >=sys-devel/gcc-4.7:* @@ -66,7 +67,9 @@ pkg_pretend() { src_unpack() { default - find "${WORKDIR}" -name "*_nonfree*" -delete || die + if ! use nonfree; then + find "${WORKDIR}" -name "*_nonfree*" -delete || die + fi if use test; then mkdir -p "${BUILD_DIR}"/third_party/src/ || die @@ -88,7 +91,7 @@ src_configure() { $(cmake-utils_use_build examples EXAMPLES) $(cmake-utils_use_build test TEST) $(cmake-utils_use_build graphics GRAPHICS) - -DBUILD_NONFREE=OFF + $(cmake-utils_use_build nonfree NONFREE) -DUSE_SYSTEM_BOOST_COMPUTE=ON -DUSE_SYSTEM_CLBLAS=ON -DUSE_SYSTEM_CLFFT=ON diff --git a/sci-libs/arrayfire/metadata.xml b/sci-libs/arrayfire/metadata.xml index 884f1faaf..1ed53d4e3 100644 --- a/sci-libs/arrayfire/metadata.xml +++ b/sci-libs/arrayfire/metadata.xml @@ -23,6 +23,9 @@ <flag name="opencl"> Build OpenCL backend. </flag> + <flag name="nonfree"> + Build ArrayFire nonfree algorithms. + </flag> <flag name="graphics"> Build with Forge graphics. </flag> |