* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 495be0f93114a8303984989ca9ff2e276fb83565
Author: Gert Wollny <gert <AT> die <DOT> upm <DOT> es>
AuthorDate: Mon Jun 10 14:08:11 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Mon Jun 10 14:08:11 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=495be0f9
fix most repoman issues
---
sci-libs/itk/itk-4.4.0.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index 4e4ed55..86ef79f 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010 Gentoo Foundation
+# Copyright 2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -15,7 +15,7 @@ RESTRICT="primaryuri"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="debug examples fftw +shared test python hdf5 itkv3compat review"
+IUSE="debug examples fftw +shared test python hdf5 itkv3compat review patented"
RDEPEND="sys-libs/zlib
fftw? ( sci-libs/fftw )
@@ -61,13 +61,13 @@ src_configure() {
$(cmake-utils_use shared BUILD_SHARED_LIBS)
$(cmake-utils_use test BUILD_TESTING)
$(cmake-utils_use review ITK_USE_REVIEW)
+ $(cmake-utils_use patented ITK_USE_PATENTED)
)
if use itkv3compat; then
mycmakeargs+=( -DITKV3_COMPATIBILITY=ON )
fi
-
if use fftw; then
mycmakeargs+=(
-DUSE_FFTWD=ON
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 3779b5c4cbb17b6d8865c8dbf74ec197c487e38c
Author: Gert Wollny <gert <AT> die <DOT> upm <DOT> es>
AuthorDate: Tue Jun 11 12:41:17 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 12:41:17 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3779b5c4
correct most of the issues given in the pull request
---
sci-libs/itk/itk-4.4.0.ebuild | 43 +++++++++++++++++++++----------------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index 1afef6b..0a58c9b 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -3,23 +3,23 @@
# $Header: $
EAPI="5"
-PYTHON_DEPEND="2:2.6"
-inherit eutils toolchain-funcs cmake-utils
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit eutils toolchain-funcs cmake-utils python‑single‑r1
DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
HOMEPAGE="http://www.itk.org"
SRC_URI="mirror://sourceforge/itk/InsightToolkit-${PV}.tar.gz"
RESTRICT="primaryuri"
-LICENSE="BSD"
+LICENSE="APACHE-2.0"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="debug examples fftw +shared test python hdf5 itkv3compat review patented"
+IUSE="debug examples fftw hdf5 itkv3compat patented python review test"
-RDEPEND="sys-libs/zlib
- fftw? ( sci-libs/fftw )
- hdf5? ( sci-libs/hdf5[cxx] )
+RDEPEND="fftw? ( sci-libs/fftw:3 )
+ hdf5? ( sci-libs/hdf5[cxx] )
virtual/jpeg
media-libs/libpng
media-libs/tiff:0
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
MY_PN=InsightToolkit
S="${WORKDIR}/${MY_PN}-${PV}"
-src_prepare() {
- epatch "${FILESDIR}/itk-4.4-v3compat_I2VI_const-fix.patch"
-}
+PATCHES=(
+ "${FILESDIR}/itk-4.4-v3compat_I2VI_const-fix.patch"
+)
src_configure() {
if [ "x$ITK_COMPUTER_MEMORY_SIZE" = "x" ]; then
@@ -56,10 +56,10 @@ src_configure() {
-DITK_BUILD_ALL_MODULES=ON
-DITK_USE_SYSTEM_GCCXML=ON
-DITK_USE_SYSTEM_SWIG=ON
+ -DBUILD_SHARED_LIBS=ON
+ $(cmake-utils_use_build examples)
+ $(cmake-utils_use_build test TESTING)
$(cmake-utils_use hdf5 ITK_USE_SYSTEM_HDF5)
- $(cmake-utils_use examples BUILD_EXAMPLES)
- $(cmake-utils_use shared BUILD_SHARED_LIBS)
- $(cmake-utils_use test BUILD_TESTING)
$(cmake-utils_use review ITK_USE_REVIEW)
$(cmake-utils_use patented ITK_USE_PATENTED)
)
@@ -104,21 +104,20 @@ src_install() {
rm -rf $(find "Examples" -type d -a -name "CMakeFiles") \; || \
die "Failed remove build files"
- dodir /usr/share/${MY_PN}/examples || \
- die "Failed to create examples directory"
+ dodir /usr/share/${MY_PN}/examples
pushd "${S}"
- # remove CVS directories from examples folder
- rm -rf $(find "Examples" -type d -name CVS ) ||\
- die "Failed to remove CVS folders"
+
+
cp -pPR "Examples" "${D}/usr/share/${MY_PN}/examples/src" || \
die "Failed to copy example files"
popd
# copy binary examples
- cp -pPR "bin" "${D}/usr/share/${MY_PN}/examples" || \
- die "Failed to copy binary example files"
+ insinto /usr/share/${MY_PN}/examples
+ doins -r bin
+
rm -rf "${D}"/usr/share/"${MY_PN}"/examples/bin/*.so* || \
die "Failed to remove libraries from examples directory"
@@ -132,9 +131,9 @@ src_install() {
fi
popd
- echo "ITK_DATA_ROOT=/usr/share/${PN}/data" > ${T}/40${PN}
+ echo "ITK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data" > ${T}/40${PN}
- LDPATH="/usr/lib/InsightToolkit"
+ LDPATH="/usr/$(get_libdir)/InsightToolkit"
if use python; then
echo "PYTHONPATH=/usr/lib/InsightToolkit/WrapITK/Python" >> ${T}/40${PN}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 35586a40629fe367c7654bafab78769da93497d7
Author: Gert Wollny <gert <AT> die <DOT> upm <DOT> es>
AuthorDate: Tue Jun 11 11:53:10 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 11:53:10 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=35586a40
bump to latest EAPI
---
sci-libs/itk/itk-4.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index 86ef79f..1afef6b 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="5"
PYTHON_DEPEND="2:2.6"
inherit eutils toolchain-funcs cmake-utils
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: fbaede38c9ce830ad22a2b0ab2ece20998977eaf
Author: Gert Wollny <gert <AT> die <DOT> upm <DOT> es>
AuthorDate: Tue Jun 11 12:40:49 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 12:40:49 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fbaede38
Add line break and herd
---
sci-libs/itk/metadata.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index 28647fd..632be3d 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>no-herd</herd>
+<herd>sci</herd>
<maintainer>
<email>maintainer-needed@gentoo.org</email>
</maintainer>
<longdescription lang="en">
- ITK is a library that provides developers with an extensive suite of tools for image analysis.
+ ITK is a library that provides developers with an extensive suite
+ of tools for image analysis.
</longdescription>
<use>
- <flag name="shared">Build shared libraries</flag>
<flag name="itkv3compat">Use review statistics</flag>
<flag name="patented">Compile patented algorithms</flag>
<flag name="review">Enable compilation of mehods under review</flag>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 29aaf52daa2714934c4855da604aadb563560535
Author: Gert Wollny <gert <AT> die <DOT> upm <DOT> es>
AuthorDate: Tue Jun 11 13:53:08 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 13:53:08 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=29aaf52d
correct dash character and fftw slot
---
sci-libs/itk/itk-4.4.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index 0a58c9b..26f58e4 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-inherit eutils toolchain-funcs cmake-utils python‑single‑r1
+inherit eutils toolchain-funcs cmake-utils python-single-r1
DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
HOMEPAGE="http://www.itk.org"
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE="debug examples fftw hdf5 itkv3compat patented python review test"
-RDEPEND="fftw? ( sci-libs/fftw:3 )
+RDEPEND="fftw? ( sci-libs/fftw:3.0 )
hdf5? ( sci-libs/hdf5[cxx] )
virtual/jpeg
media-libs/libpng
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: daab1885c7f84f4c8329344c92d387e99e31d0e2
Author: Gert Wollny <gw.fossdev <AT> gmail <DOT> com>
AuthorDate: Tue Jun 11 23:20:03 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 23:20:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=daab1885
use cmake-utils also for itkv3compat
---
sci-libs/itk/itk-4.4.0.ebuild | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index ca8d4e2..b626718 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -85,12 +85,9 @@ src_configure() {
$(cmake-utils_use_build test TESTING)
$(cmake-utils_use hdf5 ITK_USE_SYSTEM_HDF5)
$(cmake-utils_use review ITK_USE_REVIEW)
+ $(cmake-utils_use itkv3compat ITKV3_COMPATIBILITY)
)
- if use itkv3compat; then
- mycmakeargs+=( -DITKV3_COMPATIBILITY=ON )
- fi
-
if use fftw; then
mycmakeargs+=(
-DUSE_FFTWD=ON
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 31b9cbae5127b650d2841c35ae36500858af51e0
Author: Gert Wollny <gw.fossdev <AT> gmail <DOT> com>
AuthorDate: Tue Jun 11 22:52:36 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 22:52:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=31b9cbae
Add a pkg_pretent section to force the user to set certain variables in make.conf
Specifically, ITK_COMPUTER_MEMORY_SIZE must always be set and ITK_WRAP_DIMS must be set
when python bindings are enabled.
---
sci-libs/itk/itk-4.4.0.ebuild | 46 ++++++++++++++++++++++++++++++++++++-------
1 file changed, 39 insertions(+), 7 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index 26f58e4..dfa9489 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.itk.org"
SRC_URI="mirror://sourceforge/itk/InsightToolkit-${PV}.tar.gz"
RESTRICT="primaryuri"
-LICENSE="APACHE-2.0"
+LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE="debug examples fftw hdf5 itkv3compat patented python review test"
@@ -37,6 +37,35 @@ PATCHES=(
"${FILESDIR}/itk-4.4-v3compat_I2VI_const-fix.patch"
)
+pkg_pretend() {
+ bailout=no
+ if [ "x$ITK_COMPUTER_MEMORY_SIZE" = "x" ]; then
+ eerror "To tune ITK to make the best use ouf working memory you must set"
+ eerror "ITK_COMPUTER_MEMORY_SIZE in /etc/make.conf to the size of the "
+ eerror "memory installed in your machine. For example for 4GB you do:"
+ eerror ""
+ eerror " echo 'ITK_COMPUTER_MEMORY_SIZE=4' >> /etc/make.conf"
+ eerror ""
+ bailout=yes
+ fi
+
+ if use python ; then
+ if [ "x$ITK_WRAP_DIMS" = "x" ]; then
+ eerror "For Python language bindings it is necessary to "
+ eerror "define the dimensions you want to create bindings for"
+ eerror "by setting in ITK_WRAP_DIMS in /etc/make.conf."
+ eerror "For example, to provide bindings for 2D and 3D data do:"
+ eerror ""
+ eerror " echo 'ITK_WRAP_DIMS=2;3' >> /etc/make.conf"
+ eerror ""
+ bailout=yes
+ fi
+ fi
+ if [ "x$bailout" = "xyes" ]; then
+ die "Please add the missing variables to /etc/make.conf and then restart emerge"
+ fi
+}
+
src_configure() {
if [ "x$ITK_COMPUTER_MEMORY_SIZE" = "x" ]; then
ITK_COMPUTER_MEMORY_SIZE=4
@@ -56,7 +85,8 @@ src_configure() {
-DITK_BUILD_ALL_MODULES=ON
-DITK_USE_SYSTEM_GCCXML=ON
-DITK_USE_SYSTEM_SWIG=ON
- -DBUILD_SHARED_LIBS=ON
+ -DBUILD_SHARED_LIBS=ON
+ -DITK_COMPUTER_MEMORY_SIZE="$ITK_COMPUTER_MEMORY_SIZE"
$(cmake-utils_use_build examples)
$(cmake-utils_use_build test TESTING)
$(cmake-utils_use hdf5 ITK_USE_SYSTEM_HDF5)
@@ -81,7 +111,10 @@ src_configure() {
fi
if use python; then
- mycmakeargs+=( -DITK_WRAP_PYTHON=ON)
+ mycmakeargs+=(
+ -DITK_WRAP_PYTHON=ON
+ -DITK_WRAP_DIMS="$ITK_WRAP_DIMS"
+ )
fi
cmake-utils_src_configure
@@ -104,19 +137,18 @@ src_install() {
rm -rf $(find "Examples" -type d -a -name "CMakeFiles") \; || \
die "Failed remove build files"
- dodir /usr/share/${MY_PN}/examples
+ dodir /usr/share/${MY_PN}/examples
pushd "${S}"
-
cp -pPR "Examples" "${D}/usr/share/${MY_PN}/examples/src" || \
die "Failed to copy example files"
popd
# copy binary examples
- insinto /usr/share/${MY_PN}/examples
- doins -r bin
+ insinto /usr/share/${MY_PN}/examples
+ doins -r bin
rm -rf "${D}"/usr/share/"${MY_PN}"/examples/bin/*.so* || \
die "Failed to remove libraries from examples directory"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: d5f175566f841bb24577767e243304393be65eda
Author: Gert Wollny <gw.fossdev <AT> gmail <DOT> com>
AuthorDate: Tue Jun 11 23:14:21 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 23:14:21 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d5f17556
correct more indentions
---
sci-libs/itk/itk-4.4.0.ebuild | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index 8e522b6..afebbf8 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="fftw? ( sci-libs/fftw:3.0 )
sys-libs/zlib
"
DEPEND="${RDEPEND}
- >=dev-util/cmake-2.8
+ >=dev-util/cmake-2.8
python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0 >=dev-cpp/gccxml-0.9.0_pre20120309 )
"
@@ -141,8 +141,8 @@ src_install() {
popd
# copy binary examples
- insinto /usr/share/${MY_PN}/examples
- doins -r bin
+ insinto /usr/share/${MY_PN}/examples
+ doins -r bin
rm -rf "${D}"/usr/share/"${MY_PN}"/examples/bin/*.so* || \
die "Failed to remove libraries from examples directory"
@@ -162,11 +162,10 @@ src_install() {
LDPATH="/usr/$(get_libdir)/InsightToolkit"
if use python; then
- echo "PYTHONPATH=/usr/lib/InsightToolkit/WrapITK/Python" >> ${T}/40${PN}
- LDPATH="${LDPATH}:/usr/lib/InsightToolkit/WrapITK/lib"
- fi
+ echo "PYTHONPATH=/usr/lib/InsightToolkit/WrapITK/Python" >> ${T}/40${PN}
+ LDPATH="${LDPATH}:/usr/lib/InsightToolkit/WrapITK/lib"
+ fi
echo "LDPATH=${LDPATH}" >> $T/40${PN}
doenvd "${T}/40${PN}"
-
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: d88ad0a20ffba61bdcc4d3187860d0d92b122c9f
Author: Gert Wollny <gw.fossdev <AT> gmail <DOT> com>
AuthorDate: Tue Jun 11 23:22:51 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 23:22:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d88ad0a2
correct use flag help
---
sci-libs/itk/metadata.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index 25bf3dd..6921bd5 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -10,8 +10,8 @@
of tools for image analysis.
</longdescription>
<use>
- <flag name="itkv3compat">Use review statistics</flag>
- <flag name="review">Enable compilation of mehods under review</flag>
+ <flag name="itkv3compat">Enable compatibility with ITK version 3</flag>
+ <flag name="review">Enable compilation of methods under review</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: af6f650de9f95b3d10549adf070e4c8c0accd9a8
Author: Gert Wollny <gw.fossdev <AT> gmail <DOT> com>
AuthorDate: Tue Jun 11 23:09:13 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 23:13:54 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=af6f650d
Further cleaup the ebuild:
- correct indentions
- remove patented use flag since it is an unused leftover from the
itk-3.X times
- remove some out-commented lines
---
sci-libs/itk/itk-4.4.0.ebuild | 45 ++++++++++++++-----------------------------
sci-libs/itk/metadata.xml | 1 -
2 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index dfa9489..8e522b6 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -16,7 +16,7 @@ RESTRICT="primaryuri"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="debug examples fftw hdf5 itkv3compat patented python review test"
+IUSE="debug examples fftw hdf5 itkv3compat python review test"
RDEPEND="fftw? ( sci-libs/fftw:3.0 )
hdf5? ( sci-libs/hdf5[cxx] )
@@ -27,7 +27,7 @@ RDEPEND="fftw? ( sci-libs/fftw:3.0 )
"
DEPEND="${RDEPEND}
>=dev-util/cmake-2.8
- python? ( >=dev-lang/python-2.5 >=dev-lang/swig-2.0 >=dev-cpp/gccxml-0.9.0_pre20120309 )
+ python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0 >=dev-cpp/gccxml-0.9.0_pre20120309 )
"
MY_PN=InsightToolkit
@@ -75,23 +75,22 @@ src_configure() {
fi
local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX:PATH=/usr
- -DWRAP_ITK_JAVA=OFF
- -DWRAP_ITK_TCL=OFF
- -DITK_USE_SYSTEM_JPEG=ON
- -DITK_USE_SYSTEM_PNG=ON
- -DITK_USE_SYSTEM_TIFF=ON
- -DITK_USE_SYSTEM_ZLIB=ON
- -DITK_BUILD_ALL_MODULES=ON
- -DITK_USE_SYSTEM_GCCXML=ON
- -DITK_USE_SYSTEM_SWIG=ON
- -DBUILD_SHARED_LIBS=ON
- -DITK_COMPUTER_MEMORY_SIZE="$ITK_COMPUTER_MEMORY_SIZE"
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr
+ -DWRAP_ITK_JAVA=OFF
+ -DWRAP_ITK_TCL=OFF
+ -DITK_USE_SYSTEM_JPEG=ON
+ -DITK_USE_SYSTEM_PNG=ON
+ -DITK_USE_SYSTEM_TIFF=ON
+ -DITK_USE_SYSTEM_ZLIB=ON
+ -DITK_BUILD_ALL_MODULES=ON
+ -DITK_USE_SYSTEM_GCCXML=ON
+ -DITK_USE_SYSTEM_SWIG=ON
+ -DBUILD_SHARED_LIBS=ON
+ -DITK_COMPUTER_MEMORY_SIZE="$ITK_COMPUTER_MEMORY_SIZE"
$(cmake-utils_use_build examples)
$(cmake-utils_use_build test TESTING)
$(cmake-utils_use hdf5 ITK_USE_SYSTEM_HDF5)
$(cmake-utils_use review ITK_USE_REVIEW)
- $(cmake-utils_use patented ITK_USE_PATENTED)
)
if use itkv3compat; then
@@ -120,11 +119,6 @@ src_configure() {
cmake-utils_src_configure
}
-#src_compile() {
-# cd "${WORKDIR}/${PN}-${PV}_build"
-# emake || die "emake failed"
-#}
-
src_install() {
cmake-utils_src_install
@@ -176,14 +170,3 @@ src_install() {
doenvd "${T}/40${PN}"
}
-
-pkg_postinst() {
-
- if use patented; then
- ewarn "Using patented code in ITK may require a license."
- ewarn "For more information, please read:"
- ewarn "http://www.itk.org/HTML/Copyright.htm"
- ewarn "http://www.itk.org/Wiki/ITK_Patent_Bazaar"
- fi
-
-}
diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index 632be3d..25bf3dd 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -11,7 +11,6 @@
</longdescription>
<use>
<flag name="itkv3compat">Use review statistics</flag>
- <flag name="patented">Compile patented algorithms</flag>
<flag name="review">Enable compilation of mehods under review</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 0bc49f3aa7c814aa352021aa83b2c5bc33b3dc9a
Author: Gert Wollny <gw.fossdev <AT> gmail <DOT> com>
AuthorDate: Tue Jun 11 23:16:48 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 23:16:48 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0bc49f3a
remove obsolete check for environment variables
---
sci-libs/itk/itk-4.4.0.ebuild | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index afebbf8..ca8d4e2 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -67,12 +67,6 @@ pkg_pretend() {
}
src_configure() {
- if [ "x$ITK_COMPUTER_MEMORY_SIZE" = "x" ]; then
- ITK_COMPUTER_MEMORY_SIZE=4
- fi
- if [ "x$ITK_WRAP_DIMS" = "x" ]; then
- ITK_WRAP_DIMS=2,3
- fi
local mycmakeargs=(
-DCMAKE_INSTALL_PREFIX:PATH=/usr
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 6ebff304515cb64fdd71660ba97ddd9d055d148d
Author: Gert Wollny <gw.fossdev <AT> gmail <DOT> com>
AuthorDate: Wed Jun 12 20:35:44 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Wed Jun 12 20:35:44 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6ebff304
replace maintainer line
---
sci-libs/itk/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index 6921bd5..66b586c 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -3,7 +3,7 @@
<pkgmetadata>
<herd>sci</herd>
<maintainer>
- <email>maintainer-needed@gentoo.org</email>
+ <email>maintainer-wanted@gentoo.org</email>
</maintainer>
<longdescription lang="en">
ITK is a library that provides developers with an extensive suite
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 48d7a2896af3c35ff9cd76bdbacf8cefa671f91d
Author: Gert Wollny <gw.fossdev <AT> gmail <DOT> com>
AuthorDate: Wed Jun 12 20:35:02 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Wed Jun 12 20:35:02 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=48d7a289
replace eerror by elog, and correct indetion
---
sci-libs/itk/itk-4.4.0.ebuild | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index b626718..e0e87e2 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~x86 ~amd64"
IUSE="debug examples fftw hdf5 itkv3compat python review test"
RDEPEND="fftw? ( sci-libs/fftw:3.0 )
- hdf5? ( sci-libs/hdf5[cxx] )
+ hdf5? ( sci-libs/hdf5[cxx] )
virtual/jpeg
media-libs/libpng
media-libs/tiff:0
@@ -40,24 +40,24 @@ PATCHES=(
pkg_pretend() {
bailout=no
if [ "x$ITK_COMPUTER_MEMORY_SIZE" = "x" ]; then
- eerror "To tune ITK to make the best use ouf working memory you must set"
- eerror "ITK_COMPUTER_MEMORY_SIZE in /etc/make.conf to the size of the "
- eerror "memory installed in your machine. For example for 4GB you do:"
- eerror ""
- eerror " echo 'ITK_COMPUTER_MEMORY_SIZE=4' >> /etc/make.conf"
- eerror ""
+ elog "To tune ITK to make the best use ouf working memory you must set"
+ elog "ITK_COMPUTER_MEMORY_SIZE in /etc/make.conf to the size of the "
+ elog "memory installed in your machine. For example for 4GB you do:"
+ elog ""
+ elog " echo 'ITK_COMPUTER_MEMORY_SIZE=4' >> /etc/make.conf"
+ elog ""
bailout=yes
fi
if use python ; then
if [ "x$ITK_WRAP_DIMS" = "x" ]; then
- eerror "For Python language bindings it is necessary to "
- eerror "define the dimensions you want to create bindings for"
- eerror "by setting in ITK_WRAP_DIMS in /etc/make.conf."
- eerror "For example, to provide bindings for 2D and 3D data do:"
- eerror ""
- eerror " echo 'ITK_WRAP_DIMS=2;3' >> /etc/make.conf"
- eerror ""
+ elog "For Python language bindings it is necessary to "
+ elog "define the dimensions you want to create bindings for"
+ elog "by setting in ITK_WRAP_DIMS in /etc/make.conf."
+ elog "For example, to provide bindings for 2D and 3D data do:"
+ elog ""
+ elog " echo 'ITK_WRAP_DIMS=2;3' >> /etc/make.conf"
+ elog ""
bailout=yes
fi
fi
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-09-11 17:27 Nicolas Bock
0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: e97c7b867b58ab2e683b80b21c664182cece2e96
Author: Gert Wollny <gw.fossdev <AT> gmail <DOT> com>
AuthorDate: Fri Jun 14 23:45:29 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri Jun 14 23:45:29 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e97c7b86
update the dependencies and handling of missing varibles
After some more inspection of the build system it turns out that
now hdf5 is always required, so I removed the useflag and made the
dependency obligarory.
In addition, I changed the handling when the environment variables are not set
i.e. only if python bindings are requested and only for the *DIMS variable
the ebuold will bail out, for the memory size the default fallback "1" will
be used if it is not set.
I also added the sse2 use flag since VNL can profit from it.
---
sci-libs/itk/itk-4.4.0.ebuild | 58 +++++++++++++++++++++++++------------------
1 file changed, 34 insertions(+), 24 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
index e0e87e2..3544e4e 100644
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ b/sci-libs/itk/itk-4.4.0.ebuild
@@ -16,15 +16,15 @@ RESTRICT="primaryuri"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="debug examples fftw hdf5 itkv3compat python review test"
+IUSE="debug examples fftw itkv3compat python review sse2 test"
RDEPEND="fftw? ( sci-libs/fftw:3.0 )
- hdf5? ( sci-libs/hdf5[cxx] )
- virtual/jpeg
- media-libs/libpng
- media-libs/tiff:0
- sys-libs/zlib
- "
+ sci-libs/hdf5[cxx]
+ virtual/jpeg
+ media-libs/libpng
+ media-libs/tiff:0
+ sys-libs/zlib
+ "
DEPEND="${RDEPEND}
>=dev-util/cmake-2.8
python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0 >=dev-cpp/gccxml-0.9.0_pre20120309 )
@@ -38,32 +38,34 @@ PATCHES=(
)
pkg_pretend() {
- bailout=no
+ missing_memsize="no"
if [ "x$ITK_COMPUTER_MEMORY_SIZE" = "x" ]; then
- elog "To tune ITK to make the best use ouf working memory you must set"
+ elog "To tune ITK to make the best use ouf working memory you should set"
elog "ITK_COMPUTER_MEMORY_SIZE in /etc/make.conf to the size of the "
elog "memory installed in your machine. For example for 4GB you do:"
elog ""
elog " echo 'ITK_COMPUTER_MEMORY_SIZE=4' >> /etc/make.conf"
- elog ""
- bailout=yes
+ elog "---"
+ missing_memsize="ITK_COMPUTER_MEMORY_SIZE and"
fi
if use python ; then
+
if [ "x$ITK_WRAP_DIMS" = "x" ]; then
- elog "For Python language bindings it is necessary to "
- elog "define the dimensions you want to create bindings for"
- elog "by setting in ITK_WRAP_DIMS in /etc/make.conf."
- elog "For example, to provide bindings for 2D and 3D data do:"
- elog ""
- elog " echo 'ITK_WRAP_DIMS=2;3' >> /etc/make.conf"
- elog ""
- bailout=yes
+ eerror "For Python language bindings it is necessary to "
+ eerror "define the dimensions you want to create bindings for"
+ eerror "by setting in ITK_WRAP_DIMS in /etc/make.conf."
+ eerror "For example, to provide bindings for 2D and 3D data do:"
+ eerror ""
+ eerror " echo 'ITK_WRAP_DIMS=2;3' >> /etc/make.conf"
+ eerror ""
+ # Compiling with python support takes very long, therefore it is better
+ # to bailout here if one or both of above variables are not set, and ask
+ # the user to provide the values.
+ die "Missing value for ITK_WRAP_DIMS"
+
fi
fi
- if [ "x$bailout" = "xyes" ]; then
- die "Please add the missing variables to /etc/make.conf and then restart emerge"
- fi
}
src_configure() {
@@ -80,14 +82,22 @@ src_configure() {
-DITK_USE_SYSTEM_GCCXML=ON
-DITK_USE_SYSTEM_SWIG=ON
-DBUILD_SHARED_LIBS=ON
- -DITK_COMPUTER_MEMORY_SIZE="$ITK_COMPUTER_MEMORY_SIZE"
+ -DITK_USE_SYSTEM_HDF5=ON
$(cmake-utils_use_build examples)
$(cmake-utils_use_build test TESTING)
- $(cmake-utils_use hdf5 ITK_USE_SYSTEM_HDF5)
$(cmake-utils_use review ITK_USE_REVIEW)
$(cmake-utils_use itkv3compat ITKV3_COMPATIBILITY)
+ $(cmake-utils_use sse2 VNL_CONFIG_ENABLE_SSE2)
)
+ # if this is not set, it defaults to 1GB, should be okay for most people.
+ #
+ if [ "x$ITK_COMPUTER_MEMORY_SIZE" != "x" ]; then
+ mycmakeargs+=(
+ -DITK_COMPUTER_MEMORY_SIZE="$ITK_COMPUTER_MEMORY_SIZE"
+ )
+ fi
+
if use fftw; then
mycmakeargs+=(
-DUSE_FFTWD=ON
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-11-16 17:03 Guillaume Horel
0 siblings, 0 replies; 41+ messages in thread
From: Guillaume Horel @ 2013-11-16 17:03 UTC (permalink / raw
To: gentoo-commits
commit: f9431de38ec4c989d6297b2047b383d5a705aecf
Author: Stefan Huber <shuber <AT> sthu <DOT> org>
AuthorDate: Fri Nov 15 19:49:46 2013 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Nov 15 22:10:26 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f9431de3
sci-libs/itk-4.4.2-r1: Add doc use flag
Install doxygen documentation tarball if doc use flag is given.
---
sci-libs/itk/itk-4.4.2-r1.ebuild | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.2-r1.ebuild b/sci-libs/itk/itk-4.4.2-r1.ebuild
index 5671bb0..8718880 100644
--- a/sci-libs/itk/itk-4.4.2-r1.ebuild
+++ b/sci-libs/itk/itk-4.4.2-r1.ebuild
@@ -8,18 +8,20 @@ PYTHON_COMPAT=( python{2_5,2_6,2_7} )
inherit eutils toolchain-funcs cmake-utils python-single-r1
-MYP=InsightToolkit-${PV}
+MYPN=InsightToolkit
+MYP=${MYPN}-${PV}
DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
HOMEPAGE="http://www.itk.org"
-SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
-
+SRC_URI="
+ mirror://sourceforge/${PN}/${MYP}.tar.gz
+ doc? ( mirror://sourceforge/${PN}/Doxygen${MYPN}-4.4.0.tar.gz )"
RESTRICT="primaryuri"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples fftw itkv3compat python review sse2 test vtkglue"
+IUSE="debug doc examples fftw itkv3compat python review sse2 test vtkglue"
RDEPEND="
sci-libs/hdf5[cxx]
@@ -34,6 +36,7 @@ DEPEND="${RDEPEND}
python? ( ${PYTHON_DEPS}
>=dev-lang/swig-2.0
>=dev-cpp/gccxml-0.9.0_pre20120309 )
+ doc? ( app-doc/doxygen )
"
S="${WORKDIR}/${MYP}"
@@ -118,5 +121,14 @@ src_install() {
fi
echo "LDPATH=${ldpath}" >> ${T}/40${PN}
+ if use doc; then
+ insinto "/usr/share/doc/${PF}/api-docs"
+ cd "${WORKDIR}"/html
+ rm -f *.md5 || die "Failed to remove superfluous hashes"
+ einfo "Installing API docs. This may take some time."
+ insinto "/usr/share/doc/${PF}/api-docs"
+ doins -r ./* || die "Failed to install docs"
+ fi
+
doenvd "${T}"/40${PN}
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-11-16 17:03 Guillaume Horel
0 siblings, 0 replies; 41+ messages in thread
From: Guillaume Horel @ 2013-11-16 17:03 UTC (permalink / raw
To: gentoo-commits
commit: daae0ae2696ad6a7c16dd407045ada193b950b3b
Author: Stefan Huber <shuber <AT> sthu <DOT> org>
AuthorDate: Fri Nov 15 21:44:30 2013 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Nov 15 21:44:30 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=daae0ae2
sci-libs/itk-4.4.2-r1: fork from itk-4.4.2.ebuild
---
sci-libs/itk/itk-4.4.2-r1.ebuild | 116 +++++++++++++++++++++++++++++++++++++++
1 file changed, 116 insertions(+)
diff --git a/sci-libs/itk/itk-4.4.2-r1.ebuild b/sci-libs/itk/itk-4.4.2-r1.ebuild
new file mode 100644
index 0000000..542216b
--- /dev/null
+++ b/sci-libs/itk/itk-4.4.2-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit eutils toolchain-funcs cmake-utils python-single-r1
+
+MYP=InsightToolkit-${PV}
+
+DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
+HOMEPAGE="http://www.itk.org"
+SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
+
+RESTRICT="primaryuri"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples fftw itkv3compat python review sse2 test"
+
+RDEPEND="
+ sci-libs/hdf5[cxx]
+ virtual/jpeg
+ media-libs/libpng
+ media-libs/tiff:0
+ sys-libs/zlib
+ fftw? ( sci-libs/fftw:3.0 )
+"
+DEPEND="${RDEPEND}
+ python? ( ${PYTHON_DEPS}
+ >=dev-lang/swig-2.0
+ >=dev-cpp/gccxml-0.9.0_pre20120309 )
+"
+
+S="${WORKDIR}/${MYP}"
+
+pkg_pretend() {
+ if [[ -z ${ITK_COMPUTER_MEMORY_SIZE} ]]; then
+ elog "To tune ITK to make the best use ouf working memory you can set"
+ elog " ITK_COMPUTER_MEMORY_SIZE=XX"
+ elog "in make.conf, default is 1 (unit is GB)"
+ fi
+ if use python && [[ -z ${ITK_WRAP_DIMS} ]]; then
+ elog "For Python language bindings, you can define the dimensions"
+ elog "you want to create bindings for by setting"
+ elog " ITK_WRAP_DIMS=X;Y;Z..."
+ elog "in make.conf, default is 2;3 for 2D and 3D data"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWRAP_ITK_JAVA=OFF
+ -DWRAP_ITK_TCL=OFF
+ -DITK_USE_SYSTEM_HDF5=ON
+ -DITK_USE_SYSTEM_JPEG=ON
+ -DITK_USE_SYSTEM_PNG=ON
+ -DITK_USE_SYSTEM_TIFF=ON
+ -DITK_USE_SYSTEM_ZLIB=ON
+ -DITK_USE_SYSTEM_GCCXML=ON
+ -DITK_USE_SYSTEM_SWIG=ON
+ -DITK_BUILD_ALL_MODULES=ON
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_EXAMPLES=OFF
+ -DITK_COMPUTER_MEMORY_SIZE="${ITK_COMPUTER_MEMORY_SIZE:-1}"
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use review ITK_USE_REVIEW)
+ $(cmake-utils_use itkv3compat ITKV3_COMPATIBILITY)
+ $(cmake-utils_use sse2 VNL_CONFIG_ENABLE_SSE2)
+ )
+ if use fftw; then
+ mycmakeargs+=(
+ -DUSE_FFTWD=ON
+ -DUSE_FFTWF=ON
+ -DUSE_SYSTEM_FFTW=ON
+ -DITK_WRAP_double=ON
+ -DITK_WRAP_vector_double=ON
+ -DITK_WRAP_covariant_vector_double=ON
+ -DITK_WRAP_complex_double=ON
+ )
+ fi
+ if use python; then
+ mycmakeargs+=(
+ -DITK_WRAP_PYTHON=ON
+ -DITK_WRAP_DIMS="${ITK_WRAP_DIMS:-2;3}"
+ )
+ else
+ mycmakeargs+=(
+ -DITK_WRAP_PYTHON=OFF
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ docompress -x /usr/share/doc/${PF}/examples
+ doins -r "${S}"/Examples/*
+ fi
+
+ echo "ITK_DATA_ROOT=${EROOT}/usr/share/${PN}/data" > ${T}/40${PN}
+ local ldpath="${EROOT}/usr/$(get_libdir)/InsightToolkit"
+ if use python; then
+ echo "PYTHONPATH=${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> ${T}/40${PN}
+ ldpath="${ldpath}:${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib"
+ fi
+ echo "LDPATH=${ldpath}" >> ${T}/40${PN}
+
+ doenvd "${T}"/40${PN}
+}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2013-11-16 17:03 Guillaume Horel
0 siblings, 0 replies; 41+ messages in thread
From: Guillaume Horel @ 2013-11-16 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 7e0042d82e62e617c581f39999bfa3d4f97d064c
Author: Stefan Huber <shuber <AT> sthu <DOT> org>
AuthorDate: Fri Nov 15 21:45:49 2013 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Nov 15 21:45:49 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7e0042d8
sci-libs/itk-4.4.2-r1: Add vtkglue use flag
Enable Module_ITKVtkGlue if vtkglue use flag is set. VtkGlue is used for
glueing an ITK pipeline and a VTK pipeline together.
---
sci-libs/itk/itk-4.4.2-r1.ebuild | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/sci-libs/itk/itk-4.4.2-r1.ebuild b/sci-libs/itk/itk-4.4.2-r1.ebuild
index 542216b..5671bb0 100644
--- a/sci-libs/itk/itk-4.4.2-r1.ebuild
+++ b/sci-libs/itk/itk-4.4.2-r1.ebuild
@@ -19,7 +19,7 @@ RESTRICT="primaryuri"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples fftw itkv3compat python review sse2 test"
+IUSE="debug examples fftw itkv3compat python review sse2 test vtkglue"
RDEPEND="
sci-libs/hdf5[cxx]
@@ -28,6 +28,7 @@ RDEPEND="
media-libs/tiff:0
sys-libs/zlib
fftw? ( sci-libs/fftw:3.0 )
+ vtkglue? ( sci-libs/vtk )
"
DEPEND="${RDEPEND}
python? ( ${PYTHON_DEPS}
@@ -82,6 +83,11 @@ src_configure() {
-DITK_WRAP_complex_double=ON
)
fi
+ if use vtkglue; then
+ mycmakeargs+=(
+ -DModule_ITKVtkGlue=ON
+ )
+ fi
if use python; then
mycmakeargs+=(
-DITK_WRAP_PYTHON=ON
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2014-01-06 19:58 Justin Lecher
0 siblings, 0 replies; 41+ messages in thread
From: Justin Lecher @ 2014-01-06 19:58 UTC (permalink / raw
To: gentoo-commits
commit: e3ede464f1e325ed23aebdec37d89e234d75e8a6
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 6 19:55:08 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 19:55:08 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e3ede464
sci-libs/itk: Fix missing local USE
Package-Manager: portage-2.2.8
---
sci-libs/itk/ChangeLog | 5 ++++-
sci-libs/itk/metadata.xml | 20 ++++++++++----------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/sci-libs/itk/ChangeLog b/sci-libs/itk/ChangeLog
index 6186188..6aeb88a 100644
--- a/sci-libs/itk/ChangeLog
+++ b/sci-libs/itk/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-libs/itk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 Jan 2014; Justin Lecher <jlec@gentoo.org> metadata.xml:
+ Fix missing local USE
+
*itk-4.4.2 (12 Sep 2013)
12 Sep 2013; Sébastien Fabbro <bicatali@gentoo.org> +itk-4.4.2.ebuild,
diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index e941d48..7789e76 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-biology</herd>
-<maintainer>
- <email>maintainer-wanted@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+ <herd>sci-biology</herd>
+ <maintainer>
+ <email>maintainer-wanted@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
Insight Segmentation and Registration Toolkit (ITK) is a library
that provides developers with an extensive suite of tools for image
analysis.
</longdescription>
-<use>
- <flag name="itkv3compat">Enable compatibility with ITK version 3</flag>
- <flag name="review">Enable compilation of methods under review</flag>
-</use>
+ <use>
+ <flag name="itkv3compat">Enable compatibility with ITK version 3</flag>
+ <flag name="review">Enable compilation of methods under review</flag>
+ <flag name="vtkglue">PLEASE FIX MY DESCRIPTION</flag>
+ </use>
</pkgmetadata>
-
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2015-02-02 12:06 Justin Lecher
0 siblings, 0 replies; 41+ messages in thread
From: Justin Lecher @ 2015-02-02 12:06 UTC (permalink / raw
To: gentoo-commits
commit: 1bfa3886b36ee376ddfacb3ddca97481a8ffb25f
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Feb 1 18:10:30 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 1 18:10:30 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1bfa3886
sci-libs/itk: Convert sse2 to cpu_flags_x86_sse2
---
sci-libs/itk/ChangeLog | 7 ++++++-
sci-libs/itk/itk-4.4.2-r1.ebuild | 6 +++---
sci-libs/itk/itk-4.4.2.ebuild | 6 +++---
sci-libs/itk/itk-4.5.1.ebuild | 6 +++---
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/sci-libs/itk/ChangeLog b/sci-libs/itk/ChangeLog
index b68a4b5..f623cac 100644
--- a/sci-libs/itk/ChangeLog
+++ b/sci-libs/itk/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for sci-libs/itk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 01 Feb 2015; Marius Brehler <marbre@linux.sungazer.de>
+ itk-4.4.2.ebuild, itk-4.4.2-r1.ebuild, itk-4.5.1.ebuild:
+ Convert sse2 to cpu_flags_x86_sse2
+
+
*itk-4.5.1 (10 Apr 2014)
10 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/itk/itk-4.4.2-r1.ebuild b/sci-libs/itk/itk-4.4.2-r1.ebuild
index 7693b08..5aa31c8 100644
--- a/sci-libs/itk/itk-4.4.2-r1.ebuild
+++ b/sci-libs/itk/itk-4.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -21,7 +21,7 @@ RESTRICT="primaryuri"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples fftw itkv3compat python review sse2 test vtkglue"
+IUSE="debug doc examples fftw itkv3compat python review cpu_flags_x86_sse2 test vtkglue"
RDEPEND="
sci-libs/hdf5[cxx]
@@ -73,7 +73,7 @@ src_configure() {
$(cmake-utils_use_build test TESTING)
$(cmake-utils_use review ITK_USE_REVIEW)
$(cmake-utils_use itkv3compat ITKV3_COMPATIBILITY)
- $(cmake-utils_use sse2 VNL_CONFIG_ENABLE_SSE2)
+ $(cmake-utils_use cpu_flags_x86_sse2 VNL_CONFIG_ENABLE_SSE2)
)
if use fftw; then
mycmakeargs+=(
diff --git a/sci-libs/itk/itk-4.4.2.ebuild b/sci-libs/itk/itk-4.4.2.ebuild
index 75706d2..07c0a91 100644
--- a/sci-libs/itk/itk-4.4.2.ebuild
+++ b/sci-libs/itk/itk-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,7 +19,7 @@ RESTRICT="primaryuri"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples fftw itkv3compat python review sse2 test"
+IUSE="debug examples fftw itkv3compat python review cpu_flags_x86_sse2 test"
RDEPEND="
sci-libs/hdf5[cxx]
@@ -69,7 +69,7 @@ src_configure() {
$(cmake-utils_use_build test TESTING)
$(cmake-utils_use review ITK_USE_REVIEW)
$(cmake-utils_use itkv3compat ITKV3_COMPATIBILITY)
- $(cmake-utils_use sse2 VNL_CONFIG_ENABLE_SSE2)
+ $(cmake-utils_use cpu_flags_x86_sse2 VNL_CONFIG_ENABLE_SSE2)
)
if use fftw; then
mycmakeargs+=(
diff --git a/sci-libs/itk/itk-4.5.1.ebuild b/sci-libs/itk/itk-4.5.1.ebuild
index ba0ca28..ed7f183 100644
--- a/sci-libs/itk/itk-4.5.1.ebuild
+++ b/sci-libs/itk/itk-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -21,7 +21,7 @@ RESTRICT="primaryuri"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples fftw itkv3compat python review sse2 test vtkglue"
+IUSE="debug doc examples fftw itkv3compat python review cpu_flags_x86_sse2 test vtkglue"
RDEPEND="
dev-libs/double-conversion:0=
@@ -94,7 +94,7 @@ src_configure() {
$(cmake-utils_use_build examples EXAMPLES)
$(cmake-utils_use review ITK_USE_REVIEW)
$(cmake-utils_use itkv3compat ITKV3_COMPATIBILITY)
- $(cmake-utils_use sse2 VNL_CONFIG_ENABLE_SSE2)
+ $(cmake-utils_use cpu_flags_x86_sse2 VNL_CONFIG_ENABLE_SSE2)
)
if use fftw; then
mycmakeargs+=(
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2015-09-21 17:44 Justin Lecher
0 siblings, 0 replies; 41+ messages in thread
From: Justin Lecher @ 2015-09-21 17:44 UTC (permalink / raw
To: gentoo-commits
commit: 409d2cef58b65ec5e0730c5c1d634b6e886dacba
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 17:44:03 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 17:44:03 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=409d2cef
sci-libs/itk: Add subslot operators
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/itk/itk-4.4.2-r1.ebuild | 14 ++++++++------
sci-libs/itk/itk-4.4.2.ebuild | 16 ++++++++--------
sci-libs/itk/itk-4.5.1.ebuild | 10 ++++++----
3 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/sci-libs/itk/itk-4.4.2-r1.ebuild b/sci-libs/itk/itk-4.4.2-r1.ebuild
index 7133d57..54c0e41 100644
--- a/sci-libs/itk/itk-4.4.2-r1.ebuild
+++ b/sci-libs/itk/itk-4.4.2-r1.ebuild
@@ -25,17 +25,19 @@ IUSE="debug doc examples fftw itkv3compat python review cpu_flags_x86_sse2 test
RDEPEND="
sci-libs/hdf5[cxx]
- virtual/jpeg
- media-libs/libpng
- media-libs/tiff:0
+ virtual/jpeg:0=
+ media-libs/libpng:0=
+ media-libs/tiff:0=
sys-libs/zlib
fftw? ( sci-libs/fftw:3.0 )
vtkglue? ( sci-libs/vtk )
"
DEPEND="${RDEPEND}
- python? ( ${PYTHON_DEPS}
- >=dev-lang/swig-2.0
- >=dev-cpp/gccxml-0.9.0_pre20120309 )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-lang/swig-2.0:0
+ >=dev-cpp/gccxml-0.9.0_pre20120309
+ )
doc? ( app-doc/doxygen )
"
diff --git a/sci-libs/itk/itk-4.4.2.ebuild b/sci-libs/itk/itk-4.4.2.ebuild
index 815d529..d00be94 100644
--- a/sci-libs/itk/itk-4.4.2.ebuild
+++ b/sci-libs/itk/itk-4.4.2.ebuild
@@ -14,8 +14,6 @@ DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
HOMEPAGE="http://www.itk.org"
SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
-RESTRICT="primaryuri"
-
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
@@ -23,16 +21,18 @@ IUSE="debug examples fftw itkv3compat python review cpu_flags_x86_sse2 test"
RDEPEND="
sci-libs/hdf5[cxx]
- virtual/jpeg
- media-libs/libpng
- media-libs/tiff:0
+ virtual/jpeg:0=
+ media-libs/libpng:0=
+ media-libs/tiff:0=
sys-libs/zlib
fftw? ( sci-libs/fftw:3.0 )
"
DEPEND="${RDEPEND}
- python? ( ${PYTHON_DEPS}
- >=dev-lang/swig-2.0
- >=dev-cpp/gccxml-0.9.0_pre20120309 )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-lang/swig-2.0:0
+ >=dev-cpp/gccxml-0.9.0_pre20120309
+ )
"
S="${WORKDIR}/${MYP}"
diff --git a/sci-libs/itk/itk-4.5.1.ebuild b/sci-libs/itk/itk-4.5.1.ebuild
index a91ebf9..88981b4 100644
--- a/sci-libs/itk/itk-4.5.1.ebuild
+++ b/sci-libs/itk/itk-4.5.1.ebuild
@@ -30,14 +30,16 @@ RDEPEND="
sci-libs/dcmtk:0=
sci-libs/hdf5:0=[cxx]
sys-libs/zlib:0=
- virtual/jpeg
+ virtual/jpeg:0=
fftw? ( sci-libs/fftw:3.0= )
vtkglue? ( sci-libs/vtk:0=[python?] )
"
DEPEND="${RDEPEND}
- python? ( ${PYTHON_DEPS}
- >=dev-lang/swig-2.0
- >=dev-cpp/gccxml-0.9.0_pre20120309 )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-lang/swig-2.0:0
+ >=dev-cpp/gccxml-0.9.0_pre20120309
+ )
doc? ( app-doc/doxygen )
"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2017-06-23 9:11 Justin Lecher
0 siblings, 0 replies; 41+ messages in thread
From: Justin Lecher @ 2017-06-23 9:11 UTC (permalink / raw
To: gentoo-commits
commit: 039697bf6b87b07578ac626d015e71bc38901722
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Jun 18 22:31:57 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 09:11:41 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=039697bf
sci-libs/itk: bump to 4.12.0
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Closes: https://github.com/gentoo/sci/pull/792
sci-libs/itk/itk-4.12.0.ebuild | 136 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 136 insertions(+)
diff --git a/sci-libs/itk/itk-4.12.0.ebuild b/sci-libs/itk/itk-4.12.0.ebuild
new file mode 100644
index 000000000..a9633748b
--- /dev/null
+++ b/sci-libs/itk/itk-4.12.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs cmake-utils python-single-r1
+
+MYPN=InsightToolkit
+MYP=${MYPN}-${PV}
+DOC_PV=4.5.0
+
+DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
+HOMEPAGE="http://www.itk.org"
+SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.xz
+ doc? ( mirror://sourceforge/${PN}/Doxygen${MYPN}-${DOC_PV}.tar.gz )"
+RESTRICT="primaryuri"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples +fftw itkv3compat python review cpu_flags_x86_sse2 test vtkglue"
+
+RDEPEND="
+ dev-libs/double-conversion:0=
+ media-libs/libpng:0=
+ media-libs/tiff:0=
+ sci-libs/dcmtk:0=
+ sci-libs/hdf5:0=[cxx]
+ sys-libs/zlib:0=
+ virtual/jpeg:0=
+ fftw? ( sci-libs/fftw:3.0= )
+ vtkglue? ( sci-libs/vtk:0=[python?] )
+"
+DEPEND="${RDEPEND}
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-lang/swig-2.0:0
+ >=dev-cpp/gccxml-0.9.0_pre20120309
+ )
+ doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+ "${FILESDIR}/nrrdio-linking.patch"
+)
+
+get_memory() {
+ free --giga | grep Mem | cut -d ' ' -f 15 || die 'unable to get memory size'
+}
+
+src_configure() {
+ sed -i \
+ -e '/find_package/d' \
+ Modules/ThirdParty/DoubleConversion/CMakeLists.txt || die
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DITK_USE_SYSTEM_DCMTK=ON
+ -DITK_USE_SYSTEM_DOUBLECONVERSION=ON
+ -DITK_USE_SYSTEM_HDF5=ON
+ -DITK_USE_SYSTEM_JPEG=ON
+ -DITK_USE_SYSTEM_PNG=ON
+ -DITK_USE_SYSTEM_SWIG=ON
+ -DITK_USE_SYSTEM_TIFF=ON
+ -DITK_USE_SYSTEM_ZLIB=ON
+ -DITK_BUILD_DEFAULT_MODULES=ON
+ -DITK_COMPUTER_MEMORY_SIZE="$(get_memory)"
+ -DITK_WRAP_JAVA=OFF
+ -DITK_WRAP_TCL=OFF
+ -DBUILD_TESTING=$(usex test)
+ -DBUILD_EXAMPLES=$(usex examples)
+ -DITK_USE_REVIEW=$(usex review)
+ -DITKV3_COMPATIBILITY=$(usex itkv3compat)
+ -DVNL_CONFIG_ENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+ )
+ if use fftw; then
+ mycmakeargs+=(
+ -DUSE_FFTWD=ON
+ -DUSE_FFTWF=ON
+ -DUSE_SYSTEM_FFTW=ON
+ -DITK_USE_SYSTEM_FFTW=ON
+ -DITK_WRAPPING=ON
+ -DITK_WRAP_double=ON
+ -DITK_WRAP_vector_double=ON
+ -DITK_WRAP_covariant_vector_double=ON
+ -DITK_WRAP_complex_double=ON
+ )
+ fi
+ if use vtkglue; then
+ mycmakeargs+=(
+ -DModule_ITKVtkGlue=ON
+ )
+ fi
+ mycmakeargs+=(
+ -DITK_WRAP_PYTHON=$(usex python ON OFF)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ docompress -x /usr/share/doc/${PF}/examples
+ doins -r "${S}"/Examples/*
+ fi
+
+ echo "ITK_DATA_ROOT=${EROOT%/}/usr/share/${PN}/data" > ${T}/40${PN}
+ local ldpath="${EROOT%/}/usr/$(get_libdir)/InsightToolkit"
+ if use python; then
+ echo "PYTHONPATH=${EROOT%/}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN}
+ ldpath="${ldpath}:${EROOT%/}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib"
+ fi
+ echo "LDPATH=${ldpath}" >> "${T}"/40${PN}
+ doenvd "${T}"/40${PN}
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}/api-docs
+ cd "${WORKDIR}"/html
+ rm *.md5 || die "Failed to remove superfluous hashes"
+ einfo "Installing API docs. This may take some time."
+ insinto /usr/share/doc/${PF}/api-docs
+ doins -r *
+ fi
+
+ mv "${D}/usr/lib" "${D}/usr/$(get_libdir)" || \
+ die 'unable to fix libdir'
+}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2019-04-02 1:20 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2019-04-02 1:20 UTC (permalink / raw
To: gentoo-commits
commit: b78267d25570586f0a6dfd7d8d948c974c4e2846
Author: Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Tue Apr 2 01:20:09 2019 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Tue Apr 2 01:20:09 2019 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b78267d2
sci-libs/itk: version bump 5.0_rc1
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Horea Christian <horea.christ <AT> yandex.com>
sci-libs/itk/itk-5.0_rc1.ebuild | 150 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 150 insertions(+)
diff --git a/sci-libs/itk/itk-5.0_rc1.ebuild b/sci-libs/itk/itk-5.0_rc1.ebuild
new file mode 100644
index 000000000..f6433e551
--- /dev/null
+++ b/sci-libs/itk/itk-5.0_rc1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit eutils toolchain-funcs cmake-utils python-single-r1
+
+MY_PV="5.0rc01"
+
+DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
+HOMEPAGE="http://www.itk.org"
+SRC_URI="
+ https://github.com/InsightSoftwareConsortium/ITK/archive/v${MY_PV}.tar.gz
+ test? ( https://github.com/InsightSoftwareConsortium/ITK/releases/download/v5.0rc01/InsightData-${MY_PV}.tar.gz )
+ "
+RESTRICT="primaryuri"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples fftw python review test vtkglue"
+
+RDEPEND="
+ dev-libs/double-conversion:0=
+ media-libs/openjpeg:2
+ media-libs/libpng:0=
+ media-libs/tiff:0=
+ sci-libs/dcmtk:0=
+ sci-libs/hdf5:0=[cxx]
+ sys-libs/zlib:0=
+ virtual/jpeg:0=
+ fftw? ( sci-libs/fftw:3.0= )
+ vtkglue? ( sci-libs/vtk:0=[python?] )
+"
+DEPEND="${RDEPEND}
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-lang/swig-2.0:0
+ >=dev-cpp/gccxml-0.9.0_pre20120309
+ )
+ doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/ITK-${MY_PV}"
+
+pkg_pretend() {
+ if [[ -z ${ITK_COMPUTER_MEMORY_SIZE} ]]; then
+ elog "To tune ITK to make the best use of working memory you can set"
+ elog " ITK_COMPUTER_MEMORY_SIZE=XX"
+ elog "in make.conf, default is 1 (unit is GB)"
+ fi
+ if use python && [[ -z ${ITK_WRAP_DIMS} ]]; then
+ elog "For Python language bindings, you can define the dimensions"
+ elog "you want to create bindings for by setting"
+ elog " ITK_WRAP_DIMS=X;Y;Z..."
+ elog "in make.conf, default is 2;3 for 2D and 3D data"
+ fi
+}
+
+src_prepare() {
+ sed -i -e "s/find_package(OpenJPEG 2.0.0/find_package(OpenJPEG/g"\
+ Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+ default
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DITK_USE_SYSTEM_DCMTK=ON
+ -DGDCM_USE_SYSTEM_OPENJPEG=ON
+ -DITK_USE_SYSTEM_DOUBLECONVERSION=ON
+ -DITK_USE_SYSTEM_CASTXML=ON
+ -DITK_USE_SYSTEM_HDF5=ON
+ -DITK_USE_SYSTEM_JPEG=ON
+ -DITK_USE_SYSTEM_PNG=ON
+ -DITK_USE_SYSTEM_SWIG=ON
+ -DITK_USE_SYSTEM_TIFF=ON
+ -DITK_USE_SYSTEM_ZLIB=ON
+ -DITK_USE_KWSTYLE=OFF
+ -DITK_BUILD_DEFAULT_MODULES=ON
+ -DITK_COMPUTER_MEMORY_SIZE="${ITK_COMPUTER_MEMORY_SIZE:-1}"
+ -DWRAP_ITK_JAVA=OFF
+ -DWRAP_ITK_TCL=OFF
+ -Ddouble-conversion_INCLUDE_DIRS="${EPREFIX}/usr/include/double-conversion"
+ -DExternalData_OBJECT_STORES="${WORKDIR}/InsightToolkit-${MY_PV}/.ExternalData"
+ -DBUILD_TESTING="$(usex test ON OFF)"
+ -DBUILD_EXAMPLES="$(usex examples ON OFF)"
+ -DITK_USE_REVIEW="$(usex review ON OFF)"
+ -DITK_INSTALL_LIBRARY_DIR=$(get_libdir)
+ )
+ if use fftw; then
+ mycmakeargs+=(
+ -DUSE_FFTWD=ON
+ -DUSE_FFTWF=ON
+ -DUSE_SYSTEM_FFTW=ON
+ -DITK_WRAP_double=ON
+ -DITK_WRAP_vector_double=ON
+ -DITK_WRAP_covariant_vector_double=ON
+ -DITK_WRAP_complex_double=ON
+ )
+ fi
+ if use vtkglue; then
+ mycmakeargs+=(
+ -DModule_ITKVtkGlue=ON
+ )
+ fi
+ if use python; then
+ mycmakeargs+=(
+ -DITK_WRAP_PYTHON=ON
+ -DITK_WRAP_DIMS="${ITK_WRAP_DIMS:-2;3}"
+ )
+ else
+ mycmakeargs+=(
+ -DITK_WRAP_PYTHON=OFF
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ docompress -x /usr/share/doc/${PF}/examples
+ doins -r "${S}"/Examples/*
+ fi
+
+ echo "ITK_DATA_ROOT=${EROOT%/}/usr/share/${PN}/data" > ${T}/40${PN}
+ local ldpath="${EROOT%/}/usr/$(get_libdir)/InsightToolkit"
+ if use python; then
+ echo "PYTHONPATH=${EROOT%/}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN}
+ ldpath="${ldpath}:${EROOT%/}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib"
+ fi
+ echo "LDPATH=${ldpath}" >> "${T}"/40${PN}
+ doenvd "${T}"/40${PN}
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}/api-docs
+ cd "${WORKDIR}"/html
+ rm *.md5 || die "Failed to remove superfluous hashes"
+ einfo "Installing API docs. This may take some time."
+ insinto /usr/share/doc/${PF}/api-docs
+ doins -r *
+ fi
+}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2020-10-09 10:04 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2020-10-09 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 42a90d86af7de67508087b416990dabf413955ef
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Fri Oct 9 10:04:21 2020 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Fri Oct 9 10:04:21 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=42a90d86
sci-libs/itk: eclass and RESTRICT updates
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/itk-5.0.1.ebuild | 11 +++++------
sci-libs/itk/itk-5.1.0.ebuild | 1 -
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild
index e1ec7166a..f345e06b1 100644
--- a/sci-libs/itk/itk-5.0.1.ebuild
+++ b/sci-libs/itk/itk-5.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit toolchain-funcs cmake-utils python-single-r1
+inherit toolchain-funcs cmake python-single-r1
MY_PN="InsightToolkit"
MY_P="${MY_PN}-${PV}"
@@ -22,7 +22,6 @@ SRC_URI="
https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/InsightData-${PV}.tar.gz
)
"
-RESTRICT="primaryuri"
LICENSE="Apache-2.0"
SLOT="0"
@@ -87,7 +86,7 @@ src_prepare() {
cp "$filename" ".ExternalData/MD5/${MD5}" || die
done
fi
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -144,11 +143,11 @@ src_configure() {
-DITK_WRAP_PYTHON=OFF
)
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
if use examples; then
insinto /usr/share/doc/${PF}/examples
diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild
index 64fd555cb..4728ba4a4 100644
--- a/sci-libs/itk/itk-5.1.0.ebuild
+++ b/sci-libs/itk/itk-5.1.0.ebuild
@@ -32,7 +32,6 @@ SRC_URI="
${GLI_TEST_SRC}
)
"
-RESTRICT="primaryuri"
LICENSE="Apache-2.0"
SLOT="0"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2020-10-14 6:52 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2020-10-14 6:52 UTC (permalink / raw
To: gentoo-commits
commit: 583cbb757d8e0e967a5c6cd1b2e64f0bc2ce44ad
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Wed Oct 14 06:52:16 2020 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Wed Oct 14 06:52:16 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=583cbb75
sci-libs/itk: PYTHON_COMPAT update
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/itk-5.0.1.ebuild | 2 +-
sci-libs/itk/itk-5.1.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild
index f345e06b1..6c0310751 100644
--- a/sci-libs/itk/itk-5.0.1.ebuild
+++ b/sci-libs/itk/itk-5.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
inherit toolchain-funcs cmake python-single-r1
diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild
index 4728ba4a4..2b4b145c4 100644
--- a/sci-libs/itk/itk-5.1.0.ebuild
+++ b/sci-libs/itk/itk-5.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
inherit toolchain-funcs cmake python-single-r1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2020-12-24 11:06 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2020-12-24 11:06 UTC (permalink / raw
To: gentoo-commits
commit: f00054d77915556aa047f78e09d3c87808991e86
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Thu Dec 24 11:02:37 2020 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Thu Dec 24 11:02:37 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f00054d7
sci-libs/itk: conditional test restriction
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/itk-5.0.1.ebuild | 1 +
sci-libs/itk/itk-5.1.0.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild
index 6c0310751..93ad7a996 100644
--- a/sci-libs/itk/itk-5.0.1.ebuild
+++ b/sci-libs/itk/itk-5.0.1.ebuild
@@ -27,6 +27,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug doc examples fftw python review test vtkglue"
+RESTRICT="!test? ( test )"
# python will not work, this is a know issue upstream:
# https://github.com/InsightSoftwareConsortium/ITK/issues/1229
# https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/issues/10
diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild
index 2b4b145c4..1f7a5d3b2 100644
--- a/sci-libs/itk/itk-5.1.0.ebuild
+++ b/sci-libs/itk/itk-5.1.0.ebuild
@@ -37,6 +37,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug doc examples fftw python review test vtkglue"
+RESTRICT="!test? ( test )"
# python will not work, this is a know issue upstream:
# https://github.com/InsightSoftwareConsortium/ITK/issues/2005
# https://github.com/InsightSoftwareConsortium/ITK/issues/1229
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2020-12-24 17:26 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2020-12-24 17:26 UTC (permalink / raw
To: gentoo-commits
commit: d71b8611784dda298b7ae55d604d1bbf13ab7e1a
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Thu Dec 24 17:26:23 2020 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Thu Dec 24 17:26:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d71b8611
sci-libs/itk: deed zip BDEPEND
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/itk-5.0.1.ebuild | 1 +
sci-libs/itk/itk-5.1.0.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild
index 93ad7a996..721724036 100644
--- a/sci-libs/itk/itk-5.0.1.ebuild
+++ b/sci-libs/itk/itk-5.0.1.ebuild
@@ -52,6 +52,7 @@ DEPEND="${RDEPEND}
)
doc? ( app-doc/doxygen )
"
+BDEPEND="app-arch/unzip"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild
index 1f7a5d3b2..fa666053e 100644
--- a/sci-libs/itk/itk-5.1.0.ebuild
+++ b/sci-libs/itk/itk-5.1.0.ebuild
@@ -63,6 +63,7 @@ DEPEND="${RDEPEND}
)
doc? ( app-doc/doxygen )
"
+BDEPEND="app-arch/unzip"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2020-12-31 15:58 Aisha Tammy
0 siblings, 0 replies; 41+ messages in thread
From: Aisha Tammy @ 2020-12-31 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 77f84a02fe90c20577e93edf68c026e85913f1b1
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Dec 31 12:31:26 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Thu Dec 31 15:52:08 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=77f84a02
sci-libs/itk: drop old python targets
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Closes: https://github.com/gentoo/sci/pull/1017
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
sci-libs/itk/itk-5.0.1.ebuild | 4 ++--
sci-libs/itk/itk-5.1.0.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild
index 721724036..c5ac9152f 100644
--- a/sci-libs/itk/itk-5.0.1.ebuild
+++ b/sci-libs/itk/itk-5.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit toolchain-funcs cmake python-single-r1
@@ -25,7 +25,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
IUSE="debug doc examples fftw python review test vtkglue"
RESTRICT="!test? ( test )"
# python will not work, this is a know issue upstream:
diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild
index fa666053e..e09d1b7a8 100644
--- a/sci-libs/itk/itk-5.1.0.ebuild
+++ b/sci-libs/itk/itk-5.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit toolchain-funcs cmake python-single-r1
@@ -35,7 +35,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
IUSE="debug doc examples fftw python review test vtkglue"
RESTRICT="!test? ( test )"
# python will not work, this is a know issue upstream:
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2021-01-19 16:56 Andrew Ammerlaan
0 siblings, 0 replies; 41+ messages in thread
From: Andrew Ammerlaan @ 2021-01-19 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 79deea549fdb01e0464c60b9045d6919dac49408
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 19 16:45:09 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 19 16:45:09 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=79deea54
sci-libs/itk: add python deps
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-libs/itk/itk-5.0.1.ebuild | 11 ++++++-----
sci-libs/itk/itk-5.1.0.ebuild | 11 ++++++-----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild
index c5ac9152f..707684d8a 100644
--- a/sci-libs/itk/itk-5.0.1.ebuild
+++ b/sci-libs/itk/itk-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -43,6 +43,7 @@ RDEPEND="
virtual/jpeg:0=
fftw? ( sci-libs/fftw:3.0= )
vtkglue? ( sci-libs/vtk:0=[rendering,python?] )
+ python? ( ${PYTHON_DEPS} )
"
DEPEND="${RDEPEND}
sys-apps/coreutils
@@ -157,11 +158,11 @@ src_install() {
doins -r "${S}"/Examples/*
fi
- echo "ITK_DATA_ROOT=${EROOT%/}/usr/share/${PN}/data" > ${T}/40${PN}
- local ldpath="${EROOT%/}/usr/$(get_libdir)/InsightToolkit"
+ echo "ITK_DATA_ROOT=${EROOT}/usr/share/${PN}/data" > ${T}/40${PN}
+ local ldpath="${EROOT}/usr/$(get_libdir)/InsightToolkit"
if use python; then
- echo "PYTHONPATH=${EROOT%/}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN}
- ldpath="${ldpath}:${EROOT%/}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib"
+ echo "PYTHONPATH=${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN}
+ ldpath="${ldpath}:${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib"
fi
echo "LDPATH=${ldpath}" >> "${T}"/40${PN}
doenvd "${T}"/40${PN}
diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild
index e09d1b7a8..c7d19607a 100644
--- a/sci-libs/itk/itk-5.1.0.ebuild
+++ b/sci-libs/itk/itk-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -54,6 +54,7 @@ RDEPEND="
virtual/jpeg:0=
fftw? ( sci-libs/fftw:3.0= )
vtkglue? ( sci-libs/vtk:0=[rendering,python?] )
+ python? ( ${PYTHON_DEPS} )
"
DEPEND="${RDEPEND}
sys-apps/coreutils
@@ -169,11 +170,11 @@ src_install() {
doins -r "${S}"/Examples/*
fi
- echo "ITK_DATA_ROOT=${EROOT%/}/usr/share/${PN}/data" > ${T}/40${PN}
- local ldpath="${EROOT%/}/usr/$(get_libdir)/InsightToolkit"
+ echo "ITK_DATA_ROOT=${EROOT}/usr/share/${PN}/data" > ${T}/40${PN}
+ local ldpath="${EROOT}/usr/$(get_libdir)/InsightToolkit"
if use python; then
- echo "PYTHONPATH=${EROOT%/}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN}
- ldpath="${ldpath}:${EROOT%/}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib"
+ echo "PYTHONPATH=${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN}
+ ldpath="${ldpath}:${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib"
fi
echo "LDPATH=${ldpath}" >> "${T}"/40${PN}
doenvd "${T}"/40${PN}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2021-03-04 20:56 Andrew Ammerlaan
0 siblings, 0 replies; 41+ messages in thread
From: Andrew Ammerlaan @ 2021-03-04 20:56 UTC (permalink / raw
To: gentoo-commits
commit: 5751886ea4425766efee98c3e98e41c07b152444
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Mar 4 20:55:56 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Mar 4 20:55:56 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5751886e
sci-libs/itk: try to fix doc building
where do they go? currently fails to install with USE="doc"
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-libs/itk/itk-5.0.1.ebuild | 14 +++++++-------
sci-libs/itk/itk-5.1.0.ebuild | 19 +++++++++----------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild
index 707684d8a..d23816f2e 100644
--- a/sci-libs/itk/itk-5.0.1.ebuild
+++ b/sci-libs/itk/itk-5.0.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
HOMEPAGE="http://www.itk.org"
SRC_URI="
https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/${MY_P}.tar.gz
- https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.zip -> ITKGenericLabelInterpolator-${PV}.zip
+ https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.tar.gz -> ITKGenericLabelInterpolator-${PV}.tar.gz
test? (
https://data.kitware.com/api/v1/folder/${GLI_TEST_HASH}/download -> ITKGenericLabelInterpolator_test-${PV}.zip
https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/InsightData-${PV}.tar.gz
@@ -118,6 +118,7 @@ src_configure() {
-DBUILD_TESTING="$(usex test ON OFF)"
-DBUILD_EXAMPLES="$(usex examples ON OFF)"
-DITK_USE_REVIEW="$(usex review ON OFF)"
+ -DITK_BUILD_DOCUMENTATION="$(usex doc ON OFF)"
-DITK_INSTALL_LIBRARY_DIR=$(get_libdir)
)
if use fftw; then
@@ -153,9 +154,9 @@ src_install() {
cmake_src_install
if use examples; then
- insinto /usr/share/doc/${PF}/examples
+ docinto examples
docompress -x /usr/share/doc/${PF}/examples
- doins -r "${S}"/Examples/*
+ dodoc -r "${S}"/Examples/*
fi
echo "ITK_DATA_ROOT=${EROOT}/usr/share/${PN}/data" > ${T}/40${PN}
@@ -168,11 +169,10 @@ src_install() {
doenvd "${T}"/40${PN}
if use doc; then
- insinto /usr/share/doc/${PF}/api-docs
- cd "${WORKDIR}"/html
+ cd "${WORKDIR}"/html || die
rm *.md5 || die "Failed to remove superfluous hashes"
einfo "Installing API docs. This may take some time."
- insinto /usr/share/doc/${PF}/api-docs
- doins -r *
+ docinto /usr/share/doc/${PF}/api-docs
+ dodoc -r *
fi
}
diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild
index c7d19607a..f5c9cd50d 100644
--- a/sci-libs/itk/itk-5.1.0.ebuild
+++ b/sci-libs/itk/itk-5.1.0.ebuild
@@ -18,17 +18,17 @@ declare -a GLI_TEST_HASHES=(
GLI_TEST_SRC=""
for i in "${GLI_TEST_HASHES[@]}"; do
- GLI_TEST_SRC+="https://data.kitware.com/api/v1/file/hashsum/sha512/${i} -> ${i} "
+ GLI_TEST_SRC+="https://data.kitware.com/api/v1/file/hashsum/sha512/${i} -> ${P}-test-${i} "
done
DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
HOMEPAGE="http://www.itk.org"
SRC_URI="
https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/${MY_P}.tar.gz
- https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.zip -> ITKGenericLabelInterpolator-${PV}.zip
+ https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.tar.gz -> ITKGenericLabelInterpolator-${PV}.tar.gz
test? (
https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/InsightData-${PV}.tar.gz
- https://github.com/InsightSoftwareConsortium/ITKTestingData/archive/${TEST_HASH}.tar.gz
+ https://github.com/InsightSoftwareConsortium/ITKTestingData/archive/${TEST_HASH}.tar.gz -> ${P}-testingdata.tar.gz
${GLI_TEST_SRC}
)
"
@@ -64,7 +64,6 @@ DEPEND="${RDEPEND}
)
doc? ( app-doc/doxygen )
"
-BDEPEND="app-arch/unzip"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -106,6 +105,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DITK_BUILD_DOCUMENTATION="$(usex doc ON OFF)"
-DBUILD_EXAMPLES="$(usex examples ON OFF)"
-DBUILD_SHARED_LIBS=ON
-DBUILD_TESTING="$(usex test ON OFF)"
@@ -165,9 +165,9 @@ src_install() {
cmake_src_install
if use examples; then
- insinto /usr/share/doc/${PF}/examples
+ docinto examples
docompress -x /usr/share/doc/${PF}/examples
- doins -r "${S}"/Examples/*
+ dodoc -r "${S}"/Examples/*
fi
echo "ITK_DATA_ROOT=${EROOT}/usr/share/${PN}/data" > ${T}/40${PN}
@@ -180,11 +180,10 @@ src_install() {
doenvd "${T}"/40${PN}
if use doc; then
- insinto /usr/share/doc/${PF}/api-docs
- cd "${WORKDIR}"/html
+ cd "${WORKDIR}"/html || die
rm *.md5 || die "Failed to remove superfluous hashes"
einfo "Installing API docs. This may take some time."
- insinto /usr/share/doc/${PF}/api-docs
- doins -r *
+ docinto api-docs
+ dodoc -r *
fi
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2021-03-04 20:57 Andrew Ammerlaan
0 siblings, 0 replies; 41+ messages in thread
From: Andrew Ammerlaan @ 2021-03-04 20:57 UTC (permalink / raw
To: gentoo-commits
commit: 404bb18d4e02a961b4d864b8b56ddb0b1851f0bc
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Mar 4 20:57:28 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Mar 4 20:57:28 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=404bb18d
sci-libs/itk: fix docinto path
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-libs/itk/itk-5.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild
index d23816f2e..622a7b019 100644
--- a/sci-libs/itk/itk-5.0.1.ebuild
+++ b/sci-libs/itk/itk-5.0.1.ebuild
@@ -172,7 +172,7 @@ src_install() {
cd "${WORKDIR}"/html || die
rm *.md5 || die "Failed to remove superfluous hashes"
einfo "Installing API docs. This may take some time."
- docinto /usr/share/doc/${PF}/api-docs
+ docinto api-docs
dodoc -r *
fi
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2021-03-13 23:55 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2021-03-13 23:55 UTC (permalink / raw
To: gentoo-commits
commit: 8ee4d009f7fdcb0f22f33dee2bf395d67868eee9
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Sat Mar 13 23:55:03 2021 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Sat Mar 13 23:55:03 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=8ee4d009
sci-libs/itk: added optional USE flag
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/itk-5.1.0.ebuild | 3 ++-
sci-libs/itk/metadata.xml | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild
index f5c9cd50d..ad23b6f14 100644
--- a/sci-libs/itk/itk-5.1.0.ebuild
+++ b/sci-libs/itk/itk-5.1.0.ebuild
@@ -36,7 +36,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples fftw python review test vtkglue"
+IUSE="debug doc examples fftw itkv4-compat python review test vtkglue"
RESTRICT="!test? ( test )"
# python will not work, this is a know issue upstream:
# https://github.com/InsightSoftwareConsortium/ITK/issues/2005
@@ -131,6 +131,7 @@ src_configure() {
-DModule_ITKReview:BOOL=ON
-DWRAP_ITK_JAVA=OFF
-DWRAP_ITK_TCL=OFF
+ -DITKV4_COMPATIBILITY:BOOL=$(usex itkv4-compat)
)
if use fftw; then
mycmakeargs+=(
diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index 7c4535324..535ae83de 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -14,6 +14,7 @@ that provides developers with an extensive suite of tools for image
analysis.
</longdescription>
<use>
+ <flag name="itkv4-compat">Compatibility for applications using ITKv4 API</flag>
<flag name="review">Enable compilation of methods under review</flag>
<flag name="vtkglue">PLEASE FIX MY DESCRIPTION</flag>
</use>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2021-03-13 23:55 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2021-03-13 23:55 UTC (permalink / raw
To: gentoo-commits
commit: f20e51268def2befef9ad5772c3bc4aeb5e14297
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Sat Mar 13 23:55:39 2021 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Sat Mar 13 23:55:39 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f20e5126
sci-libs/itk: metadata indentation
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/metadata.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index 535ae83de..c41202e23 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -9,11 +9,11 @@
<name>Gentoo Biology Project</name>
</maintainer>
<longdescription lang="en">
-Insight Segmentation and Registration Toolkit (ITK) is a library
-that provides developers with an extensive suite of tools for image
-analysis.
-</longdescription>
- <use>
+ Insight Segmentation and Registration Toolkit (ITK) is a library
+ that provides developers with an extensive suite of tools for image
+ analysis.
+ </longdescription>
+ <use>
<flag name="itkv4-compat">Compatibility for applications using ITKv4 API</flag>
<flag name="review">Enable compilation of methods under review</flag>
<flag name="vtkglue">PLEASE FIX MY DESCRIPTION</flag>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2021-12-16 10:57 Andrew Ammerlaan
0 siblings, 0 replies; 41+ messages in thread
From: Andrew Ammerlaan @ 2021-12-16 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 92b82d3b728921c9281b64a1c0cb76b3aade3c17
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 10:44:51 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 10:44:51 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=92b82d3b
sci-libs/itk: drop UnusedInherits
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/itk/itk-5.0.1.ebuild | 2 +-
sci-libs/itk/itk-5.1.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild
index 622a7b019..9c8ce63eb 100644
--- a/sci-libs/itk/itk-5.0.1.ebuild
+++ b/sci-libs/itk/itk-5.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit toolchain-funcs cmake python-single-r1
+inherit cmake python-single-r1
MY_PN="InsightToolkit"
MY_P="${MY_PN}-${PV}"
diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild
index ad23b6f14..d437d0298 100644
--- a/sci-libs/itk/itk-5.1.0.ebuild
+++ b/sci-libs/itk/itk-5.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit toolchain-funcs cmake python-single-r1
+inherit cmake python-single-r1
MY_PN="InsightToolkit"
MY_P="${MY_PN}-${PV}"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2022-07-12 13:36 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2022-07-12 13:36 UTC (permalink / raw
To: gentoo-commits
commit: 69348352919a4c305333a2ddc9e2c764d264dda1
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Tue Jul 12 13:36:21 2022 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Tue Jul 12 13:36:21 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=69348352
sci-libs/itk: EAPI and PYTHON_COMPAT bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/itk-5.0.1.ebuild | 2 +-
sci-libs/itk/itk-5.1.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild
index bf9f0f021..4580c659a 100644
--- a/sci-libs/itk/itk-5.0.1.ebuild
+++ b/sci-libs/itk/itk-5.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake python-single-r1
diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild
index 3f6c759ec..e6e0b25f9 100644
--- a/sci-libs/itk/itk-5.1.0.ebuild
+++ b/sci-libs/itk/itk-5.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake python-single-r1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2022-09-15 11:17 Andrew Ammerlaan
0 siblings, 0 replies; 41+ messages in thread
From: Andrew Ammerlaan @ 2022-09-15 11:17 UTC (permalink / raw
To: gentoo-commits
commit: b6218b8bd67305fbc671219a8f694e29a64a5008
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 11:12:29 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 11:12:29 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b6218b8b
sci-libs/itk: add AdaptiveDenoising module
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/itk/{itk-5.2.1.ebuild => itk-5.2.1-r1.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sci-libs/itk/itk-5.2.1.ebuild b/sci-libs/itk/itk-5.2.1-r1.ebuild
similarity index 95%
rename from sci-libs/itk/itk-5.2.1.ebuild
rename to sci-libs/itk/itk-5.2.1-r1.ebuild
index 25292269f..98e39935e 100644
--- a/sci-libs/itk/itk-5.2.1.ebuild
+++ b/sci-libs/itk/itk-5.2.1-r1.ebuild
@@ -11,6 +11,7 @@ inherit cmake python-single-r1 virtualx
MY_PN="InsightToolkit"
MY_P="${MY_PN}-${PV}"
GLI_HASH="89da9305f5750d3990ca9fd35ecc5ce0b39c71a6"
+IAD_HASH="24825c8d246e941334f47968553f0ae388851f0c"
TEST_HASH="7ab9d41ad5b42ccbe8adcaf0b24416d439a264d0"
declare -a GLI_TEST_HASHES=(
"a5e11ea71164ff78c65fcf259db01ea5db981a9d868e60045ff2bffca92984df1174bf984a1076e450f0d5d69b4f0191ed1a61465c220e2c91a893b5df150c0a"
@@ -27,6 +28,7 @@ HOMEPAGE="https://itk.org"
SRC_URI="
https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/${MY_P}.tar.gz
https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.tar.gz -> ITKGenericLabelInterpolator-${PV}.tar.gz
+ https://github.com/ntustison/ITKAdaptiveDenoising/archive/${IAD_HASH}.tar.gz -> ITKAdaptiveDenoising-${PV}.tar.gz
test? (
https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/InsightData-${PV}.tar.gz
https://github.com/InsightSoftwareConsortium/ITKTestingData/archive/${TEST_HASH}.tar.gz -> ${P}-testingdata.tar.gz
@@ -130,6 +132,7 @@ src_prepare() {
# Remote modules
ln -sr "../ITKGenericLabelInterpolator-${GLI_HASH}" Modules/External/ITKGenericLabelInterpolator || die
+ ln -sr "../ITKAdaptiveDenoising-${IAD_HASH}" Modules/External/ITKAdaptiveDenoising || die
cmake_src_prepare
@@ -172,6 +175,7 @@ src_configure() {
-DITK_USE_KWSTYLE=OFF
-DITK_BUILD_DEFAULT_MODULES=ON
-DITK_COMPUTER_MEMORY_SIZE="${ITK_COMPUTER_MEMORY_SIZE:-1}"
+ -DModule_AdaptiveDenoising:BOOL=ON
-DModule_GenericLabelInterpolator:BOOL=ON
-DModule_ITKReview:BOOL=ON
-DWRAP_ITK_JAVA=OFF
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2023-04-03 2:58 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2023-04-03 2:58 UTC (permalink / raw
To: gentoo-commits
commit: c56ebffd2bbb74f5edd5133b89f0347a7ba72e21
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon Apr 3 02:57:41 2023 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Apr 3 02:57:41 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c56ebffd
sci-libs/itk: revbump fixing module build and deps
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
.../itk/{itk-5.3.0.ebuild => itk-5.3.0-r1.ebuild} | 48 ++++++++++++++--------
1 file changed, 32 insertions(+), 16 deletions(-)
diff --git a/sci-libs/itk/itk-5.3.0.ebuild b/sci-libs/itk/itk-5.3.0-r1.ebuild
similarity index 89%
rename from sci-libs/itk/itk-5.3.0.ebuild
rename to sci-libs/itk/itk-5.3.0-r1.ebuild
index 54b7c89b3..23f3341a2 100644
--- a/sci-libs/itk/itk-5.3.0.ebuild
+++ b/sci-libs/itk/itk-5.3.0-r1.ebuild
@@ -8,8 +8,6 @@ VIRTUALX_REQUIRED="manual"
inherit cmake python-single-r1 virtualx
-# rsync: [sender] link_stat "/distfiles/1c/itk-test-bcdbb347f3704262d1f00be7179d6a0a6e68aed56c0653e8072ee5a94985c713bd229c935b1226a658af84fb7f1fffc2458c98364fc35303a2303b12f9f7ce2f" (in gentoo) failed: No such file or directory (2)
-
MY_PN="InsightToolkit"
MY_P="${MY_PN}-${PV}"
GLI_V="1.2.0"
@@ -29,7 +27,7 @@ DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
HOMEPAGE="https://itk.org"
SRC_URI="
https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/${MY_P}.tar.gz
- https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/refs/tags/v${GLI_V}.tar.gz -> ITKGenericLabelInterpolator-${GLI_V}
+ https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/refs/tags/v${GLI_V}.tar.gz -> ITKGenericLabelInterpolator-${GLI_V}.tar.gz
https://github.com/ntustison/ITKAdaptiveDenoising/archive/${IAD_HASH}.tar.gz -> ITKAdaptiveDenoising-${PV}.tar.gz
test? (
https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/InsightData-${PV}.tar.gz
@@ -50,15 +48,16 @@ RDEPEND="
dev-cpp/eigen:3
dev-libs/double-conversion:0=
dev-libs/expat:0=
- media-libs/openjpeg:2
+ dev-libs/icu:0=
+ media-libs/libjpeg-turbo:0=
media-libs/libpng:0=
+ media-libs/openjpeg:2
media-libs/tiff:0=[jpeg]
sci-libs/dcmtk:0=
- sci-libs/hdf5:0=[cxx]
sci-libs/gdcm:0=
- sys-libs/zlib:0=
- media-libs/libjpeg-turbo:0=
- fftw? ( sci-libs/fftw:3.0= )
+ sci-libs/hdf5:0=[cxx]
+ sys-libs/zlib-ng
+ fftw? ( sci-libs/fftw:3.0=[threads] )
vtkglue? (
sci-libs/vtk:0=[rendering]
python? (
@@ -67,6 +66,13 @@ RDEPEND="
)
python? ( ${PYTHON_DEPS} )
"
+# Might also need:
+# dev-libs/kwsys::guru
+# kwiml
+# minc
+# metaio
+# niftilib
+# sci-lib/vxl::science
DEPEND="${RDEPEND}
sys-apps/coreutils
python? (
@@ -117,6 +123,7 @@ src_prepare() {
OpenJPEG/src/openjpeg
PNG/src/itkpng
TIFF/src/itktiff
+ ZLIB/src/itkzlib-ng
)
local x
for x in "${DROPS[@]}"; do
@@ -130,7 +137,7 @@ src_prepare() {
} | sort | uniq -u | xargs -n 1 ewarn "Using bundled" || die
# Remote modules
- ln -sr "../ITKGenericLabelInterpolator-${GLI_HASH}" Modules/External/ITKGenericLabelInterpolator || die
+ ln -sr "../ITKGenericLabelInterpolator-${GLI_V}" Modules/External/ITKGenericLabelInterpolator || die
ln -sr "../ITKAdaptiveDenoising-${IAD_HASH}" Modules/External/ITKAdaptiveDenoising || die
cmake_src_prepare
@@ -158,6 +165,7 @@ src_configure() {
-DITK_FORBID_DOWNLOADS:BOOL=ON
-DITK_INSTALL_LIBRARY_DIR=$(get_libdir)
-DITK_USE_REVIEW="$(usex review ON OFF)"
+ -DITK_USE_SYSTEM_ICU=ON
-DITK_USE_SYSTEM_DCMTK=ON
-DITK_USE_SYSTEM_DOUBLECONVERSION=ON
-DITK_USE_SYSTEM_CASTXML=ON
@@ -183,14 +191,24 @@ src_configure() {
)
if use fftw; then
mycmakeargs+=(
- -DUSE_FFTWD=ON
- -DUSE_FFTWF=ON
- -DUSE_SYSTEM_FFTW=ON
+ -DITK_USE_FFTWD:BOOL=ON
+ -DITK_USE_FFTWF:BOOL=ON
+ -DITK_USE_SYSTEM_FFTW:BOOL=ON
-DITK_WRAP_double=ON
-DITK_WRAP_vector_double=ON
-DITK_WRAP_covariant_vector_double=ON
-DITK_WRAP_complex_double=ON
)
+ else
+ mycmakeargs+=(
+ -DITK_USE_FFTWD:BOOL=OFF
+ -DITK_USE_FFTWF:BOOL=OFF
+ -DITK_USE_SYSTEM_FFTW:BOOL=OFF
+ -DITK_WRAP_double=OFF
+ -DITK_WRAP_vector_double=OFF
+ -DITK_WRAP_covariant_vector_double=OFF
+ -DITK_WRAP_complex_double=OFF
+ )
fi
if use vtkglue; then
mycmakeargs+=(
@@ -241,11 +259,9 @@ src_install() {
}
src_test() {
- # Failing tests reported upstream:
- # https://github.com/ntustison/ITKAdaptiveDenoising/issues/13
if use vtkglue; then
- virtx cmake_src_test -E "(AdaptiveNonLocalMeansDenoisingImageFilterTest1|AdaptiveNonLocalMeansDenoisingImageFilterTest2)"
+ virtx cmake_src_test
else
- cmake_src_test -E "(AdaptiveNonLocalMeansDenoisingImageFilterTest1|AdaptiveNonLocalMeansDenoisingImageFilterTest2)"
+ cmake_src_test
fi
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2023-04-20 3:13 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2023-04-20 3:13 UTC (permalink / raw
To: gentoo-commits
commit: 43e9ae1e3074b5435ed823d7121902dd95db810e
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Thu Apr 20 03:12:40 2023 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Thu Apr 20 03:12:40 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=43e9ae1e
sci-libs/itk: enable py3.11
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/itk-5.2.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/itk/itk-5.2.1-r2.ebuild b/sci-libs/itk/itk-5.2.1-r2.ebuild
index f5ddff7fd..201f730e9 100644
--- a/sci-libs/itk/itk-5.2.1-r2.ebuild
+++ b/sci-libs/itk/itk-5.2.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..11} )
VIRTUALX_REQUIRED="manual"
inherit cmake python-single-r1 virtualx
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2023-04-20 3:13 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2023-04-20 3:13 UTC (permalink / raw
To: gentoo-commits
commit: 3f2aee8f5efbcf9301c98133bf56daaf2767ded6
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Thu Apr 20 03:10:17 2023 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Thu Apr 20 03:10:17 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3f2aee8f
sci-libs/itk: not compatible with =sci-libs/hdf5-1.14.0
Bug #904691
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/itk-5.2.1-r2.ebuild | 2 +-
sci-libs/itk/itk-5.3.0-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/itk/itk-5.2.1-r2.ebuild b/sci-libs/itk/itk-5.2.1-r2.ebuild
index c7519fb6f..f5ddff7fd 100644
--- a/sci-libs/itk/itk-5.2.1-r2.ebuild
+++ b/sci-libs/itk/itk-5.2.1-r2.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
media-libs/libpng:0=
media-libs/tiff:0=[jpeg]
sci-libs/dcmtk:0=
- sci-libs/hdf5:0=[cxx]
+ <sci-libs/hdf5-1.14.0:0=[cxx]
sci-libs/gdcm:0=
sys-libs/zlib:0=
media-libs/libjpeg-turbo:0=
diff --git a/sci-libs/itk/itk-5.3.0-r1.ebuild b/sci-libs/itk/itk-5.3.0-r1.ebuild
index 23f3341a2..761e84e40 100644
--- a/sci-libs/itk/itk-5.3.0-r1.ebuild
+++ b/sci-libs/itk/itk-5.3.0-r1.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
media-libs/tiff:0=[jpeg]
sci-libs/dcmtk:0=
sci-libs/gdcm:0=
- sci-libs/hdf5:0=[cxx]
+ <sci-libs/hdf5-1.14.0:0=[cxx]
sys-libs/zlib-ng
fftw? ( sci-libs/fftw:3.0=[threads] )
vtkglue? (
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2023-04-25 15:33 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2023-04-25 15:33 UTC (permalink / raw
To: gentoo-commits
commit: fe9ed998b6cd324186a0da2f95322eea670fa666
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Tue Apr 25 15:31:01 2023 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Tue Apr 25 15:31:01 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fe9ed998
sci-libs/itk: sci-libs/hdf5 fixed in ::gentoo
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/itk-5.2.1-r2.ebuild | 2 +-
sci-libs/itk/itk-5.3.0-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/itk/itk-5.2.1-r2.ebuild b/sci-libs/itk/itk-5.2.1-r2.ebuild
index 201f730e9..1aa0dc43a 100644
--- a/sci-libs/itk/itk-5.2.1-r2.ebuild
+++ b/sci-libs/itk/itk-5.2.1-r2.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
media-libs/libpng:0=
media-libs/tiff:0=[jpeg]
sci-libs/dcmtk:0=
- <sci-libs/hdf5-1.14.0:0=[cxx]
+ sci-libs/hdf5:0=[cxx]
sci-libs/gdcm:0=
sys-libs/zlib:0=
media-libs/libjpeg-turbo:0=
diff --git a/sci-libs/itk/itk-5.3.0-r1.ebuild b/sci-libs/itk/itk-5.3.0-r1.ebuild
index 761e84e40..23f3341a2 100644
--- a/sci-libs/itk/itk-5.3.0-r1.ebuild
+++ b/sci-libs/itk/itk-5.3.0-r1.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
media-libs/tiff:0=[jpeg]
sci-libs/dcmtk:0=
sci-libs/gdcm:0=
- <sci-libs/hdf5-1.14.0:0=[cxx]
+ sci-libs/hdf5:0=[cxx]
sys-libs/zlib-ng
fftw? ( sci-libs/fftw:3.0=[threads] )
vtkglue? (
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2023-04-25 15:33 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2023-04-25 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 4b6c2d0f2f073a6ab463a6d2e0d5b64158068f63
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Tue Apr 25 15:33:37 2023 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Tue Apr 25 15:33:37 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4b6c2d0f
sci-libs/itk: add github upstream metadata
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index c41202e23..5da2678ec 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -19,6 +19,7 @@
<flag name="vtkglue">PLEASE FIX MY DESCRIPTION</flag>
</use>
<upstream>
+ <remote-id type="github">InsightSoftwareConsortium/ITK</remote-id>
<remote-id type="sourceforge">itk</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
@ 2024-01-22 11:58 Horea Christian
0 siblings, 0 replies; 41+ messages in thread
From: Horea Christian @ 2024-01-22 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 2e700f2156b19ec5346a1edd225def74b2212692
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon Jan 22 11:57:52 2024 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Jan 22 11:57:52 2024 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2e700f21
sci-libs/itk: updated dependency name
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-libs/itk/itk-5.2.1-r2.ebuild | 2 +-
sci-libs/itk/itk-5.3.0-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/itk/itk-5.2.1-r2.ebuild b/sci-libs/itk/itk-5.2.1-r2.ebuild
index 1aa0dc43a..0b1f25860 100644
--- a/sci-libs/itk/itk-5.2.1-r2.ebuild
+++ b/sci-libs/itk/itk-5.2.1-r2.ebuild
@@ -71,7 +71,7 @@ DEPEND="${RDEPEND}
>=dev-lang/swig-2.0:0
dev-libs/castxml
)
- doc? ( app-doc/doxygen )
+ doc? ( app-text/doxygen )
"
BDEPEND="
test? (
diff --git a/sci-libs/itk/itk-5.3.0-r1.ebuild b/sci-libs/itk/itk-5.3.0-r1.ebuild
index 29a3da5d0..b2c3af801 100644
--- a/sci-libs/itk/itk-5.3.0-r1.ebuild
+++ b/sci-libs/itk/itk-5.3.0-r1.ebuild
@@ -79,7 +79,7 @@ DEPEND="${RDEPEND}
>=dev-lang/swig-2.0:0
dev-libs/castxml
)
- doc? ( app-doc/doxygen )
+ doc? ( app-text/doxygen )
"
BDEPEND="
test? (
^ permalink raw reply related [flat|nested] 41+ messages in thread
end of thread, other threads:[~2024-01-22 11:58 UTC | newest]
Thread overview: 41+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-11 17:27 [gentoo-commits] proj/sci:master commit in: sci-libs/itk/ Nicolas Bock
-- strict thread matches above, loose matches on Subject: below --
2024-01-22 11:58 Horea Christian
2023-04-25 15:33 Horea Christian
2023-04-25 15:33 Horea Christian
2023-04-20 3:13 Horea Christian
2023-04-20 3:13 Horea Christian
2023-04-03 2:58 Horea Christian
2022-09-15 11:17 Andrew Ammerlaan
2022-07-12 13:36 Horea Christian
2021-12-16 10:57 Andrew Ammerlaan
2021-03-13 23:55 Horea Christian
2021-03-13 23:55 Horea Christian
2021-03-04 20:57 Andrew Ammerlaan
2021-03-04 20:56 Andrew Ammerlaan
2021-01-19 16:56 Andrew Ammerlaan
2020-12-31 15:58 Aisha Tammy
2020-12-24 17:26 Horea Christian
2020-12-24 11:06 Horea Christian
2020-10-14 6:52 Horea Christian
2020-10-09 10:04 Horea Christian
2019-04-02 1:20 Horea Christian
2017-06-23 9:11 Justin Lecher
2015-09-21 17:44 Justin Lecher
2015-02-02 12:06 Justin Lecher
2014-01-06 19:58 Justin Lecher
2013-11-16 17:03 Guillaume Horel
2013-11-16 17:03 Guillaume Horel
2013-11-16 17:03 Guillaume Horel
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox