public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/, sci-libs/clfft/files/
@ 2015-06-06  9:46 Justin Lecher
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2015-06-06  9:46 UTC (permalink / raw
  To: gentoo-commits

commit:     b44ecb18a3c1971230dea2bd30f899bd9c39a042
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Jun  5 13:26:46 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 13:26:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b44ecb18

sci-libs/clfft: Drop old; Install cmake configuration

Package-Manager: portage-2.2.18

 sci-libs/clfft/ChangeLog                           |   8 ++
 sci-libs/clfft/clfft-0.9999.ebuild                 |   1 +
 sci-libs/clfft/clfft-2.2.ebuild                    |   1 -
 .../{clfft-2.4.ebuild => clfft-2.4-r1.ebuild}      |   1 +
 sci-libs/clfft/clfft-9999.ebuild                   |   4 +
 .../files/clfft-2.4-fix-cmake-config-install.patch | 128 +++++++++++++++++++++
 ...ll-cmake-configuration-to-lib-cmake-clFFT.patch |  25 ++++
 7 files changed, 167 insertions(+), 1 deletion(-)

diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog
index 1052fa2..eb09913 100644
--- a/sci-libs/clfft/ChangeLog
+++ b/sci-libs/clfft/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*clfft-2.4-r1 (05 Jun 2015)
+
+  05 Jun 2015; Marius Brehler <marbre@linux.sungazer.de> +clfft-2.4-r1.ebuild,
+  +files/clfft-2.4-fix-cmake-config-install.patch,
+  +files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch,
+  -clfft-2.2.ebuild, -clfft-2.4.ebuild, clfft-0.9999.ebuild, clfft-9999.ebuild:
+  sci-libs/clfft: Drop old; Install cmake configuration
+
   05 Jun 2015; Marius Brehler <marbre@linux.sungazer.de> clfft-0.9999.ebuild,
   clfft-2.4.ebuild, clfft-9999.ebuild:
   sci-libs/clfft: Cleanup ebuilds

diff --git a/sci-libs/clfft/clfft-0.9999.ebuild b/sci-libs/clfft/clfft-0.9999.ebuild
index c2a4197..0aebebb 100644
--- a/sci-libs/clfft/clfft-0.9999.ebuild
+++ b/sci-libs/clfft/clfft-0.9999.ebuild
@@ -34,6 +34,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/clfft-client_CMakeLists.patch
 	"${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch
+	"${FILESDIR}"/clfft-2.4-fix-cmake-config-install.patch
 )
 
 pkg_pretend() {

diff --git a/sci-libs/clfft/clfft-2.2.ebuild b/sci-libs/clfft/clfft-2.2.ebuild
deleted file mode 120000
index cd68df3..0000000
--- a/sci-libs/clfft/clfft-2.2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-clfft-2.4.ebuild
\ No newline at end of file

diff --git a/sci-libs/clfft/clfft-2.4.ebuild b/sci-libs/clfft/clfft-2.4-r1.ebuild
similarity index 95%
rename from sci-libs/clfft/clfft-2.4.ebuild
rename to sci-libs/clfft/clfft-2.4-r1.ebuild
index 52c3156..6b98938 100644
--- a/sci-libs/clfft/clfft-2.4.ebuild
+++ b/sci-libs/clfft/clfft-2.4-r1.ebuild
@@ -35,6 +35,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/clfft-client_CMakeLists.patch
 	"${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch
+	"${FILESDIR}"/clfft-2.4-fix-cmake-config-install.patch
 )
 
 pkg_pretend() {

diff --git a/sci-libs/clfft/clfft-9999.ebuild b/sci-libs/clfft/clfft-9999.ebuild
index b87b3fb..96b7dcd 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}"/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.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.4-fix-cmake-config-install.patch b/sci-libs/clfft/files/clfft-2.4-fix-cmake-config-install.patch
new file mode 100644
index 0000000..6dd1e15
--- /dev/null
+++ b/sci-libs/clfft/files/clfft-2.4-fix-cmake-config-install.patch
@@ -0,0 +1,128 @@
+Upstream patch, with modified destdir
+https://github.com/clMathLibraries/clFFT/pull/88
+
+
+Description: install missing cmake config module
+Author: <kent.knox@amd>
+Origin: upstream
+Forwarded: not-needed
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -283,6 +283,29 @@ else( )
+ 	message( "GoogleTest unit tests will NOT be built" )
+ endif( )
+ 
++if( BUILD_EXAMPLES )
++    add_subdirectory( examples )
++endif()
++
++if(WIN32)
++  set(destdir CMake)
++else()
++  set(destdir lib${SUFFIX_LIB}/cmake/clFFT)
++endif()
++string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
++configure_file(
++  ${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfigVersion.cmake.in
++  ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
++  @ONLY)
++configure_file(
++  ${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfig.cmake.in
++  ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfig.cmake
++  @ONLY)
++install(EXPORT Library DESTINATION ${destdir} FILE clFFTTargets.cmake)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
++  ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfig.cmake
++  DESTINATION ${destdir})
++
+ # The following code is setting variables to control the behavior of CPack to generate our
+ if( WIN32 )
+ 	set( CPACK_SOURCE_GENERATOR "ZIP" )
+diff --git a/src/clFFTConfig.cmake.in b/src/clFFTConfig.cmake.in
+new file mode 100644
+index 0000000..5b58c35
+--- /dev/null
++++ b/src/clFFTConfig.cmake.in
+@@ -0,0 +1,3 @@
++include(${CMAKE_CURRENT_LIST_DIR}/clFFTTargets.cmake)
++get_filename_component(CLFFT_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/@reldir@/include ABSOLUTE)
++set(CLFFT_LIBRARIES clFFT)
+diff --git a/src/clFFTConfigVersion.cmake.in b/src/clFFTConfigVersion.cmake.in
+new file mode 100644
+index 0000000..e358473
+--- /dev/null
++++ b/src/clFFTConfigVersion.cmake.in
+@@ -0,0 +1,46 @@
++# This is a basic version file for the Config-mode of find_package().
++# It is used by write_basic_package_version_file() as input file for configure_file()
++# to create a version-file which can be installed along a config.cmake file.
++#
++# The created file sets PACKAGE_VERSION_EXACT if the current version string and
++# the requested version string are exactly the same and it sets
++# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
++# but only if the requested major version is the same as the current one.
++# The variable CLFFT_VERSION must be set before calling configure_file().
++
++
++set(PACKAGE_VERSION "@CLFFT_VERSION@")
++
++if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
++  set(PACKAGE_VERSION_COMPATIBLE FALSE)
++else()
++
++  if("@CLFFT_VERSION@" MATCHES "^([0-9]+)\\.")
++    set(CLFFT_VERSION_MAJOR "${CMAKE_MATCH_1}")
++  else()
++    set(CLFFT_VERSION_MAJOR "@CLFFT_VERSION@")
++  endif()
++
++  if("${PACKAGE_FIND_VERSION_MAJOR}" STREQUAL "${CLFFT_VERSION_MAJOR}")
++    set(PACKAGE_VERSION_COMPATIBLE TRUE)
++  else()
++    set(PACKAGE_VERSION_COMPATIBLE FALSE)
++  endif()
++
++  if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
++      set(PACKAGE_VERSION_EXACT TRUE)
++  endif()
++endif()
++
++
++# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
++if("${CMAKE_SIZEOF_VOID_P}"  STREQUAL ""  OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
++   return()
++endif()
++
++# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
++if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@")
++  math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
++  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
++  set(PACKAGE_VERSION_UNSUITABLE TRUE)
++endif()
+diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
+index 63ac0f9..0d400d8 100644
+--- a/src/library/CMakeLists.txt
++++ b/src/library/CMakeLists.txt
+@@ -95,6 +95,7 @@ endif( )
+ 
+ # CPack configuration; include the executable into the package
+ install( TARGETS clFFT
++        EXPORT Library
+         RUNTIME DESTINATION bin${SUFFIX_BIN}
+         LIBRARY DESTINATION lib${SUFFIX_LIB}
+         ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+diff --git a/src/statTimer/CMakeLists.txt b/src/statTimer/CMakeLists.txt
+index a635bf1..3dc026f 100644
+--- a/src/statTimer/CMakeLists.txt
++++ b/src/statTimer/CMakeLists.txt
+@@ -80,6 +80,7 @@ endif( )
+ 
+ # CPack configuration; include the executable into the package
+ install( TARGETS StatTimer
++        EXPORT Library
+         RUNTIME DESTINATION bin${SUFFIX_BIN}
+         LIBRARY DESTINATION lib${SUFFIX_LIB}
+         ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+-- 
+2.1.4
+

diff --git a/sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch b/sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch
new file mode 100644
index 0000000..dc317d4
--- /dev/null
+++ b/sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch
@@ -0,0 +1,25 @@
+From 6a3ba77529987d5906ba6f734bc2fa66a9155a1c Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marbre@linux.sungazer.de>
+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
+


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/, sci-libs/clfft/files/
@ 2015-09-07  6:49 Justin Lecher
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2015-09-07  6:49 UTC (permalink / raw
  To: gentoo-commits

commit:     5461c03cab7a539008f41ce293e0fa28362dc675
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Sep  6 10:16:05 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 10:16:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5461c03c

sci-libs/clfft: Revise patches

Package-Manager: portage-2.2.20.1

 sci-libs/clfft/ChangeLog                           |  9 ++++++++
 sci-libs/clfft/clfft-0.9999.ebuild                 |  2 --
 sci-libs/clfft/clfft-2.4-r1.ebuild                 |  6 +++---
 sci-libs/clfft/clfft-9999.ebuild                   |  4 ----
 ...sts.patch => clfft-2.4-client_CMakeLists.patch} |  0
 ...tch => clfft-2.4-scripts_perf_CMakeLists.patch} |  0
 ...ll-cmake-configuration-to-lib-cmake-clFFT.patch | 25 ----------------------
 7 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog
index 7e7eebb..254e3b9 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$
 
+  06 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +files/clfft-2.4-client_CMakeLists.patch,
+  +files/clfft-2.4-scripts_perf_CMakeLists.patch,
+  -files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch,
+  -files/clfft-client_CMakeLists.patch,
+  -files/clfft-scripts_perf_CMakeLists.patch, clfft-0.9999.ebuild,
+  clfft-2.4-r1.ebuild, clfft-9999.ebuild:
+  sci-libs/clfft: Revise patches
+
 *clfft-2.4-r1 (05 Jun 2015)
 
   05 Jun 2015; Marius Brehler <marbre@linux.sungazer.de> +clfft-2.4-r1.ebuild,

diff --git a/sci-libs/clfft/clfft-0.9999.ebuild b/sci-libs/clfft/clfft-0.9999.ebuild
index b63bc84..fa91bc5 100644
--- a/sci-libs/clfft/clfft-0.9999.ebuild
+++ b/sci-libs/clfft/clfft-0.9999.ebuild
@@ -32,8 +32,6 @@ DEPEND="${RDEPEND}"
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/clfft-client_CMakeLists.patch
-	"${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch
 	"${FILESDIR}"/clfft-2.4-fix-cmake-config-install.patch
 )
 

diff --git a/sci-libs/clfft/clfft-2.4-r1.ebuild b/sci-libs/clfft/clfft-2.4-r1.ebuild
index 7eab543..00f177e 100644
--- a/sci-libs/clfft/clfft-2.4-r1.ebuild
+++ b/sci-libs/clfft/clfft-2.4-r1.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}"
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/clfft-client_CMakeLists.patch
-	"${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch
-	"${FILESDIR}"/clfft-2.4-fix-cmake-config-install.patch
+	"${FILESDIR}/${P}"-client_CMakeLists.patch
+	"${FILESDIR}/${P}"-scripts_perf_CMakeLists.patch
+	"${FILESDIR}/${P}"-fix-cmake-config-install.patch
 )
 
 pkg_pretend() {

diff --git a/sci-libs/clfft/clfft-9999.ebuild b/sci-libs/clfft/clfft-9999.ebuild
index 91f3d26..da8499e 100644
--- a/sci-libs/clfft/clfft-9999.ebuild
+++ b/sci-libs/clfft/clfft-9999.ebuild
@@ -32,10 +32,6 @@ DEPEND="${RDEPEND}"
 # Therefore src_test() won't execute any test.
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}"/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.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-client_CMakeLists.patch b/sci-libs/clfft/files/clfft-2.4-client_CMakeLists.patch
similarity index 100%
rename from sci-libs/clfft/files/clfft-client_CMakeLists.patch
rename to sci-libs/clfft/files/clfft-2.4-client_CMakeLists.patch

diff --git a/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch b/sci-libs/clfft/files/clfft-2.4-scripts_perf_CMakeLists.patch
similarity index 100%
rename from sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch
rename to sci-libs/clfft/files/clfft-2.4-scripts_perf_CMakeLists.patch

diff --git a/sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch b/sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch
deleted file mode 100644
index dc317d4..0000000
--- a/sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a3ba77529987d5906ba6f734bc2fa66a9155a1c Mon Sep 17 00:00:00 2001
-From: Marius Brehler <marbre@linux.sungazer.de>
-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
-


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/, sci-libs/clfft/files/
@ 2015-09-07  6:49 Justin Lecher
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2015-09-07  6:49 UTC (permalink / raw
  To: gentoo-commits

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 <marbre@linux.sungazer.de> +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 <marbre@linux.sungazer.de>
   +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 <marbre@linux.sungazer.de>
+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 <marbre@linux.sungazer.de>
+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
+


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/, sci-libs/clfft/files/
@ 2016-04-25  8:48 Marius Brehler
  0 siblings, 0 replies; 4+ messages in thread
From: Marius Brehler @ 2016-04-25  8:48 UTC (permalink / raw
  To: gentoo-commits

commit:     5a8af573fdea28725ce64c507e89000206fc3dd0
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon Apr 25 08:47:19 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Mon Apr 25 08:47:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5a8af573

sci-libs/clfft: Drop old

Package-Manager: portage-2.2.26

 sci-libs/clfft/clfft-2.6.1.ebuild                  | 56 -------------------
 sci-libs/clfft/clfft-2.8-r1.ebuild                 | 62 ----------------------
 sci-libs/clfft/clfft-2.8.ebuild                    | 61 ---------------------
 ...ll-cmake-configuration-to-lib-cmake-clFFT.patch | 25 ---------
 ...-Install-examples-to-share-clFFT-examples.patch | 15 ------
 5 files changed, 219 deletions(-)

diff --git a/sci-libs/clfft/clfft-2.6.1.ebuild b/sci-libs/clfft/clfft-2.6.1.ebuild
deleted file mode 100644
index bbb7f4e..0000000
--- a/sci-libs/clfft/clfft-2.6.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_PN="clFFT"
-
-DESCRIPTION="Library containing FFT functions written in OpenCL"
-HOMEPAGE="https://github.com/clMathLibraries/clFFT"
-SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+client examples test"
-
-RDEPEND="
-	>=sys-devel/gcc-4.6:*
-	virtual/opencl
-	dev-libs/boost"
-DEPEND="${RDEPEND}"
-#	test? (
-#		dev-cpp/gtest
-#		sci-libs/fftw:3.0
-#	)"
-
-# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
-# Therefore src_test() won't execute any test.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}/src"
-
-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
-			die "Compilation with gcc older than 4.6 is not supported."
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build client CLIENT)
-		$(cmake-utils_use_build examples EXAMPLES)
-		$(cmake-utils_use_build test TEST)
-	)
-	cmake-utils_src_configure
-}

diff --git a/sci-libs/clfft/clfft-2.8-r1.ebuild b/sci-libs/clfft/clfft-2.8-r1.ebuild
deleted file mode 100644
index 792567f..0000000
--- a/sci-libs/clfft/clfft-2.8-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_PN="clFFT"
-
-DESCRIPTION="Library containing FFT functions written in OpenCL"
-HOMEPAGE="https://github.com/clMathLibraries/clFFT"
-SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="callback_client +client examples test"
-
-RDEPEND="
-	>=sys-devel/gcc-4.6:*
-	virtual/opencl
-	dev-libs/boost"
-DEPEND="${RDEPEND}"
-#	test? (
-#		dev-cpp/gtest
-#		sci-libs/fftw:3.0
-#	)"
-
-# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
-# Therefore src_test() won't execute any test.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}/src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
-			die "Compilation with gcc older than 4.6 is not supported."
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build callback_client CALLBACK_CLIENT)
-		$(cmake-utils_use_build client CLIENT)
-		$(cmake-utils_use_build examples EXAMPLES)
-		$(cmake-utils_use_build test TEST)
-		-DBoost_USE_STATIC_LIBS=OFF
-	)
-	cmake-utils_src_configure
-}
-
-# Upstream fixed already adjusted their CMakeLists.txt. Thus, the (callback) client
-# is installed by cmake again with the next release.
-src_install() {
-	cmake-utils_src_install
-
-	use callback_client && dobin "${BUILD_DIR}/staging/clFFT-callback-client-2.8.0"
-	use client && dobin "${BUILD_DIR}/staging/clFFT-client-2.8.0"
-}

diff --git a/sci-libs/clfft/clfft-2.8.ebuild b/sci-libs/clfft/clfft-2.8.ebuild
deleted file mode 100644
index 6d2580e..0000000
--- a/sci-libs/clfft/clfft-2.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_PN="clFFT"
-
-DESCRIPTION="Library containing FFT functions written in OpenCL"
-HOMEPAGE="https://github.com/clMathLibraries/clFFT"
-SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="callback_client +client examples test"
-
-RDEPEND="
-	>=sys-devel/gcc-4.6:*
-	virtual/opencl
-	dev-libs/boost"
-DEPEND="${RDEPEND}"
-#	test? (
-#		dev-cpp/gtest
-#		sci-libs/fftw:3.0
-#	)"
-
-# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
-# Therefore src_test() won't execute any test.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}/src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
-			die "Compilation with gcc older than 4.6 is not supported."
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build callback_client CALLBACK_CLIENT)
-		$(cmake-utils_use_build client CLIENT)
-		$(cmake-utils_use_build examples EXAMPLES)
-		$(cmake-utils_use_build test TEST)
-	)
-	cmake-utils_src_configure
-}
-
-# Upstream fixed already adjusted their CMakeLists.txt. Thus, the (callback) client
-# is installed by cmake again with the next release.
-src_install() {
-	cmake-utils_src_install
-
-	use callback_client && dobin "${BUILD_DIR}/staging/clFFT-callback-client-2.8.0"
-	use client && dobin "${BUILD_DIR}/staging/clFFT-client-2.8.0"
-}

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
deleted file mode 100644
index dc317d4..0000000
--- a/sci-libs/clfft/files/clfft-2.6.1-Install-cmake-configuration-to-lib-cmake-clFFT.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a3ba77529987d5906ba6f734bc2fa66a9155a1c Mon Sep 17 00:00:00 2001
-From: Marius Brehler <marbre@linux.sungazer.de>
-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
deleted file mode 100644
index dff3039..0000000
--- a/sci-libs/clfft/files/clfft-2.6.1-Install-examples-to-share-clFFT-examples.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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()


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-04-25  8:48 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-07  6:49 [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/, sci-libs/clfft/files/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2016-04-25  8:48 Marius Brehler
2015-09-07  6:49 Justin Lecher
2015-06-06  9:46 Justin Lecher

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