[med-svn] r17350 - in trunk/packages/vtk-dicom/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2014-06-30 10:39:15 +0000 (Mon, 30 Jun 2014)
New Revision: 17350

Added:
   trunk/packages/vtk-dicom/trunk/debian/patches/
   trunk/packages/vtk-dicom/trunk/debian/patches/51c53d2537d4fefec5c3e7b8545609079723e112.patch
   trunk/packages/vtk-dicom/trunk/debian/patches/series
Modified:
   trunk/packages/vtk-dicom/trunk/debian/changelog
   trunk/packages/vtk-dicom/trunk/debian/rules
Log:
Add patch from upstream

Modified: trunk/packages/vtk-dicom/trunk/debian/changelog
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/changelog	2014-06-30 10:38:10 UTC (rev 17349)
+++ trunk/packages/vtk-dicom/trunk/debian/changelog	2014-06-30 10:39:15 UTC (rev 17350)
@@ -2,8 +2,9 @@
 
   * New upstream
   * Remove DCMTK option. Closes: #751222
+  * Build Python and Java bindings. Closes: #752097
 
- -- Mathieu Malaterre <malat at debian.org>  Thu, 19 Jun 2014 16:45:36 +0200
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 30 Jun 2014 12:38:00 +0200
 
 vtk-dicom (0.4.5-1) unstable; urgency=low
 

Added: trunk/packages/vtk-dicom/trunk/debian/patches/51c53d2537d4fefec5c3e7b8545609079723e112.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/51c53d2537d4fefec5c3e7b8545609079723e112.patch	                        (rev 0)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/51c53d2537d4fefec5c3e7b8545609079723e112.patch	2014-06-30 10:39:15 UTC (rev 17350)
@@ -0,0 +1,80 @@
+From 51c53d2537d4fefec5c3e7b8545609079723e112 Mon Sep 17 00:00:00 2001
+From: David Gobbi <david.gobbi at gmail.com>
+Date: Sat, 28 Jun 2014 10:03:49 -0600
+Subject: [PATCH] Fix library loading in TestDICOMJava.
+
+It was using vtkJavaTesting.Initialize() to load the VTK libraries,
+which doesn't in some installations.  Try using Java's own load path
+first, before falling back on vtkJavaTesting.Initialize().
+---
+ Testing/TestDICOMJava.java.in | 42 +++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 41 insertions(+), 1 deletion(-)
+
+diff --git a/Testing/TestDICOMJava.java.in b/Testing/TestDICOMJava.java.in
+index 6ffd79d..6c73b7e 100644
+--- a/Testing/TestDICOMJava.java.in
++++ b/Testing/TestDICOMJava.java.in
+@@ -4,12 +4,51 @@ import vtk.vtkDICOMMetaData;
+ import vtk.vtkObject;
+ import vtk.vtkIntArray;
+ import vtk.vtkJavaTesting;
++import vtk.vtkSettings;
+ 
+ import java.io.File;
+ 
+ public class TestDICOMJava {
+     public static void main(final String[] args) {
+-        vtkJavaTesting.Initialize(args, false);
++        // try loading the VTK libs from the VTK build directory
++        try {
++          String[] kits = vtkSettings.GetKits();
++          String vtk5libs[] = {
++            "vtkCommonJava", "vtkFilteringJava", "vtkImagingJava",
++            "vtkGraphicsJava", "vtkIOJava"
++          };
++          String vtk6libs[] = {
++            "vtkCommonCoreJava", "vtkCommonDataModelJava",
++            "vtkIOImageJava", "vtkIOMPIImageJava"
++          };
++          int cc;
++          for (cc = 0; cc < kits.length; cc++) {
++            String libname = "vtk" + kits[cc] + "Java";
++            boolean found = false;
++            int i;
++            for (i = 0; i < vtk5libs.length; i++) {
++              if (libname.equals(vtk5libs[i])) {
++                found = true;
++                break;
++              }
++            }
++            for (i = 0; i < vtk6libs.length; i++) {
++              if (libname.equals(vtk6libs[i])) {
++                found = true;
++                break;
++              }
++            }
++            if (found) {
++              Runtime.getRuntime().loadLibrary(libname);
++            }
++          }
++        }
++        catch (UnsatisfiedLinkError ee) {
++          // try using VTK's own load function instead
++          vtkJavaTesting.Initialize(args, false);
++        }
++
++        // load the vtkDICOMJava lib
+         String sep = System.getProperty("file.separator");
+         String lname = System.mapLibraryName("vtkDICOMJava");
+         String lpath = "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@";
+@@ -33,6 +72,7 @@ public class TestDICOMJava {
+         vtkDICOMReader reader = new vtkDICOMReader();
+         vtkDICOMWriter writer = new vtkDICOMWriter();
+         vtkDICOMMetaData meta = new vtkDICOMMetaData();
++        writer.SetInputConnection(reader.GetOutputPort());
+         vtkIntArray a = new vtkIntArray();
+         vtkObject.JAVA_OBJECT_MANAGER.deleteAll();
+         System.out.println("Ran the vtk-dicom Java test.");
+-- 
+1.9.3
+

Added: trunk/packages/vtk-dicom/trunk/debian/patches/series
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/series	2014-06-30 10:39:15 UTC (rev 17350)
@@ -0,0 +1 @@
+51c53d2537d4fefec5c3e7b8545609079723e112.patch

Modified: trunk/packages/vtk-dicom/trunk/debian/rules
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/rules	2014-06-30 10:38:10 UTC (rev 17349)
+++ trunk/packages/vtk-dicom/trunk/debian/rules	2014-06-30 10:39:15 UTC (rev 17350)
@@ -7,14 +7,14 @@
 	dh $@ --parallel
 
 CMAKE_EXTRA_FLAGS += \
-		-DCMAKE_SKIP_RPATH=OFF \
-		-DDICOM_LIB_DIR:STRING=/lib/$(DEB_HOST_MULTIARCH) \
-    -DCMAKE_BUILD_TYPE:STRING=None \
-    -DBUILD_PYTHON_WRAPPERS:BOOL=ON \
-    -DBUILD_JAVA_WRAPPERS:BOOL=ON \
-    -DUSE_DCMTK:BOOL=OFF \
-    -DUSE_GDCM:BOOL=ON \
-    -DBUILD_SHARED_LIBS:BOOL=ON
+	-DCMAKE_SKIP_RPATH=OFF \
+	-DDICOM_LIB_DIR:STRING=/lib/$(DEB_HOST_MULTIARCH) \
+	-DCMAKE_BUILD_TYPE:STRING=None \
+	-DBUILD_PYTHON_WRAPPERS:BOOL=ON \
+	-DBUILD_JAVA_WRAPPERS:BOOL=ON \
+	-DUSE_DCMTK:BOOL=OFF \
+	-DUSE_GDCM:BOOL=ON \
+	-DBUILD_SHARED_LIBS:BOOL=ON
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)