commit: 19344a7b9043b4559baba4c3ae129f8311f22e2b
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Sep 6 10:26:34 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 10:26:34 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=19344a7b
sci-libs/clfft: Version bump; Add patch for 9999
Package-Manager: portage-2.2.20.1
sci-libs/clfft/ChangeLog | 9 +++++++
.../{clfft-9999.ebuild => clfft-2.6.1.ebuild} | 15 +++++++----
sci-libs/clfft/clfft-9999.ebuild | 4 +++
...ll-cmake-configuration-to-lib-cmake-clFFT.patch | 25 +++++++++++++++++++
...-Install-examples-to-share-clFFT-examples.patch | 15 +++++++++++
...-Install-examples-to-share-clFFT-examples.patch | 29 ++++++++++++++++++++++
6 files changed, 92 insertions(+), 5 deletions(-)
diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog
index 254e3b9..5ccf93b 100644
--- a/sci-libs/clfft/ChangeLog
+++ b/sci-libs/clfft/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*clfft-2.6.1 (06 Sep 2015)
+
+ 06 Sep 2015; Marius Brehler <[email protected]> +clfft-2.6.1.ebuild,
+ +files/clfft-2.6.1-Install-cmake-configuration-to-lib-cmake-clFFT.patch,
+ +files/clfft-2.6.1-Install-examples-to-share-clFFT-examples.patch,
+ +files/clfft-9999-Install-examples-to-share-clFFT-examples.patch,
+ clfft-9999.ebuild:
+ sci-libs/clfft: Version bump; Add patch for 9999
+
06 Sep 2015; Marius Brehler <[email protected]>
+files/clfft-2.4-client_CMakeLists.patch,
+files/clfft-2.4-scripts_perf_CMakeLists.patch,
diff --git a/sci-libs/clfft/clfft-9999.ebuild
b/sci-libs/clfft/clfft-2.6.1.ebuild
similarity index 74%
copy from sci-libs/clfft/clfft-9999.ebuild
copy to sci-libs/clfft/clfft-2.6.1.ebuild
index da8499e..4e459a6 100644
--- a/sci-libs/clfft/clfft-9999.ebuild
+++ b/sci-libs/clfft/clfft-2.6.1.ebuild
@@ -1,18 +1,18 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Header: $
EAPI=5
-inherit cmake-utils git-r3
+inherit cmake-utils
MY_PN="clFFT"
DESCRIPTION="A software library containing FFT functions written in OpenCL"
HOMEPAGE="https://github.com/clMathLibraries/clFFT";
-EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git
git://github.com/clMathLibraries/${MY_PN}.git"
-EGIT_BRANCH="develop"
-S="${WORKDIR}/${P}/src"
+SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+KEYWORDS="~amd64"
+S="${WORKDIR}/${MY_PN}-${PV}/src"
LICENSE="Apache-2.0"
SLOT="0"
@@ -32,6 +32,11 @@ DEPEND="${RDEPEND}"
# Therefore src_test() won't execute any test.
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}/${P}"-Install-cmake-configuration-to-lib-cmake-clFFT.patch
+ "${FILESDIR}/${P}"-Install-examples-to-share-clFFT-examples.patch
+)
+
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
if [[ $(gcc-major-version) -lt 4 ]] || ( [[
$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
diff --git a/sci-libs/clfft/clfft-9999.ebuild b/sci-libs/clfft/clfft-9999.ebuild
index da8499e..73577c7 100644
--- a/sci-libs/clfft/clfft-9999.ebuild
+++ b/sci-libs/clfft/clfft-9999.ebuild
@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}"
# Therefore src_test() won't execute any test.
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}/${P}"-Install-examples-to-share-clFFT-examples.patch
+)
+
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
if [[ $(gcc-major-version) -lt 4 ]] || ( [[
$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
diff --git
a/sci-libs/clfft/files/clfft-2.6.1-Install-cmake-configuration-to-lib-cmake-clFFT.patch
b/sci-libs/clfft/files/clfft-2.6.1-Install-cmake-configuration-to-lib-cmake-clFFT.patch
new file mode 100644
index 0000000..dc317d4
--- /dev/null
+++
b/sci-libs/clfft/files/clfft-2.6.1-Install-cmake-configuration-to-lib-cmake-clFFT.patch
@@ -0,0 +1,25 @@
+From 6a3ba77529987d5906ba6f734bc2fa66a9155a1c Mon Sep 17 00:00:00 2001
+From: Marius Brehler <[email protected]>
+Date: Fri, 5 Jun 2015 14:59:29 +0200
+Subject: [PATCH] Install cmake configuration to lib/cmake/clFFT
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ad15e4a..73200fa 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -290,7 +290,7 @@ endif()
+ if(WIN32)
+ set(destdir CMake)
+ else()
+- set(destdir share/clFFT)
++ set(destdir lib${SUFFIX_LIB}/cmake/clFFT)
+ endif()
+ string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
+ configure_file(
+--
+2.0.5
+
diff --git
a/sci-libs/clfft/files/clfft-2.6.1-Install-examples-to-share-clFFT-examples.patch
b/sci-libs/clfft/files/clfft-2.6.1-Install-examples-to-share-clFFT-examples.patch
new file mode 100644
index 0000000..dff3039
--- /dev/null
+++
b/sci-libs/clfft/files/clfft-2.6.1-Install-examples-to-share-clFFT-examples.patch
@@ -0,0 +1,15 @@
+Patch to fix location of examples:
+https://github.com/clMathLibraries/clFFT/pull/108
+
+Backported for 2.6.1 by Marius Brehler.
+--- src/examples/CMakeLists.txt
++++ src/examples/CMakeLists.txt
+@@ -47,6 +47,7 @@ FOREACH(FILE ${FILES})
+ OUTPUT_NAME ${EXAMPLE}
+ RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME})
+
++ INSTALL(FILES ${FILE} DESTINATION "share/clFFT/examples")
+ INSTALL(TARGETS ${EXAMPLE_NAME}
+- RUNTIME DESTINATION "bin${SUFFIX_BIN}/examples")
++ RUNTIME DESTINATION "share/clFFT/examples")
+ ENDFOREACH()
diff --git
a/sci-libs/clfft/files/clfft-9999-Install-examples-to-share-clFFT-examples.patch
b/sci-libs/clfft/files/clfft-9999-Install-examples-to-share-clFFT-examples.patch
new file mode 100644
index 0000000..01965d9
--- /dev/null
+++
b/sci-libs/clfft/files/clfft-9999-Install-examples-to-share-clFFT-examples.patch
@@ -0,0 +1,29 @@
+Patch to fix location of examples:
+https://github.com/clMathLibraries/clFFT/pull/108
+
+From 8e34e31465231460d1bda73e34584bc7d4862be1 Mon Sep 17 00:00:00 2001
+From: Marius Brehler <[email protected]>
+Date: Sun, 6 Sep 2015 12:01:55 +0200
+Subject: [PATCH] Install examples to share/clFFT/examples
+
+---
+ src/examples/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
+index f93f0fb..0073a34 100644
+--- a/src/examples/CMakeLists.txt
++++ b/src/examples/CMakeLists.txt
+@@ -47,7 +47,7 @@ FOREACH(FILE ${FILES})
+ OUTPUT_NAME ${EXAMPLE}
+ RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME})
+
+- INSTALL(FILES ${FILE} DESTINATION "share/clFFT")
++ INSTALL(FILES ${FILE} DESTINATION "share/clFFT/examples")
+ INSTALL(TARGETS ${EXAMPLE_NAME}
+- RUNTIME DESTINATION "bin${SUFFIX_BIN}/examples")
++ RUNTIME DESTINATION "share/clFFT/examples")
+ ENDFOREACH()
+--
+2.4.6
+
