From 4d368bd6282013c388197a31dc54c84b3e793c31 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Sun, 20 Sep 2015 22:21:45 +0200 Subject: licenses: Add OpenSIFT license --- licenses/OpenSIFT | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 licenses/OpenSIFT 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 +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. + -- cgit v1.2.3 From 343d737f841e98657de06607615f2afc537e8a80 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Sun, 20 Sep 2015 22:34:53 +0200 Subject: profiles/license_groups: Add OpenSIFT to EULA group --- profiles/license_groups | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 2bcb78ca21eb09b4f4460a2d2fa83dc5132434a9 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Sun, 20 Sep 2015 22:36:48 +0200 Subject: sci-libs/arrayfire: Add nonfree use flag Package-Manager: portage-2.2.20.1 --- sci-libs/arrayfire/ChangeLog | 6 ++ sci-libs/arrayfire/arrayfire-3.1.1-r1.ebuild | 105 -------------------------- sci-libs/arrayfire/arrayfire-3.1.1-r2.ebuild | 108 +++++++++++++++++++++++++++ sci-libs/arrayfire/metadata.xml | 3 + 4 files changed, 117 insertions(+), 105 deletions(-) delete mode 100644 sci-libs/arrayfire/arrayfire-3.1.1-r1.ebuild create mode 100644 sci-libs/arrayfire/arrayfire-3.1.1-r2.ebuild 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 + +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 -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-r1.ebuild deleted file mode 100644 index 2aa72aa1f..000000000 --- a/sci-libs/arrayfire/arrayfire-3.1.1-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils multilib - -GTEST_PV="1.7.0" - -DESCRIPTION="A general purpose GPU library." -HOMEPAGE="http://www.arrayfire.com/" -SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2 -test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )" -KEYWORDS="~amd64" - -LICENSE="BSD" -SLOT="0" -IUSE="+examples +cpu cuda opencl test graphics" - -RDEPEND=" - >=sys-devel/gcc-4.7:* - media-libs/freeimage - cuda? ( - >=dev-util/nvidia-cuda-toolkit-7.5.18-r1 - dev-libs/boost - ) - cpu? ( - virtual/blas - virtual/cblas - virtual/lapacke - sci-libs/fftw:3.0 - ) - opencl? ( - virtual/blas - virtual/cblas - virtual/lapacke - dev-libs/boost - 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}" - -S="${WORKDIR}/${PN}" -BUILD_DIR="${S}/build" -CMAKE_BUILD_TYPE=Release - -# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage -# user is (usually) not in the video group -RESTRICT="userpriv" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then - die "Compilation with gcc older than 4.7 is not supported." - fi - fi -} - -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 - fi -} - -src_configure() { - if use cuda; then - addwrite /dev/nvidiactl - addwrite /dev/nvidia0 - addwrite /dev/nvidia-uvm - fi - - local mycmakeargs=( - $(cmake-utils_use_build cpu CPU) - $(cmake-utils_use_build cuda CUDA) - $(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 - -DUSE_SYSTEM_FORGE=ON - -DAF_INSTALL_CMAKE_DIR=/usr/${get_libdir}/cmake/ArrayFire - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - dobin "${BUILD_DIR}/bin2cpp" -} diff --git a/sci-libs/arrayfire/arrayfire-3.1.1-r2.ebuild b/sci-libs/arrayfire/arrayfire-3.1.1-r2.ebuild new file mode 100644 index 000000000..929f4e22d --- /dev/null +++ b/sci-libs/arrayfire/arrayfire-3.1.1-r2.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils multilib + +GTEST_PV="1.7.0" + +DESCRIPTION="A general purpose GPU library." +HOMEPAGE="http://www.arrayfire.com/" +SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2 +test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )" +KEYWORDS="~amd64" + +LICENSE="BSD + nonfree? ( OpenSIFT )" +SLOT="0" +IUSE="+examples +cpu cuda nonfree opencl test graphics" + +RDEPEND=" + >=sys-devel/gcc-4.7:* + media-libs/freeimage + cuda? ( + >=dev-util/nvidia-cuda-toolkit-7.5.18-r1 + dev-libs/boost + ) + cpu? ( + virtual/blas + virtual/cblas + virtual/lapacke + sci-libs/fftw:3.0 + ) + opencl? ( + virtual/blas + virtual/cblas + virtual/lapacke + dev-libs/boost + 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}" + +S="${WORKDIR}/${PN}" +BUILD_DIR="${S}/build" +CMAKE_BUILD_TYPE=Release + +# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage +# user is (usually) not in the video group +RESTRICT="userpriv" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then + die "Compilation with gcc older than 4.7 is not supported." + fi + fi +} + +src_unpack() { + default + + if ! use nonfree; then + find "${WORKDIR}" -name "*_nonfree*" -delete || die + fi + + if use test; then + mkdir -p "${BUILD_DIR}"/third_party/src/ || die + mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die + fi +} + +src_configure() { + if use cuda; then + addwrite /dev/nvidiactl + addwrite /dev/nvidia0 + addwrite /dev/nvidia-uvm + fi + + local mycmakeargs=( + $(cmake-utils_use_build cpu CPU) + $(cmake-utils_use_build cuda CUDA) + $(cmake-utils_use_build opencl OPENCL) + $(cmake-utils_use_build examples EXAMPLES) + $(cmake-utils_use_build test TEST) + $(cmake-utils_use_build graphics GRAPHICS) + $(cmake-utils_use_build nonfree NONFREE) + -DUSE_SYSTEM_BOOST_COMPUTE=ON + -DUSE_SYSTEM_CLBLAS=ON + -DUSE_SYSTEM_CLFFT=ON + -DUSE_SYSTEM_FORGE=ON + -DAF_INSTALL_CMAKE_DIR=/usr/${get_libdir}/cmake/ArrayFire + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + dobin "${BUILD_DIR}/bin2cpp" +} 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 @@ Build OpenCL backend. + + Build ArrayFire nonfree algorithms. + Build with Forge graphics. -- cgit v1.2.3 From bb72374e9489f070872643d2e625e1da93c8e210 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Mon, 21 Sep 2015 09:44:45 +0200 Subject: dev-util/nvidia-cuda-gdk: Add dependency on drivers for nvvs use flag Package-Manager: portage-2.2.20.1 --- dev-util/nvidia-cuda-gdk/ChangeLog | 4 ++++ dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-352.39.ebuild | 2 ++ 2 files changed, 6 insertions(+) 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 + 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 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..0ad603730 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,8 @@ 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] + Date: Mon, 21 Sep 2015 10:07:56 +0200 Subject: dev-util/nvidia-cuda-gdk: Improve style Package-Manager: portage-2.2.20.1 --- dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-352.39.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 0ad603730..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,8 +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-352.39[uvm] +