[med-svn] r13196 - in trunk/packages/insighttoolkit/trunk/debian: . patches
Steven Michael Robbins
smr at alioth.debian.org
Mon Mar 18 05:58:50 UTC 2013
Author: smr
Date: 2013-03-18 05:58:49 +0000 (Mon, 18 Mar 2013)
New Revision: 13196
Added:
trunk/packages/insighttoolkit/trunk/debian/patches/lsm-with-system-tiff.patch
Modified:
trunk/packages/insighttoolkit/trunk/debian/changelog
trunk/packages/insighttoolkit/trunk/debian/control
trunk/packages/insighttoolkit/trunk/debian/control.in
trunk/packages/insighttoolkit/trunk/debian/patches/series
trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Build using system TIFF. Install itkTestDriver.
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2013-03-17 23:37:05 UTC (rev 13195)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2013-03-18 05:58:49 UTC (rev 13196)
@@ -1,3 +1,15 @@
+insighttoolkit4 (4.3.1-2) unstable; urgency=low
+
+ * rules: Build using system TIFF. Closes: #701888 because no longer
+ uses included TIFF source.
+ * control.in: Build-depend on libtiff5-alt-dev because libvtk5-dev still
+ depends on libtiff4-dev.
+ * patches/lsm-with-system-tiff.patch: Fix needed when using system TIFF.
+
+ * rules: install itkTestDriver. Closes: #700723.
+
+ -- Steve M. Robbins <smr at debian.org> Sun, 17 Mar 2013 23:54:38 -0500
+
insighttoolkit4 (4.3.1-1) unstable; urgency=low
* New upstream.
Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control 2013-03-17 23:37:05 UTC (rev 13195)
+++ trunk/packages/insighttoolkit/trunk/debian/control 2013-03-18 05:58:49 UTC (rev 13196)
@@ -7,7 +7,7 @@
Uploaders: Steve M. Robbins <smr at debian.org>, Mathieu Malaterre <mathieu.malaterre at gmail.com>
Build-Depends: debhelper (>= 9),
cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
- zlib1g-dev (>= 1.2.2), libpng12-dev, libvxl1-dev,
+ zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff5-alt-dev, libvxl1-dev,
libfftw3-dev,
uuid-dev, libgdcm2-dev, libminc-dev, libhdf5-dev,
libvtk5-dev, python-vtk
Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in 2013-03-17 23:37:05 UTC (rev 13195)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in 2013-03-18 05:58:49 UTC (rev 13196)
@@ -7,7 +7,7 @@
Uploaders: Steve M. Robbins <smr at debian.org>, Mathieu Malaterre <mathieu.malaterre at gmail.com>
Build-Depends: debhelper (>= 9),
cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
- zlib1g-dev (>= 1.2.2), libpng12-dev, libvxl1-dev,
+ zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff5-alt-dev, libvxl1-dev,
libfftw3-dev,
uuid-dev, libgdcm2-dev, libminc-dev, libhdf5-dev,
libvtk5-dev, python-vtk
Added: trunk/packages/insighttoolkit/trunk/debian/patches/lsm-with-system-tiff.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/lsm-with-system-tiff.patch (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/lsm-with-system-tiff.patch 2013-03-18 05:58:49 UTC (rev 13196)
@@ -0,0 +1,28 @@
+Description: Cannot use itkLSMImageIOFactory when using system TIFF
+Author: Paul Novotny <paul at paulnovo.us>
+Forwarded: http://review.source.kitware.com/9798
+
+--- insighttoolkit4-4.3.1.orig/Modules/Compatibility/Deprecated/test/itkTestDriverIncludeDeprecatedIOFactories.h
++++ insighttoolkit4-4.3.1/Modules/Compatibility/Deprecated/test/itkTestDriverIncludeDeprecatedIOFactories.h
+@@ -23,7 +23,10 @@
+ #include "itkNiftiImageIOFactory.h"
+ #include "itkGiplImageIOFactory.h"
+ #include "itkJPEGImageIOFactory.h"
+-#include "itkLSMImageIOFactory.h"
++#include "itk_tiff.h" // ITK_USE_SYSTEM_TIFF
++#ifndef ITK_USE_SYSTEM_TIFF
++# include "itkLSMImageIOFactory.h"
++#endif // ITK_USE_SYSTEM_TIFF
+ #include "itkMetaImageIOFactory.h"
+ #include "itkPNGImageIOFactory.h"
+ #include "itkNrrdImageIOFactory.h"
+@@ -43,7 +46,9 @@
+ itk::ObjectFactoryBase::RegisterFactory( itk::PNGImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory( itk::VTKImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory( itk::GiplImageIOFactory::New() );
++#ifndef ITK_USE_SYSTEM_TIFF
+ itk::ObjectFactoryBase::RegisterFactory( itk::LSMImageIOFactory::New() );
++#endif // ITK_USE_SYSTEM_TIFF
+ itk::ObjectFactoryBase::RegisterFactory( itk::NiftiImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory( itk::JPEGImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory( itk::TIFFImageIOFactory::New() );
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series 2013-03-17 23:37:05 UTC (rev 13195)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2013-03-18 05:58:49 UTC (rev 13196)
@@ -1 +1,2 @@
bsd-hdf5.patch
+lsm-with-system-tiff.patch
Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules 2013-03-17 23:37:05 UTC (rev 13195)
+++ trunk/packages/insighttoolkit/trunk/debian/rules 2013-03-18 05:58:49 UTC (rev 13196)
@@ -7,7 +7,6 @@
# TODO: turn on the following:
#
# system HDF5 (omits C++ bindings; Bug #660547)
-# system TIFF (requires version 4, but libvtk5-dev depends on version 3)
# system FFTW (test failures; see http://lists.debian.org/debian-med/2012/04/msg00064.html)
# system VXL (Bug #656837)
# Module_ITKLevelSetsv4Visualization (https://issues.itk.org/jira/browse/ITK-2856)
@@ -29,7 +28,7 @@
-DITK_USE_SYSTEM_HDF5:BOOL=OFF \
-DITK_USE_SYSTEM_JPEG:BOOL=ON \
-DITK_USE_SYSTEM_PNG:BOOL=ON \
- -DITK_USE_SYSTEM_TIFF:BOOL=OFF \
+ -DITK_USE_SYSTEM_TIFF:BOOL=ON \
-DITK_USE_SYSTEM_VXL:BOOL=OFF \
-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
-DModule_ITKIOPhilipsREC:BOOL=ON \
@@ -83,6 +82,7 @@
dh_install -p$(pkg_dev) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so usr/lib
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/ITK-$(SOVERSION)/*
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/cmake
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/bin/itkTestDriver
# dh_install -p$(pkg_dev) Wrapping/WrapITK /usr/src
override_dh_installexamples:
More information about the debian-med-commit
mailing list