[med-svn] r10261 - in trunk/packages/volview/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-04-02 20:36:15 +0000 (Mon, 02 Apr 2012)
New Revision: 10261

Added:
   trunk/packages/volview/trunk/debian/patches/fixfpic.patch
Modified:
   trunk/packages/volview/trunk/debian/changelog
   trunk/packages/volview/trunk/debian/patches/series
Log:
Fix compilation

Modified: trunk/packages/volview/trunk/debian/changelog
===================================================================
--- trunk/packages/volview/trunk/debian/changelog	2012-04-02 20:13:17 UTC (rev 10260)
+++ trunk/packages/volview/trunk/debian/changelog	2012-04-02 20:36:15 UTC (rev 10261)
@@ -1,6 +1,7 @@
 volview (3.4-3) unstable; urgency=low
 
   * Need to remove quote from CFLAGS (MIPS compilation)
+  * fix compilation issues introduced by -fPIC
   * Bump Std-Vers to 3.9.3, no changes needed
   * Use my @d.o alias.
   * Remove DMUA flag

Added: trunk/packages/volview/trunk/debian/patches/fixfpic.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixfpic.patch	                        (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/fixfpic.patch	2012-04-02 20:36:15 UTC (rev 10261)
@@ -0,0 +1,71 @@
+Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt	2012-04-02 21:59:10.000000000 +0200
++++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt	2012-04-02 22:22:24.000000000 +0200
+@@ -70,6 +70,11 @@
+   volview
+   ${CMAKE_CURRENT_BINARY_DIR}/vv-forward.c
+   )
++target_link_libraries(VolView
++/usr/lib/libtcl8.5.so
++/usr/lib/libtk8.5.so
++${OPENGL_LIBRARIES}
++)
+ install(TARGETS volview
+   #  EXPORT ${TARGETS_NAME}
+   RUNTIME DESTINATION bin # COMPONENT Applications
+Index: volview-3.4/VolViewLibraries/KWCommonPro/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWCommonPro/CMakeLists.txt	2012-04-02 22:19:51.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWCommonPro/CMakeLists.txt	2012-04-02 22:28:29.000000000 +0200
+@@ -418,9 +418,11 @@
+   ${KWCommonPro_Instantiator_SRCS}
+ )
+ 
++find_package(OpenGL REQUIRED)
+ TARGET_LINK_LIBRARIES(KWCommonPro
+   vtkHybrid
+   ${KWCommon_LIBRARIES}
++  ${OPENGL_LIBRARIES}
+   )
+ 
+ IF(KWCommonPro_USE_XML_RW)
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2012-04-02 22:23:09.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2012-04-02 22:25:02.000000000 +0200
+@@ -386,6 +386,7 @@
+ TARGET_LINK_LIBRARIES(KWWidgetsPro
+   ${KWWidgets_LIBRARIES}
+   ${VTKEdge_LIBRARIES}
++  ${OPENGL_LIBRARIES}
+   )
+ 
+ IF(KWWidgets_BUILD_VTK_WIDGETS)
+Index: volview-3.4/VolViewLibraries/KWCommon/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWCommon/CMakeLists.txt	2012-04-02 22:27:12.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWCommon/CMakeLists.txt	2012-04-02 22:27:22.000000000 +0200
+@@ -50,6 +50,7 @@
+ # We need VTK
+ 
+ IF(NOT VTK_SOURCE_DIR)
++  FIND_PACKAGE(OpenGL REQUIRED)
+   FIND_PACKAGE(VTK REQUIRED)
+   INCLUDE(${VTK_USE_FILE})
+ ENDIF(NOT VTK_SOURCE_DIR)
+Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt	2012-04-02 22:01:26.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt	2012-04-02 22:33:58.000000000 +0200
+@@ -547,6 +547,10 @@
+   vtkKWEVolumeRendering
+   #cmtar
+   curl
++  vtkIOTCL
++  vtkGraphicsTCL
++  vtkImagingTCL
++  vtkFilteringTCL
+   )
+ 
+ IF(KWVolView_USE_GDCM)

Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series	2012-04-02 20:13:17 UTC (rev 10260)
+++ trunk/packages/volview/trunk/debian/patches/series	2012-04-02 20:36:15 UTC (rev 10261)
@@ -11,3 +11,4 @@
 vvforward.patch
 removerpath.patch
 fixstring.patch
+fixfpic.patch