From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-790036-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id E178F138A6C
for <garchives@archives.gentoo.org>; Tue, 7 Apr 2015 08:56:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 73848E0931;
Tue, 7 Apr 2015 08:56:40 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 62093E0931
for <gentoo-commits@lists.gentoo.org>; Tue, 7 Apr 2015 08:56:39 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7788634096C
for <gentoo-commits@lists.gentoo.org>; Tue, 7 Apr 2015 08:56:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A0F1615659
for <gentoo-commits@lists.gentoo.org>; Tue, 7 Apr 2015 08:56:32 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1428140759.bb7405e79da76e86057725f5520201b46519e506.jlec@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/files/, sci-libs/clfft/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-libs/clfft/ChangeLog sci-libs/clfft/files/clfft-client_CMakeLists.patch sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch
X-VCS-Directories: sci-libs/clfft/ sci-libs/clfft/files/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: bb7405e79da76e86057725f5520201b46519e506
X-VCS-Branch: master
Date: Tue, 7 Apr 2015 08:56:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: cb121c1b-ffdc-42c8-a6a0-207bfe98b758
X-Archives-Hash: fe5c2369497fd95566f5df2e4379ed9b
commit: bb7405e79da76e86057725f5520201b46519e506
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Apr 4 09:45:32 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Apr 4 09:45:59 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bb7405e7
sci-libs/clfft: Replace patches by upstream patches
Package-Manager: portage-2.2.14
sci-libs/clfft/ChangeLog | 5 ++++
sci-libs/clfft/files/clfft-client_CMakeLists.patch | 33 +++++++++++++++------
.../files/clfft-scripts_perf_CMakeLists.patch | 34 +++++++++++++++++-----
3 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog
index 04a975b..e97dacd 100644
--- a/sci-libs/clfft/ChangeLog
+++ b/sci-libs/clfft/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Apr 2015; Marius Brehler <marbre@linux.sungazer.de>
+ files/clfft-client_CMakeLists.patch,
+ files/clfft-scripts_perf_CMakeLists.patch:
+ Replace patches by upstream patches
+
19 Feb 2015; Marius Brehler <marbre@linux.sungazer.de> clfft-9999.ebuild:
Fix SLOT operators
diff --git a/sci-libs/clfft/files/clfft-client_CMakeLists.patch b/sci-libs/clfft/files/clfft-client_CMakeLists.patch
index d779b45..b6cc530 100644
--- a/sci-libs/clfft/files/clfft-client_CMakeLists.patch
+++ b/sci-libs/clfft/files/clfft-client_CMakeLists.patch
@@ -1,26 +1,41 @@
-Change the client binary's name to clfft-client.
+Upstream patch to change the client binary's name to clFFT-client.
+Remove for clfft-9999 as soon as develop branch is merged into master.
-Patch by Marius Brehler.
---- client/CMakeLists.txt
-+++ client/CMakeLists.txt
+
+From f3cbd72953094217dfeb41c4e2a328d4b4a494e0 Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marius.brehler@tu-dortmund.de>
+Date: Wed, 18 Feb 2015 09:15:13 +0100
+Subject: [PATCH] Rename Client to clFFT-client
+
+---
+ src/client/CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
+index fdf209f..3b38b95 100644
+--- a/src/client/CMakeLists.txt
++++ b/src/client/CMakeLists.txt
@@ -43,15 +43,15 @@ endif( )
# Include standard OpenCL headers
include_directories( ${Boost_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS} ../../../common ${PROJECT_BINARY_DIR}/include ../include )
-add_executable( Client ${Client.Files} )
-+add_executable( clfft-client ${Client.Files} )
++add_executable( clFFT-client ${Client.Files} )
-target_link_libraries( Client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
-+target_link_libraries( clfft-client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
++target_link_libraries( clFFT-client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
-set_target_properties( Client PROPERTIES VERSION ${CLFFT_VERSION} )
-set_target_properties( Client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
-+set_target_properties( clfft-client PROPERTIES VERSION ${CLFFT_VERSION} )
-+set_target_properties( clfft-client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
++set_target_properties( clFFT-client PROPERTIES VERSION ${CLFFT_VERSION} )
++set_target_properties( clFFT-client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
# CPack configuration; include the executable into the package
-install( TARGETS Client
-+install( TARGETS clfft-client
++install( TARGETS clFFT-client
RUNTIME DESTINATION bin${SUFFIX_BIN}
LIBRARY DESTINATION lib${SUFFIX_LIB}
ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+--
+2.0.4
+
diff --git a/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch b/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch
index 2976a5e..eec9169 100644
--- a/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch
+++ b/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch
@@ -1,13 +1,33 @@
-Install Python scripts to /usr/share/clfft and not to /usr/bin.
+Upstream patch to install Python scripts to /usr/share/clfft and not to /usr/bin.
+Remove for clfft-9999 as soon as develop branch is merged into master.
-Patch by Marius Brehler.
---- scripts/perf/CMakeLists.txt
-+++ scripts/perf/CMakeLists.txt
-@@ -21,4 +21,4 @@ set(GRAPHING_SCRIPTS measurePerformance
+From 37b1f443e516f0a87c4a728cac8291148bb31b72 Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marius.brehler@tu-dortmund.de>
+Date: Wed, 18 Feb 2015 08:59:06 +0100
+Subject: [PATCH] Install scripts/perf to share/clFFT on non WIN32
+ systems
+
+---
+ src/scripts/perf/CMakeLists.txt | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/scripts/perf/CMakeLists.txt b/src/scripts/perf/CMakeLists.txt
+index 3733789..ca45b92 100644
+--- a/src/scripts/perf/CMakeLists.txt
++++ b/src/scripts/perf/CMakeLists.txt
+@@ -20,5 +20,8 @@ set(GRAPHING_SCRIPTS measurePerformance.py
+ errorHandler.py
performanceUtility.py
)
-
+-
-install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} )
\ No newline at end of file
-+install( FILES ${GRAPHING_SCRIPTS} DESTINATION share/clfft/${SUFFIX_BIN} )
++if( WIN32 )
++ install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} )
++else ( )
++ install( FILES ${GRAPHING_SCRIPTS} DESTINATION share/clFFT )
++endif( )
\ No newline at end of file
+--
+2.0.4
+