[med-svn] r15532 - in trunk/packages/elastix/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2013-12-14 05:27:05 +0000 (Sat, 14 Dec 2013)
New Revision: 15532

Added:
   trunk/packages/elastix/trunk/debian/patches/disable-mevisdicomtiff.patch
Modified:
   trunk/packages/elastix/trunk/debian/changelog
   trunk/packages/elastix/trunk/debian/control
   trunk/packages/elastix/trunk/debian/patches/series
   trunk/packages/elastix/trunk/debian/rules
Log:
Update for new upstream, new ITK (v4).

Modified: trunk/packages/elastix/trunk/debian/changelog
===================================================================
--- trunk/packages/elastix/trunk/debian/changelog	2013-12-13 23:36:34 UTC (rev 15531)
+++ trunk/packages/elastix/trunk/debian/changelog	2013-12-14 05:27:05 UTC (rev 15532)
@@ -1,3 +1,15 @@
+elastix (4.6-1) unstable; urgency=low
+
+  * New upstream version.
+  * control: Build-depend on libinsighttoolkit4-dev (instead of ITK 3).
+  * control(elastix): Build only architectures amd64 and i386, following ITK 4.
+
+  * patches/disable-mevisdicomtiff.patch: New.  Fix build system to honour
+    ELASTIX_USE_MEVISDICOMTIFF=false
+  * rules: Build with ELASTIX_USE_MEVISDICOMTIFF=false.
+
+ -- Steve M. Robbins <smr at debian.org>  Fri, 13 Dec 2013 23:26:15 -0600
+
 elastix (4.5-4) unstable; urgency=low
 
   * Team upload.

Modified: trunk/packages/elastix/trunk/debian/control
===================================================================
--- trunk/packages/elastix/trunk/debian/control	2013-12-13 23:36:34 UTC (rev 15531)
+++ trunk/packages/elastix/trunk/debian/control	2013-12-14 05:27:05 UTC (rev 15532)
@@ -6,7 +6,7 @@
 Priority: optional
 Build-Depends: debhelper (>= 9),
                cmake,
-               libinsighttoolkit3-dev (>= 3.20.0-5),
+               libinsighttoolkit4-dev,
                libgdcm2-dev,
                zlib1g-dev,
                libpng-dev,
@@ -18,13 +18,13 @@
                      texlive-latex-recommended,
                      ghostscript,
                      latex-xcolor
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/elastix/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/elastix/trunk/
 Homepage: http://elastix.isi.uu.nl/
 
 Package: elastix
-Architecture: any
+Architecture: amd64 i386
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: elastix-doc

Added: trunk/packages/elastix/trunk/debian/patches/disable-mevisdicomtiff.patch
===================================================================
--- trunk/packages/elastix/trunk/debian/patches/disable-mevisdicomtiff.patch	                        (rev 0)
+++ trunk/packages/elastix/trunk/debian/patches/disable-mevisdicomtiff.patch	2013-12-14 05:27:05 UTC (rev 15532)
@@ -0,0 +1,93 @@
+Description: Correct sources to honour ELASTIX_USE_MEVISDICOMTIFF=false
+Origin: https://bugs.gentoo.org/attachment.cgi?id=350734&action=diff
+Forwarded: no
+Author: Gert Wollny gw.fossdev at gmail.com 
+Reviewed-by: Steve M. Robbins <smr at debian.org>
+
+
+--- elastix-4.6.orig/src/Common/MevisDicomTiff/CMakeLists.txt
++++ elastix-4.6/src/Common/MevisDicomTiff/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ 
+ IF( ELASTIX_USE_MEVISDICOMTIFF )
+   ADD_DEFINITIONS( -D_ELASTIX_USE_MEVISDICOMTIFF )
+-ENDIF()
++
+ 
+ ADD_LIBRARY( mevisdcmtiff
+   itkMevisDicomTiffImageIO.cxx
+@@ -18,3 +18,4 @@
+ 
+ # add mevisdcmtiff to the list of target_link_libraries in your cmakelists.txt file.
+ 
++ENDIF()
+--- elastix-4.6.orig/src/Core/CMakeLists.txt
++++ elastix-4.6/src/Core/CMakeLists.txt
+@@ -142,7 +142,6 @@
+   xoutlib
+   elxCommon
+   elxCore
+-  ${mevisdcmtifflib}
+   ${AllComponentLibs}
+   ${ITK_LIBRARIES}
+ )
+@@ -155,11 +154,14 @@
+   xoutlib
+   elxCommon
+   elxCore
+-  ${mevisdcmtifflib}
+   ${AllComponentLibs}
+   ${ITK_LIBRARIES}
+ )
+ 
++IF( ELASTIX_USE_MEVISDICOMTIFF )
++  TARGET_LINK_LIBRARIES( elastix   ${mevisdcmtifflib})
++  TARGET_LINK_LIBRARIES( transformix ${mevisdcmtifflib})
++ENDIF( ELASTIX_USE_MEVISDICOMTIFF )
+ #---------------------------------------------------------------------
+ # Define the install directory for elastix and transformix.
+ 
+--- elastix-4.6.orig/src/Core/Main/elastix.cxx
++++ elastix-4.6/src/Core/Main/elastix.cxx
+@@ -64,8 +64,10 @@
+   typedef std::queue< ArgPairType >                   ParameterFileListType;
+   typedef ParameterFileListType::value_type           ParameterFileListEntryType;
+ 
++#ifdef _ELASTIX_USE_MEVISDICOMTIFF
+   /** Support Mevis Dicom Tiff (if selected in cmake) */
+   RegisterMevisDicomTiff();
++#endif 
+ 
+   /** Some declarations and initialisations. */
+   ElastixMainVectorType elastices;
+--- elastix-4.6.orig/src/Core/Main/transformix.cxx
++++ elastix-4.6/src/Core/Main/transformix.cxx
+@@ -55,9 +55,10 @@
+   typedef TransformixMainType::ArgumentMapType      ArgumentMapType;
+   typedef ArgumentMapType::value_type               ArgumentMapEntryType;
+ 
++#ifdef _ELASTIX_USE_MEVISDICOMTIFF
+   /** Support Mevis Dicom Tiff (if selected in cmake) */
+   RegisterMevisDicomTiff();
+-
++#endif 
+   /** Declare an instance of the Transformix class. */
+   TransformixMainPointer  transformix;
+ 
+--- elastix-4.6.orig/src/Testing/CMakeLists.txt
++++ elastix-4.6/src/Testing/CMakeLists.txt
+@@ -45,9 +45,13 @@
+   target_link_libraries( ${ELXTEST_EXECUTABLE_NAME}
+     elxCommon # needed for elxTimer
+     ${ITK_LIBRARIES}
+-    ${mevisdcmtifflib}
+   )
+ 
++if( ELASTIX_USE_MEVISDICOMTIFF )
++  target_link_libraries( ${ELXTEST_EXECUTABLE_NAME}     ${mevisdcmtifflib})
++endif( ELASTIX_USE_MEVISDICOMTIFF )
++
++
+   # Group in IDE's like Visual Studio
+   set_property( TARGET ${ELXTEST_EXECUTABLE_NAME} PROPERTY FOLDER "tests" )
+ 

Modified: trunk/packages/elastix/trunk/debian/patches/series
===================================================================
--- trunk/packages/elastix/trunk/debian/patches/series	2013-12-13 23:36:34 UTC (rev 15531)
+++ trunk/packages/elastix/trunk/debian/patches/series	2013-12-14 05:27:05 UTC (rev 15532)
@@ -1 +1,2 @@
+disable-mevisdicomtiff.patch
 build-static-ann.patch

Modified: trunk/packages/elastix/trunk/debian/rules
===================================================================
--- trunk/packages/elastix/trunk/debian/rules	2013-12-13 23:36:34 UTC (rev 15531)
+++ trunk/packages/elastix/trunk/debian/rules	2013-12-14 05:27:05 UTC (rev 15532)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --sourcedirectory=src --parallel
+	dh $@ --sourcedirectory=src
 
 binary: binary-arch binary-indep
 
@@ -16,6 +16,7 @@
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_BUILD_TYPE=RELEASE \
 	-DCMAKE_SKIP_RPATH=ON \
+	-DELASTIX_USE_MEVISDICOMTIFF:BOOL=OFF \
 	-DUSE_KNNGraphAlphaMutualInformationMetric:BOOL=ON
 
 override_dh_auto_configure: