commit: 088d793bd7acfaefde2894b5654763daeb31b34c
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 22:23:09 2022 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 22:23:09 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=088d793b
sci-chemistry/relion: add 4.0.0, drop 3.1.1
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
.../relion/files/relion-4.0.0-build.patch | 39 ++++++++++++++++++++++
.../{relion-3.1.1.ebuild => relion-4.0.0.ebuild} | 9 +++--
2 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/sci-chemistry/relion/files/relion-4.0.0-build.patch
b/sci-chemistry/relion/files/relion-4.0.0-build.patch
new file mode 100644
index 000000000..d7cb7bf2e
--- /dev/null
+++ b/sci-chemistry/relion/files/relion-4.0.0-build.patch
@@ -0,0 +1,39 @@
+From 138b9c71b41a3c8782c991053a28bfe074bffdd9 Mon Sep 17 00:00:00 2001
+From: Takanori Nakane <nakan...@gmail.com>
+Date: Fri, 28 Oct 2022 19:51:29 +0900
+Subject: [PATCH] Repaired the build failure reported in #826 (by
+ @prehensilecode and @acaprez)
+
+---
+ src/apps/CMakeLists.txt | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
+index 9870b735..30985aa7 100644
+--- a/src/apps/CMakeLists.txt
++++ b/src/apps/CMakeLists.txt
+@@ -273,16 +273,16 @@ if (CUDA_FOUND)
+
+
+
+- file(GLOB REL_JAZ_CUDA_SRC "${CMAKE_SOURCE_DIR}/src/jaz/cuda/*.cu"
"${CMAKE_SOURCE_DIR}/src/jaz/cuda/kernels/*.cu" )
++ file(GLOB REL_JAZ_CUDA_SRC "${CMAKE_SOURCE_DIR}/src/jaz/cuda/*.cu")
+ cuda_add_library(relion_jaz_gpu_util ${REL_JAZ_CUDA_SRC})
+
+- #list(APPEND EXTRA_LIBS "${CUDA_CUFFT_LIBRARIES}")
+- #if(BUILD_SHARED_LIBS)
+- # install (TARGETS relion_jaz_gpu_util LIBRARY DESTINATION lib)
+- #else()
+- # target_link_libraries(relion_jaz_gpu_util relion_lib)
+- # target_link_libraries(relion_jaz_gpu_util
${CUDA_CUFFT_LIBRARIES})
+- #endif()
++ list(APPEND EXTRA_LIBS "${CUDA_CUFFT_LIBRARIES}")
++ if(BUILD_SHARED_LIBS)
++ install (TARGETS relion_jaz_gpu_util LIBRARY DESTINATION lib)
++ else()
++ target_link_libraries(relion_jaz_gpu_util relion_lib)
++ target_link_libraries(relion_jaz_gpu_util
${CUDA_CUFFT_LIBRARIES})
++ endif()
+
+ target_link_libraries(relion_lib relion_jaz_gpu_util
${CUDA_CUFFT_LIBRARIES})
+ target_link_libraries(relion_lib relion_jaz_gpu_util
${CUDA_CUFFT_LIBRARIES} ${CUDA_curand_LIBRARY})
diff --git a/sci-chemistry/relion/relion-3.1.1.ebuild
b/sci-chemistry/relion/relion-4.0.0.ebuild
similarity index 84%
rename from sci-chemistry/relion/relion-3.1.1.ebuild
rename to sci-chemistry/relion/relion-4.0.0.ebuild
index 39e4ab229..a40375f64 100644
--- a/sci-chemistry/relion/relion-3.1.1.ebuild
+++ b/sci-chemistry/relion/relion-4.0.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -12,10 +12,11 @@
SRC_URI="https://github.com/3dem/relion/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="+gui"
+IUSE="+gui cuda"
DEPEND="
gui? ( x11-libs/fltk )
+ cuda? ( dev-util/nvidia-cuda-toolkit )
dev-cpp/tbb
sci-libs/fftw:3.0
media-libs/tiff
@@ -27,6 +28,8 @@ RDEPEND="
"
BDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-4.0.0-build.patch" )
+
src_configure() {
CMAKE_BUILD_TYPE=Release
mycmakeargs=(
@@ -35,7 +38,7 @@ src_configure() {
-DFORCE_OWN_FFTW=OFF
-DFORCE_OWN_FLTK=OFF
-DFORCE_OWN_TBB=OFF
- -DCUDA=OFF
+ -DCUDA=$(usex cuda)
-DGUI=$(usex gui)
)
cmake_src_configure
