itk: add updater, update 4.4.1-->4.8.2, enable system libs, and use cmake wrapper

2 files changed, 15 insertions, 91 deletions

diff --git a/src/itk-1-tryrun.patch b/src/itk-1-tryrun.patch
deleted file mode 100644
index 0a19da4..0000000
--- a/src/itk-1-tryrun.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
---- blubb	1970-01-01 01:00:00.000000000 +0100
-+++ ITK/TryRunResults.cmake	2011-09-27 08:44:04.563613261 +0200
-@@ -0,0 +1,72 @@
-+SET( KWSYS_CHAR_IS_SIGNED 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( KWSYS_CHAR_IS_SIGNED__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( VCL_HAS_SLICED_DESTRUCTOR_BUG 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( VCL_HAS_SLICED_DESTRUCTOR_BUG__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( VCL_HAS_WORKING_STRINGSTREAM 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( VCL_HAS_WORKING_STRINGSTREAM__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( VCL_HAS_LFS 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( VCL_HAS_LFS__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( VXL_SSE2_HARDWARE_SUPPORT_POSSIBLE 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( VXL_SSE2_HARDWARE_SUPPORT_POSSIBLE__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( VCL_COMPLEX_POW_WORKS 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( VCL_COMPLEX_POW_WORKS__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( VCL_CHAR_IS_SIGNED 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( VCL_CHAR_IS_SIGNED__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( VCL_NUMERIC_LIMITS_HAS_INFINITY 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( VCL_NUMERIC_LIMITS_HAS_INFINITY__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( VCL_PROCESSOR_HAS_INFINITY 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( VCL_PROCESSOR_HAS_INFINITY__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( QNANHIBIT_VALUE 
-+     "1"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( QNANHIBIT_VALUE__TRYRUN_OUTPUT 
-+     "-DTEEM_QNANHIBIT=1"
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( KWSYS_LFS_WORKS 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( KWSYS_LFS_WORKS__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-+SET( VXL_HAS_SSE2_HARDWARE_SUPPORT 
-+     "0"
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( VXL_HAS_SSE2_HARDWARE_SUPPORT__TRYRUN_OUTPUT 
-+     ""
-+     CACHE STRING "Output from TRY_RUN" FORCE)
-
diff --git a/src/itk.mk b/src/itk.mk
index 2163979..3fa6bd5 100644
--- a/src/itk.mk
+++ b/src/itk.mk
@@ -3,31 +3,34 @@
 
 PKG             := itk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.4.1
-$(PKG)_CHECKSUM := 7d6f5d50b4689daf710933ef99ec8764e4b1700f636e90b7fa94aeb9f99247fd
+$(PKG)_VERSION  := 4.8.2
+$(PKG)_CHECKSUM := fec268ba180bdb78d760aa4f6f467d0a5fc71b3a34e3201d8425d0edfa23ef5f
 $(PKG)_SUBDIR   := InsightToolkit-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc hdf5
+$(PKG)_DEPS     := gcc expat hdf5 jpeg libpng tiff zlib
 
 define $(PKG)_UPDATE
-    echo 'TODO: Updates for package ITK need to be written.' >&2;
-    echo $(itk_VERSION)
+    $(WGET) -q -O- 'http://itk.org/ITK/resources/software.html' | \
+    $(SED) -n 's,.*InsightToolkit-\([0-9][^>]*\)\.tar\.xz.*,\1,p' | \
+    $(SORT) -V |
+    tail -1
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's^#  error "Dunno about this gcc"^#  warning "Dunno about this gcc"^;' \
-        '$(1)/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h'
     mkdir '$(1).build'
-    cd '$(1).build' && cmake \
-        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-        -C '$(1)/TryRunResults.cmake'\
-        -DBUILD_SHARED_LIBS=FALSE \
+    cd '$(1).build' && '$(TARGET)-cmake' \
+        -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
         -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+        -DITK_FORBID_DOWNLOADS=TRUE \
         -DBUILD_TESTING=FALSE \
         -DBUILD_EXAMPLES=FALSE \
+        -DITK_USE_SYSTEM_EXPAT=TRUE \
         -DITK_USE_SYSTEM_HDF5=TRUE \
-        -DCMAKE_C_FLAGS='-std=gnu89' \
+        -DITK_USE_SYSTEM_JPEG=TRUE \
+        -DITK_USE_SYSTEM_PNG=TRUE \
+        -DITK_USE_SYSTEM_TIFF=TRUE \
+        -DITK_USE_SYSTEM_ZLIB=TRUE \
         '$(1)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
 endef