[gentoo-commits] proj/sci:master commit in: sci-libs/ciftilib/, sci-libs/ciftilib/files/
commit: b8407e77728489cb3da158b77f0afb01291371f2 Author: Horea Christian chymera eu> AuthorDate: Tue Jun 22 23:44:08 2021 + Commit: Horea Christian gmail com> CommitDate: Tue Jun 22 23:44:08 2021 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b8407e77 sci-libs/ciftilib: fixed boost version checking Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Horea Christian chymera.eu> sci-libs/ciftilib/ciftilib-1.6.0.ebuild| 6 + .../ciftilib/files/ciftilib-1.6.0-version.patch| 27 ++ 2 files changed, 33 insertions(+) diff --git a/sci-libs/ciftilib/ciftilib-1.6.0.ebuild b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild index 062fa44ef..fffd4f9c1 100644 --- a/sci-libs/ciftilib/ciftilib-1.6.0.ebuild +++ b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild @@ -24,6 +24,12 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/CiftiLib-${PV}" +# fix submitted upstream +# https://github.com/Washington-University/CiftiLib/pull/23 +PATCHES=( + "${FILESDIR}/${P}-version.patch" +) + #TODO: Enable doc building and installation src_prepare(){ diff --git a/sci-libs/ciftilib/files/ciftilib-1.6.0-version.patch b/sci-libs/ciftilib/files/ciftilib-1.6.0-version.patch new file mode 100644 index 0..e64a55f2f --- /dev/null +++ b/sci-libs/ciftilib/files/ciftilib-1.6.0-version.patch @@ -0,0 +1,27 @@ +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -83,18 +83,18 @@ ENDIF (NOT QT_FOUND) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) + SET(LIBS ${LIBS} ${Boost_LIBRARIES}) + #boost quirks +-IF (Boost_VERSION LESS 104400) ++IF (Boost_VERSION VERSION_LESS 1.44.00) + #absolute() was added in 1.44.0, with filesystem v3 + ADD_DEFINITIONS(-DCIFTILIB_BOOST_NO_FSV3) +-ENDIF (Boost_VERSION LESS 104400) +-IF (Boost_VERSION LESS 104800) ++ENDIF (Boost_VERSION VERSION_LESS 1.44.00) ++IF (Boost_VERSION VERSION_LESS 1.48.00) + #canonical() was added in 1.48.0 + ADD_DEFINITIONS(-DCIFTILIB_BOOST_NO_CANONICAL) +-ENDIF (Boost_VERSION LESS 104800) +-IF (Boost_VERSION LESS 105600) ++ENDIF (Boost_VERSION VERSION_LESS 1.48.00) ++IF (Boost_VERSION VERSION_LESS 1.56.00) + #try_lexical_cast was added in 1.56.0 + ADD_DEFINITIONS(-DCIFTILIB_BOOST_NO_TRY_LEXICAL) +-ENDIF (Boost_VERSION LESS 105600) ++ENDIF (Boost_VERSION VERSION_LESS 1.56.00) + + #zlib, useful for volume reading + FIND_PACKAGE(ZLIB)
[gentoo-commits] proj/sci:master commit in: sci-libs/ciftilib/, sci-libs/ciftilib/files/
commit: fd57fb2706919f70446dc9e90e93ba9ba96179b3 Author: Andrew Ammerlaan riseup net> AuthorDate: Sat Jan 30 09:31:03 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Sat Jan 30 09:31:03 2021 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=fd57fb27 sci-libs/ciftilib: version bump, EAPI bump, cmake-utils-->cmake Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> .../{ciftilib-1.5.3-r1.ebuild => ciftilib-1.6.0.ebuild} | 16 ++-- .../ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch | 12 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild similarity index 84% rename from sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild rename to sci-libs/ciftilib/ciftilib-1.6.0.ebuild index ad4894dd1..062fa44ef 100644 --- a/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild +++ b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="C++ Library for reading and writing CIFTI-2 and CIFTI-1 files" HOMEPAGE="https://github.com/Washington-University/CiftiLib; @@ -22,10 +22,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.5.3-openmp_in_pc.patch - ) - S="${WORKDIR}/CiftiLib-${PV}" #TODO: Enable doc building and installation @@ -42,14 +38,14 @@ src_prepare(){ -e "s:DT_:CIFTI_DT_:g" \ -i `grep -rl DT_ *` - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { local mycmakeargs=(-DBUILD_SHARED_LIBS=ON) use qt5 || mycmakeargs+=(-DIGNORE_QT=TRUE) - cmake-utils_src_configure + cmake_src_configure } src_test(){ @@ -57,5 +53,5 @@ src_test(){ local myctestargs=( -j1 ) - cmake-utils_src_test + cmake_src_test } diff --git a/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch b/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch deleted file mode 100644 index 6fd35159a..0 --- a/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CiftiLib.pc.in b/CiftiLib.pc.in -index 13cd78c..8db6c46 100644 a/CiftiLib.pc.in -+++ b/CiftiLib.pc.in -@@ -5,6 +5,6 @@ Name: CiftiLib - Description: C++ Library for reading and writing CIFTI-2 and CIFTI-1 files - Version: @CIFTILIB_VERSION@ - URL: https://github.com/Washington-University/CiftiLib --Cflags: -I${includedir}/CiftiLib @CIFTILIB_PKGCONFIG_DEFINE@ -+Cflags: -I${includedir}/CiftiLib @CIFTILIB_PKGCONFIG_DEFINE@ @OpenMP_CXX_FLAGS@ - Libs: -L${libdir} -lCifti - @CIFTILIB_PKGCONFIG_REQUIRES_LINE@
[gentoo-commits] proj/sci:master commit in: sci-libs/ciftilib/, sci-libs/ciftilib/files/
commit: 6a917c1243b83065c81e4d82c78a6022891df3ef Author: François Bissey gmail com> AuthorDate: Fri Oct 19 21:31:02 2018 + Commit: Horea Christian gmail com> CommitDate: Sat Oct 20 21:29:18 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6a917c12 sci-libs/ciftilib: compatibility with nifti_io Package-Manager: Portage-2.3.49, Repoman-2.3.11 Signed-off-by: Horea Christian yandex.com> sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild | 61 ++ sci-libs/ciftilib/ciftilib-1.5.3.ebuild| 38 -- .../files/ciftilib-1.5.3-openmp_in_pc.patch| 12 + 3 files changed, 73 insertions(+), 38 deletions(-) diff --git a/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild b/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild new file mode 100644 index 0..ad4894dd1 --- /dev/null +++ b/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils + +DESCRIPTION="C++ Library for reading and writing CIFTI-2 and CIFTI-1 files" +HOMEPAGE="https://github.com/Washington-University/CiftiLib; +SRC_URI="https://github.com/Washington-University/CiftiLib/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="qt5" + +DEPEND=" + dev-libs/boost + qt5? ( dev-qt/qtcore:5 ) + !qt5? ( dev-cpp/libxmlpp:2.6 ) + sys-libs/zlib + " +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.3-openmp_in_pc.patch + ) + +S="${WORKDIR}/CiftiLib-${PV}" + +#TODO: Enable doc building and installation + +src_prepare(){ + # Make sure that CiftiLib headers and code can + # coexist with nifti_io headers. + # This takes care of the guard in the nifti1.h header + # found in both code base. + sed \ + -e "s:NIFTI_:CIFTI_NIFTI__:g" \ + -i `grep -rl NIFTI_ *` + sed \ + -e "s:DT_:CIFTI_DT_:g" \ + -i `grep -rl DT_ *` + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=(-DBUILD_SHARED_LIBS=ON) + use qt5 || mycmakeargs+=(-DIGNORE_QT=TRUE) + + cmake-utils_src_configure +} + +src_test(){ + #The testsuite is not designed to run in parallel + local myctestargs=( + -j1 + ) + cmake-utils_src_test +} diff --git a/sci-libs/ciftilib/ciftilib-1.5.3.ebuild b/sci-libs/ciftilib/ciftilib-1.5.3.ebuild deleted file mode 100644 index fc473f38c..0 --- a/sci-libs/ciftilib/ciftilib-1.5.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -DESCRIPTION="C++ Library for reading and writing CIFTI-2 and CIFTI-1 files" -HOMEPAGE="https://github.com/Washington-University/CiftiLib; -SRC_URI="https://github.com/Washington-University/CiftiLib/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-cpp/libxmlpp:2.6 - dev-libs/boost - sys-libs/zlib - " -RDEPEND="${DEPEND}" - -S="${WORKDIR}/CiftiLib-${PV}" - -src_configure() { - local mycmakeargs=( - -DIGNORE_QT=TRUE - ) - cmake-utils_src_configure -} - -src_test(){ - local myctestargs=( - -j1 - ) - cmake-utils_src_test -} diff --git a/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch b/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch new file mode 100644 index 0..6fd35159a --- /dev/null +++ b/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch @@ -0,0 +1,12 @@ +diff --git a/CiftiLib.pc.in b/CiftiLib.pc.in +index 13cd78c..8db6c46 100644 +--- a/CiftiLib.pc.in b/CiftiLib.pc.in +@@ -5,6 +5,6 @@ Name: CiftiLib + Description: C++ Library for reading and writing CIFTI-2 and CIFTI-1 files + Version: @CIFTILIB_VERSION@ + URL: https://github.com/Washington-University/CiftiLib +-Cflags: -I${includedir}/CiftiLib @CIFTILIB_PKGCONFIG_DEFINE@ ++Cflags: -I${includedir}/CiftiLib @CIFTILIB_PKGCONFIG_DEFINE@ @OpenMP_CXX_FLAGS@ + Libs: -L${libdir} -lCifti + @CIFTILIB_PKGCONFIG_REQUIRES_LINE@