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

[Mathieu Malaterre]

Author: malat
Date: 2013-12-31 08:43:26 +0000 (Tue, 31 Dec 2013)
New Revision: 15684

Modified:
   trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch
   trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch
Log:
remove ljpeg left over

Modified: trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch	2013-12-31 08:32:21 UTC (rev 15683)
+++ trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch	2013-12-31 08:43:26 UTC (rev 15684)
@@ -62,8 +62,8 @@
  QMAKE_LIBDIR     += ../Tuvok/Build ../Tuvok/IO/expressions
  LIBS              = -lTuvok -ltuvokexpr
  unix:LIBS        += -lz
--unix:LIBS        += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
-+unix:LIBS        += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2 -fopenmp
+-unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2
++unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2 -fopenmp
  win3:LIBS       += shlwapi.lib
  unix:!macx:LIBS  += -lGLU
  macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
@@ -75,8 +75,8 @@
  QMAKE_LIBDIR     += ../Tuvok/Build ../Tuvok/IO/expressions
  LIBS              = -lTuvok -ltuvokexpr
  unix:LIBS        += -lz
--unix:LIBS        += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
-+unix:LIBS        += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2 -fopenmp
+-unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2
++unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2 -fopenmp
  win32:LIBS       += shlwapi.lib
  unix:!macx:LIBS  += -lGLU
  macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
@@ -88,8 +88,8 @@
  QMAKE_LIBDIR     += ../Tuvok/Build ../Tuvok/IO/expressions
  LIBS              = -lTuvok -ltuvokexpr
  unix:LIBS        += -lz
--unix:LIBS        += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
-+unix:LIBS        += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2 -fopenmp
+-unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2
++unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2 -fopenmp
  win32:LIBS       += shlwapi.lib
  unix:!macx:LIBS  += -lGLU
  QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas

Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch	2013-12-31 08:32:21 UTC (rev 15683)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch	2013-12-31 08:43:26 UTC (rev 15684)
@@ -70,7 +70,7 @@
  QMAKE_LIBDIR     += ../Tuvok/Build ../Tuvok/IO/expressions
  LIBS              = -lTuvok -ltuvokexpr
  unix:LIBS        += -lz
-+unix:LIBS        += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
++unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2
  win32:LIBS       += shlwapi.lib
  unix:!macx:LIBS  += -lGLU
  macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
@@ -228,7 +228,7 @@
  QMAKE_LIBDIR     += ../Tuvok/Build ../Tuvok/IO/expressions
  LIBS              = -lTuvok -ltuvokexpr
  unix:LIBS        += -lz
-+unix:LIBS        += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
++unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2
  win3:LIBS       += shlwapi.lib
  unix:!macx:LIBS  += -lGLU
  macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
@@ -291,7 +291,7 @@
  QMAKE_LIBDIR     += ../Tuvok/Build ../Tuvok/IO/expressions
  LIBS              = -lTuvok -ltuvokexpr
  unix:LIBS        += -lz
-+unix:LIBS        += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
++unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2
  win32:LIBS       += shlwapi.lib
  unix:!macx:LIBS  += -lGLU
  QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas