[med-svn] r5686 - in trunk/packages/insighttoolkit/trunk/debian: . patches
Steven Michael Robbins
smr at alioth.debian.org
Sat Jan 22 23:40:08 UTC 2011
Author: smr
Date: 2011-01-22 23:40:08 +0000 (Sat, 22 Jan 2011)
New Revision: 5686
Added:
trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk-externalprojects.patch
Modified:
trunk/packages/insighttoolkit/trunk/debian/changelog
trunk/packages/insighttoolkit/trunk/debian/control
trunk/packages/insighttoolkit/trunk/debian/patches/series
trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Apply patch 0001-Added-PyBuffer-and-ItkVtkGlue-to-build.patch from Paul Novotny, as emailed to debian-med 2011-01-22.
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2011-01-22 11:54:02 UTC (rev 5685)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2011-01-22 23:40:08 UTC (rev 5686)
@@ -1,3 +1,14 @@
+insighttoolkit (3.20.0-6) experimental; urgency=low
+
+ [Paul Novotny]
+ * control:
+ * rules:
+ * patches/wrapitk-externalprojects.patch: New. Add two External
+ Projects to the WrapITK build. PyBuffer provides easy interoperability
+ with numpy. ItkVtkGlue makes it easy to convert from and to VTK.
+
+ -- Steve M. Robbins <smr at debian.org> Sat, 22 Jan 2011 17:38:46 -0600
+
insighttoolkit (3.20.0-5) experimental; urgency=low
* patches/wrapitk.patch: New. Use ITK_LIBRARY_PROPERTIES to properly
Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control 2011-01-22 11:54:02 UTC (rev 5685)
+++ trunk/packages/insighttoolkit/trunk/debian/control 2011-01-22 23:40:08 UTC (rev 5686)
@@ -7,7 +7,7 @@
Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7),
cmake, cableswig (>= 0.1.0+cvs20100501), gccxml (>= 0.9.0+cvs20100501-2),
zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev (>= 3.7.3),
- python-support (>= 0.6.4), python-dev, libfftw3-dev,
+ python-support (>= 0.6.4), python-dev, python-numpy, libfftw3-dev,
tcl8.5-dev, tk8.5-dev, uuid-dev, libgdcm2-dev, libjpeg62-dev,
libfreetype6-dev, libopenjpeg-dev, graphviz,
libxext-dev, libxss-dev, libxft-dev, libpoppler-dev, libssl-dev,
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series 2011-01-22 11:54:02 UTC (rev 5685)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2011-01-22 23:40:08 UTC (rev 5686)
@@ -5,3 +5,4 @@
jni-dir.patch
remove-cmake-export-build-settings.patch
wrapitk.patch
+wrapitk-externalprojects.patch
Added: trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk-externalprojects.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk-externalprojects.patch (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk-externalprojects.patch 2011-01-22 23:40:08 UTC (rev 5686)
@@ -0,0 +1,125 @@
+Index: insighttoolkit-3.20.0/Wrapping/WrapITK/CMakeLists.txt
+===================================================================
+--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/CMakeLists.txt 2011-01-09 14:12:59.000000000 -0500
++++ insighttoolkit-3.20.0/Wrapping/WrapITK/CMakeLists.txt 2011-01-11 10:19:08.000000000 -0500
+@@ -176,6 +176,17 @@
+ SUBDIRS(Modules/${module})
+ ENDFOREACH(module)
+
++OPTION(BUILD_ITKVTKGLUE "Build WrapITK with ItkVtkGlue" ON)
++IF(BUILD_ITKVTKGLUE)
++ SUBDIRS(ExternalProjects/ItkVtkGlue)
++ENDIF(BUILD_ITKVTKGLUE)
++
++OPTION(BUILD_PYBUFFER "Build WrapITK with Numpy support" ON)
++IF(BUILD_PYBUFFER)
++ SUBDIRS(ExternalProjects/PyBuffer)
++ENDIF(BUILD_PYBUFFER)
++
++
+ ###############################################################################
+ # Configure language-specific features
+ ###############################################################################
+Index: insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/CMakeLists.txt
+===================================================================
+--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/CMakeLists.txt 2011-01-11 10:12:29.000000000 -0500
++++ insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/CMakeLists.txt 2011-01-17 18:14:17.000000000 -0500
+@@ -1,29 +1,3 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+-IF(COMMAND CMAKE_POLICY)
+- CMAKE_POLICY(SET CMP0003 NEW)
+-ENDIF(COMMAND CMAKE_POLICY)
+-
+-PROJECT(ItkVtkGlue)
+-
+-OPTION(BUILD_WRAPPERS "Wrap library" OFF)
+-OPTION(INSTALL_DEVEL_FILES "Install C++ headers" ON)
+-
+-FIND_PACKAGE(ITK REQUIRED)
+-FIND_PACKAGE(VTK REQUIRED)
+-
+-INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS} ${ITK_INCLUDE_DIRS} ${ItkVtkGlue_SOURCE_DIR}/src)
+-LINK_DIRECTORIES(${VTK_LIBRARY_DIRS} ${ITK_LIBRARY_DIRS})
+-
+-IF(BUILD_WRAPPERS)
+- SUBDIRS(Wrapping)
+-ENDIF(BUILD_WRAPPERS)
+-
+-# install devel files
+-IF(INSTALL_DEVEL_FILES)
+- FOREACH(f itkImageToVTKImageFilter.h itkImageToVTKImageFilter.txx itkVTKImageToImageFilter.h itkVTKImageToImageFilter.txx)
+- INSTALL_FILES(/include/InsightToolkit/BasicFilters FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/${f})
+- ENDFOREACH(f)
+-ENDIF(INSTALL_DEVEL_FILES)
+-
+-ENABLE_TESTING()
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src)
++SUBDIRS(Wrapping)
+
+Index: insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/PyBuffer/CMakeLists.txt
+===================================================================
+--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/ExternalProjects/PyBuffer/CMakeLists.txt 2011-01-11 10:52:39.000000000 -0500
++++ insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/PyBuffer/CMakeLists.txt 2011-01-17 11:17:30.000000000 -0500
+@@ -1,11 +1,5 @@
+-PROJECT(PyBuffer)
+-FIND_PACKAGE(WrapITK REQUIRED)
+-
+ # Deal with numarray package Options
+-SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}")
+-FIND_PACKAGE( NUMARRAY )
+-
+-INCLUDE_DIRECTORIES( ${PYTHON_NUMARRAY_INCLUDE_DIR} )
++INCLUDE_DIRECTORIES( ${PYTHON_NUMPY_INCLUDE_PATH} )
+
+ BEGIN_WRAPPER_LIBRARY("BufferConversion" Python)
+
+Index: insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/PyBuffer/itkPyBuffer.txx
+===================================================================
+--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/ExternalProjects/PyBuffer/itkPyBuffer.txx 2011-01-11 14:49:57.000000000 -0500
++++ insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/PyBuffer/itkPyBuffer.txx 2011-01-11 14:50:43.000000000 -0500
+@@ -49,7 +49,7 @@
+
+ char * data = (char *)( buffer );
+
+- int dimensions[ ImageDimension ];
++ npy_intp dimensions[ ImageDimension ];
+
+ SizeType size = image->GetBufferedRegion().GetSize();
+
+Index: insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/Wrapping/CMakeLists.txt
+===================================================================
+--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/Wrapping/CMakeLists.txt 2011-01-11 15:14:29.000000000 -0500
++++ insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/Wrapping/CMakeLists.txt 2011-01-17 11:23:37.000000000 -0500
+@@ -1,23 +1,19 @@
+-FIND_PACKAGE(WrapITK REQUIRED)
+
+-BEGIN_WRAPPER_LIBRARY(${PROJECT_NAME})
++BEGIN_WRAPPER_LIBRARY(ItkVtkGlue)
+ SET(WRAPPER_SWIG_LIBRARY_FILES ${WRAPPER_SWIG_LIBRARY_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/itkvtk.swg")
+ SET(WRAPPER_LIBRARY_DEPENDS Base SimpleFilters)
+
+-WRAPPER_LIBRARY_CREATE_WRAP_FILES()
+-WRAPPER_LIBRARY_CREATE_LIBRARY()
+-
+ IF(WRAP_ITK_PYTHON)
+ # I can't manage to put that code in Python subdir :-(
+ SET(VTK_VERSION "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
+- SET(MIN_ITK_VER "5.0.0")
+- IF("${VTK_VERSION}" STRLESS "${MIN_ITK_VER}")
+- TARGET_LINK_LIBRARIES(_${WRAPPER_LIBRARY_NAME}Python vtkImagingPython ITKCommon ITKBasicFilters)
+- ELSE("${VTK_VERSION}" STRLESS "${MIN_ITK_VER}")
+- TARGET_LINK_LIBRARIES(_${WRAPPER_LIBRARY_NAME}Python vtkImagingPythonD ITKCommon ITKBasicFilters)
+- ENDIF("${VTK_VERSION}" STRLESS "${MIN_ITK_VER}")
+-
+- SUBDIRS(Python)
++ SET(MIN_VTK_VER "5.0.0")
++ IF("${VTK_VERSION}" STRLESS "${MIN_VTK_VER}")
++ SET(WRAPPER_LIBRARY_LINK_LIBRARIES vtkImagingPython ITKCommon ITKBasicFilters)
++ ELSE("${VTK_VERSION}" STRLESS "${MIN_VTK_VER}")
++ SET(WRAPPER_LIBRARY_LINK_LIBRARIES vtkImagingPythonD ITKCommon ITKBasicFilters)
++ ENDIF("${VTK_VERSION}" STRLESS "${MIN_VTK_VER}")
+ ENDIF(WRAP_ITK_PYTHON)
+
++WRAPPER_LIBRARY_CREATE_WRAP_FILES()
++WRAPPER_LIBRARY_CREATE_LIBRARY()
+
Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules 2011-01-22 11:54:02 UTC (rev 5685)
+++ trunk/packages/insighttoolkit/trunk/debian/rules 2011-01-22 23:40:08 UTC (rev 5686)
@@ -69,6 +69,7 @@
-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/$(PYVERS) \
-DPYTHON_INCLUDE_PATH:PATH=/usr/include/$(PYVERS) \
+ -DPYTHON_NUMPY_INCLUDE_PATH:PATH=/usr/include/$(PYVERS)/numpy \
-DPYTHON_LIBRARY:FILEPATH=/usr/lib/lib$(PYVERS).so \
-DTCL_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) \
-DTCL_LIBRARY:FILEPATH=/usr/lib/libtcl$(TCLVERS).so \
More information about the debian-med-commit
mailing list