[med-svn] r20031 - in trunk/packages/minc/libminc/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2015-09-05 04:07:46 +0000 (Sat, 05 Sep 2015)
New Revision: 20031

Added:
   trunk/packages/minc/libminc/trunk/debian/patches/use-system-nifti
Modified:
   trunk/packages/minc/libminc/trunk/debian/control
   trunk/packages/minc/libminc/trunk/debian/patches/series
Log:
Use system nifti.

Modified: trunk/packages/minc/libminc/trunk/debian/control
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/control	2015-09-05 03:35:21 UTC (rev 20030)
+++ trunk/packages/minc/libminc/trunk/debian/control	2015-09-05 04:07:46 UTC (rev 20031)
@@ -7,6 +7,7 @@
 Build-Depends: debhelper (>= 9),
 	       cmake (>= 2.8.5),
                libnetcdf-dev,
+	       libnifti-dev,
                zlib1g-dev,
                libhdf5-dev
 Standards-Version: 3.9.6

Modified: trunk/packages/minc/libminc/trunk/debian/patches/series
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/series	2015-09-05 03:35:21 UTC (rev 20030)
+++ trunk/packages/minc/libminc/trunk/debian/patches/series	2015-09-05 04:07:46 UTC (rev 20031)
@@ -1,3 +1,4 @@
 build-using-system-find-dot-cmake
 fix-soversion-generation
 fix-uselibminc-cmake
+use-system-nifti

Added: trunk/packages/minc/libminc/trunk/debian/patches/use-system-nifti
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/use-system-nifti	                        (rev 0)
+++ trunk/packages/minc/libminc/trunk/debian/patches/use-system-nifti	2015-09-05 04:07:46 UTC (rev 20031)
@@ -0,0 +1,49 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 03a6468..cf8da19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -171,8 +171,8 @@ INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/libsrc
+    ${CMAKE_CURRENT_SOURCE_DIR}/volume_io/Include
+    ${CMAKE_CURRENT_SOURCE_DIR}/ezminc
+-   ${CMAKE_CURRENT_SOURCE_DIR}/nifti
+    ${HDF5_INCLUDE_DIR}
++   /usr/include/nifti
+    )
+ 
+ SET(minc_common_SRCS
+@@ -188,8 +188,6 @@ SET(minc_common_HEADERS
+   libsrc/read_file_names.h
+   libsrc/restructure.h
+   volume_io/Include/volume_io.h
+-  nifti/nifti1.h
+-  nifti/nifti1_io.h
+ )
+ 
+ # some variables
+@@ -282,8 +280,6 @@ SET(volume_io_LIB_SRCS
+    volume_io/Volumes/output_mnc2.c
+    volume_io/Volumes/input_mgh.c
+    volume_io/Volumes/input_nifti.c
+-   nifti/nifti1_io.c
+-   nifti/znzlib.c
+ )
+ 
+ SET(volume_io_HEADERS
+@@ -343,7 +339,7 @@ ENDIF(LIBMINC_MINC1_SUPPORT)
+ EXPORT(TARGETS ${LIBMINC_LIBRARY} FILE "${LIBMINC_EXPORTED_TARGETS}.cmake")
+ 
+ IF(UNIX)
+-  TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY}   m dl )
++  TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY}  niftiio nifticdf znz m dl )
+ 
+   IF(LIBMINC_BUILD_SHARED_LIBS)
+     ADD_LIBRARY(${LIBMINC_LIBRARY_STATIC} STATIC ${minc_LIB_SRCS} ${minc_HEADERS} ${volume_io_LIB_SRCS} ${volume_io_HEADERS} )
+@@ -391,7 +387,6 @@ SET(LIBMINC_INCLUDE_DIRS_CONFIG
+   ${CMAKE_CURRENT_SOURCE_DIR}
+   ${CMAKE_CURRENT_SOURCE_DIR}/libsrc2
+   ${CMAKE_CURRENT_SOURCE_DIR}/volume_io/Include
+-  ${CMAKE_CURRENT_SOURCE_DIR}/nifti
+ )
+ 
+ IF(LIBMINC_MINC1_SUPPORT)