Author: smr Date: 2011-05-06 06:22:38 +0000 (Fri, 06 May 2011) New Revision: 6781
Added: trunk/packages/insighttoolkit/trunk/debian/patches/ptrdiff.patch Modified: trunk/packages/insighttoolkit/trunk/debian/changelog trunk/packages/insighttoolkit/trunk/debian/patches/series trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch trunk/packages/insighttoolkit/trunk/debian/rules Log: Fix build failures due to ptrdiff_t. Enable optimized registration & transform I/O factories. Fix tcl package dir. Modified: trunk/packages/insighttoolkit/trunk/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/changelog 2011-05-05 10:50:35 UTC (rev 6780) +++ trunk/packages/insighttoolkit/trunk/debian/changelog 2011-05-06 06:22:38 UTC (rev 6781) @@ -1,3 +1,16 @@ +insighttoolkit (3.20.0-10) unstable; urgency=low + + * patches/ptrdiff.patch. New. Include <stddef.h> to ensure ptrdiff_t + is defined. Closes: #625077, #624941, #625090. + + * rules: Enable optimized registration methods and transform IO + factories. Closes: #614519. + + * patches/tcl-install.patch: Set WRAP_ITK_PACKAGE_DIR to /usr/lib. + Closes: #618736. + + -- Steve M. Robbins <[email protected]> Fri, 06 May 2011 01:21:34 -0500 + insighttoolkit (3.20.0-9) unstable; urgency=low * control: Build-depend on newer gccxml and cableswig. Added: trunk/packages/insighttoolkit/trunk/debian/patches/ptrdiff.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/ptrdiff.patch (rev 0) +++ trunk/packages/insighttoolkit/trunk/debian/patches/ptrdiff.patch 2011-05-06 06:22:38 UTC (rev 6781) @@ -0,0 +1,32 @@ +--- insighttoolkit-3.20.0.orig/Code/IO/itkConvertPixelBuffer.txx ++++ insighttoolkit-3.20.0/Code/IO/itkConvertPixelBuffer.txx +@@ -20,6 +20,8 @@ + + #include "itkRGBPixel.h" + ++#include <stddef.h> ++ + namespace itk + { + template < typename InputPixelType, +--- insighttoolkit-3.20.0.orig/Utilities/MetaIO/metaUtils.cxx ++++ insighttoolkit-3.20.0/Utilities/MetaIO/metaUtils.cxx +@@ -18,7 +18,7 @@ + + #include <stdio.h> + #include <ctype.h> +- ++#include <stddef.h> + #include <sys/stat.h> + #include <fcntl.h> + +--- insighttoolkit-3.20.0.orig/Code/IO/itkImageIORegion.h ++++ insighttoolkit-3.20.0/Code/IO/itkImageIORegion.h +@@ -17,6 +17,7 @@ + #ifndef __itkImageIORegion_h + #define __itkImageIORegion_h + ++#include <stddef.h> + #include <algorithm> + #include "itkRegion.h" + #include "itkObjectFactory.h" Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/series 2011-05-05 10:50:35 UTC (rev 6780) +++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2011-05-06 06:22:38 UTC (rev 6781) @@ -8,3 +8,4 @@ wrapitk-externalprojects.patch add-registration-optimizers.patch itkImageToImageFilterC.patch +ptrdiff.patch Modified: trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch 2011-05-05 10:50:35 UTC (rev 6780) +++ trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch 2011-05-06 06:22:38 UTC (rev 6781) @@ -2,9 +2,9 @@ into /usr/lib. However, maybe we could hide them somewhere else; e.g. /usr/lib/tcltk/??? ---- insighttoolkit-3.6.0.orig/Wrapping/CSwig/CMakeLists.txt -+++ insighttoolkit-3.6.0/Wrapping/CSwig/CMakeLists.txt -@@ -347,7 +347,7 @@ +--- insighttoolkit-3.20.0.orig/Wrapping/CSwig/CMakeLists.txt ++++ insighttoolkit-3.20.0/Wrapping/CSwig/CMakeLists.txt +@@ -352,7 +352,7 @@ # Configure pkgIndex.tcl for the install tree. SET(ITK_CSWIG_SCRIPT_DIR "[file dirname [info script]]") @@ -13,3 +13,14 @@ SET(ITK_CSWIG_DATA_ROOT "[file dirname [file dirname [info script]]]/Data") SET(ITK_CSWIG_TEST_ROOT "<NO_DEFAULT>") CONFIGURE_FILE("${ITK_SOURCE_DIR}/Wrapping/CSwig/Tcl/pkgIndex.tcl.in" +--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Tcl/CMakeLists.txt ++++ insighttoolkit-3.20.0/Wrapping/WrapITK/Tcl/CMakeLists.txt +@@ -37,7 +37,7 @@ + + # Configure pkgIndex.tcl for the install tree. + SET(WRAP_ITK_SCRIPT_DIR "${CMAKE_INSTALL_PREFIX}/${WRAP_ITK_INSTALL_PREFIX}/Tcl") +-SET(WRAP_ITK_PACKAGE_DIR "${CMAKE_INSTALL_PREFIX}/${WRAP_ITK_INSTALL_PREFIX}/lib") ++SET(WRAP_ITK_PACKAGE_DIR "/usr/lib") + SET(WRAP_ITK_DATA_ROOT "${CMAKE_INSTALL_PREFIX}/${WRAP_ITK_INSTALL_PREFIX}/Data") + SET(WRAP_ITK_TEST_ROOT "<NO_DEFAULT>") + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pkgIndex.tcl.in" Modified: trunk/packages/insighttoolkit/trunk/debian/rules =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/rules 2011-05-05 10:50:35 UTC (rev 6780) +++ trunk/packages/insighttoolkit/trunk/debian/rules 2011-05-06 06:22:38 UTC (rev 6781) @@ -57,6 +57,8 @@ -DITK_DATA_ROOT:PATH=ITK_DATA_ROOT_NOTFOUND \ -DITK_USE_REVIEW:BOOL=ON \ -DITK_USE_REVIEW_STATISTICS:BOOL=ON \ + -DITK_USE_OPTIMIZED_REGISTRATION_METHODS:BOOL=ON \ + -DITK_USE_TRANSFORM_IO_FACTORIES:BOOL=ON \ -DITK_USE_SYSTEM_GDCM:BOOL=ON \ -DITK_USE_SYSTEM_JPEG:BOOL=ON \ -DITK_USE_SYSTEM_PNG:BOOL=ON \ _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
