[med-svn] r8865 - trunk/packages/imagevis3d/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-09 09:02:46 +0000 (Fri, 09 Dec 2011)
New Revision: 8865

Added:
   trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch
   trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch
Modified:
   trunk/packages/imagevis3d/trunk/debian/patches/series
Log:
Redo patch for release 2.0.1

Added: trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch	                        (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch	2011-12-09 09:02:46 UTC (rev 8865)
@@ -0,0 +1,36 @@
+Index: imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro
+===================================================================
+--- imagevis3d-2.0.1.orig/ImageVis3D/ImageVis3D.pro	2011-12-09 09:58:30.000000000 +0100
++++ imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro	2011-12-09 09:59:34.000000000 +0100
+@@ -25,6 +25,7 @@
+ RC_FILE 	  = Resources/ImageVis3D.rc
+ QMAKE_INFO_PLIST  = ../IV3D.plist
+ ICON              = Resources/ImageVis3D.icns
++unix:LIBS        +=-lGLEW -ljpeg -ltiff -lbz2
+ macx:LIBS        +=-framework CoreFoundation
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+ unix:QMAKE_CFLAGS += -fno-strict-aliasing
+Index: imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro
+===================================================================
+--- imagevis3d-2.0.1.orig/CmdLineConverter/CmdLineConverter.pro	2011-12-09 10:00:11.000000000 +0100
++++ imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro	2011-12-09 10:00:45.000000000 +0100
+@@ -17,6 +17,7 @@
+ DEPENDPATH       += $$incpath
+ INCLUDEPATH      += $$incpath
+ LIBS              = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
++unix:LIBS        += -lGLEW -ljpeg -ltiff -lbz2
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+ unix:QMAKE_CFLAGS += -fno-strict-aliasing
+ 
+Index: imagevis3d-2.0.1/UVFReader/UVFReader.pro
+===================================================================
+--- imagevis3d-2.0.1.orig/UVFReader/UVFReader.pro	2011-12-09 10:01:25.000000000 +0100
++++ imagevis3d-2.0.1/UVFReader/UVFReader.pro	2011-12-09 10:01:42.000000000 +0100
+@@ -14,6 +14,7 @@
+ INCLUDEPATH      += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW
+ INCLUDEPATH      += ../Tuvok ../Tuvok/Basics/3rdParty ../Tuvok/Basics
+ LIBS              = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
++unix:LIBS         += -lGLEW -ltiff -ljpeg -lbz2
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+ unix:QMAKE_CFLAGS += -fno-strict-aliasing
+ 

Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series	2011-12-09 08:53:55 UTC (rev 8864)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series	2011-12-09 09:02:46 UTC (rev 8865)
@@ -7,3 +7,5 @@
 tiff.patch
 jpeg2.patch
 jpeg3.patch
+tiff4.patch
+libs3.patch

Added: trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch	                        (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch	2011-12-09 09:02:46 UTC (rev 8865)
@@ -0,0 +1,13 @@
+Index: imagevis3d-2.0.1/Tuvok/tvk.pro
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/tvk.pro	2011-12-09 09:55:33.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/tvk.pro	2011-12-09 09:55:50.000000000 +0100
+@@ -262,8 +262,6 @@
+            Renderer/TFScaling.cpp \
+            Scripting/Scripting.cpp
+ 
+-unix:SOURCES += IO/3rdParty/tiff/tif_unix.c
+-
+ win32 {
+   HEADERS += \
+              Basics/DynamicDX.h \