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

[Mathieu Malaterre]

Author: malat
Date: 2014-06-11 10:04:39 +0000 (Wed, 11 Jun 2014)
New Revision: 17123

Modified:
   trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch
Log:
prefer system lzma

Modified: trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch	2014-06-11 09:58:16 UTC (rev 17122)
+++ trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch	2014-06-11 10:04:39 UTC (rev 17123)
@@ -91,16 +91,26 @@
 Index: imagevis3d-3.1.0/Tuvok/tvk.pro
 ===================================================================
 --- imagevis3d-3.1.0.orig/Tuvok/tvk.pro	2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/Tuvok/tvk.pro	2014-06-11 11:44:34.043810691 +0200
++++ imagevis3d-3.1.0/Tuvok/tvk.pro	2014-06-11 12:03:57.067880536 +0200
 @@ -13,7 +13,7 @@
  RCC_DIR           = Build/rcc
  OBJECTS_DIR       = Build/objects
  DEPENDPATH       += . Basics Controller DebugOut IO Renderer
 -INCLUDEPATH      += . 3rdParty/GLEW IO/3rdParty/boost IO/3rdParty/zlib IO/3rdParty/lzma IO/3rdParty/lz4 IO/3rdParty/lzham
-+INCLUDEPATH      += . IO/3rdParty/lzma IO/3rdParty/lzham
++INCLUDEPATH      += . IO/3rdParty/lzham
  INCLUDEPATH      += Basics IO/exception
  INCLUDEPATH      += /usr/include/lua5.2
  QT               += opengl
+@@ -372,9 +372,6 @@
+            IO/3rdParty/lzham/lzham_timer.cpp \
+            IO/3rdParty/lzham/lzham_vector.cpp \
+            IO/3rdParty/lzham/lzham_win32_threading.cpp \
+-           IO/3rdParty/lzma/LzFind.c \
+-           IO/3rdParty/lzma/LzmaDec.c \
+-           IO/3rdParty/lzma/LzmaEnc.c \
+            IO/AbstrConverter.cpp \
+            IO/AbstrGeoConverter.cpp \
+            IO/AmiraConverter.cpp \
 Index: imagevis3d-3.1.0/Tuvok/doc/genlua/genlua.pro
 ===================================================================
 --- imagevis3d-3.1.0.orig/Tuvok/doc/genlua/genlua.pro	2014-06-11 11:44:31.535810540 +0200