[med-svn] r17048 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Fri Jun 6 12:14:18 UTC 2014
Author: malat
Date: 2014-06-06 12:14:18 +0000 (Fri, 06 Jun 2014)
New Revision: 17048
Modified:
trunk/packages/imagevis3d/trunk/debian/control
trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch
trunk/packages/imagevis3d/trunk/debian/patches/series
Log:
fix compilation
Modified: trunk/packages/imagevis3d/trunk/debian/control
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/control 2014-06-06 08:40:12 UTC (rev 17047)
+++ trunk/packages/imagevis3d/trunk/debian/control 2014-06-06 12:14:18 UTC (rev 17048)
@@ -17,7 +17,7 @@
libqt4-dev,
libqt4-opengl-dev,
libtclap-dev,
- libtiff-dev,
+ libtiff5-dev | libtiff-dev,
libz-dev,
qt4-qmake
Standards-Version: 3.9.5
Modified: trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2014-06-06 08:40:12 UTC (rev 17047)
+++ trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2014-06-06 12:14:18 UTC (rev 17048)
@@ -4,8 +4,8 @@
Index: ImageVis3D-3.1.0/Tuvok/IO/scio.pro
===================================================================
---- ImageVis3D-3.1.0.orig/Tuvok/IO/scio.pro 2014-04-10 17:51:10.000000000 +0200
-+++ ImageVis3D-3.1.0/Tuvok/IO/scio.pro 2014-04-10 17:51:12.000000000 +0200
+--- ImageVis3D-3.1.0.orig/Tuvok/IO/scio.pro 2014-06-06 13:03:05.991119825 +0200
++++ ImageVis3D-3.1.0/Tuvok/IO/scio.pro 2014-06-06 13:04:46.507121863 +0200
@@ -36,13 +36,6 @@
# Input
@@ -92,8 +92,8 @@
./AnalyzeConverter.h \
Index: ImageVis3D-3.1.0/Tuvok/tvk.pro
===================================================================
---- ImageVis3D-3.1.0.orig/Tuvok/tvk.pro 2014-04-10 17:51:10.000000000 +0200
-+++ ImageVis3D-3.1.0/Tuvok/tvk.pro 2014-04-10 17:51:12.000000000 +0200
+--- ImageVis3D-3.1.0.orig/Tuvok/tvk.pro 2014-06-06 13:03:05.991119825 +0200
++++ ImageVis3D-3.1.0/Tuvok/tvk.pro 2014-06-06 13:05:29.403122733 +0200
@@ -63,33 +63,6 @@
# Input
@@ -243,36 +243,19 @@
IO/3rdParty/jpeglib/cdjpeg.c \
IO/3rdParty/jpeglib/jcapimin.c \
IO/3rdParty/jpeglib/jcapistd.c \
-@@ -463,66 +349,6 @@
+@@ -463,8 +349,6 @@
IO/3rdParty/jpeglib/rdcolmap.c \
IO/3rdParty/jpeglib/rdswitch.c \
IO/3rdParty/jpeglib/transupp.c \
- IO/3rdParty/lz4/lz4.c \
- IO/3rdParty/lz4/lz4hc.c \
-- IO/3rdParty/lzham/lzham_api.cpp \
-- IO/3rdParty/lzham/lzham_assert.cpp \
-- IO/3rdParty/lzham/lzham_checksum.cpp \
-- IO/3rdParty/lzham/lzham_huffman_codes.cpp \
-- IO/3rdParty/lzham/lzham_lib.cpp \
-- IO/3rdParty/lzham/lzham_lzbase.cpp \
-- IO/3rdParty/lzham/lzham_lzcomp.cpp \
-- IO/3rdParty/lzham/lzham_lzcomp_internal.cpp \
-- IO/3rdParty/lzham/lzham_lzcomp_state.cpp \
-- IO/3rdParty/lzham/lzham_lzdecompbase.cpp \
-- IO/3rdParty/lzham/lzham_lzdecomp.cpp \
-- IO/3rdParty/lzham/lzham_match_accel.cpp \
-- IO/3rdParty/lzham/lzham_mem.cpp \
-- IO/3rdParty/lzham/lzham_platform.cpp \
-- IO/3rdParty/lzham/lzham_polar_codes.cpp \
-- IO/3rdParty/lzham/lzham_prefix_coding.cpp \
-- IO/3rdParty/lzham/lzham_pthreads_threading.cpp \
-- IO/3rdParty/lzham/lzham_symbol_codec.cpp \
-- 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/3rdParty/lzham/lzham_api.cpp \
+ IO/3rdParty/lzham/lzham_assert.cpp \
+ IO/3rdParty/lzham/lzham_checksum.cpp \
+@@ -489,40 +373,6 @@
+ IO/3rdParty/lzma/LzFind.c \
+ IO/3rdParty/lzma/LzmaDec.c \
+ IO/3rdParty/lzma/LzmaEnc.c \
- IO/3rdParty/tiff/tif_aux.c \
- IO/3rdParty/tiff/tif_close.c \
- IO/3rdParty/tiff/tif_codec.c \
@@ -310,3 +293,13 @@
IO/AbstrConverter.cpp \
IO/AbstrGeoConverter.cpp \
IO/AmiraConverter.cpp \
+@@ -648,8 +498,7 @@
+ unix:SOURCES += \
+ Basics/LargeFileAIO.cpp \
+ Basics/LargeFileFD.cpp \
+- Basics/LargeFileMMap.cpp \
+- IO/3rdParty/tiff/tif_unix.c
++ Basics/LargeFileMMap.cpp
+
+ win32 {
+ HEADERS += \
Modified: trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch 2014-06-06 08:40:12 UTC (rev 17047)
+++ trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch 2014-06-06 12:14:18 UTC (rev 17048)
@@ -4,21 +4,21 @@
Index: ImageVis3D-3.1.0/Tuvok/tvk.pro
===================================================================
---- ImageVis3D-3.1.0.orig/Tuvok/tvk.pro 2014-05-30 15:25:51.000000000 +0200
-+++ ImageVis3D-3.1.0/Tuvok/tvk.pro 2014-05-30 15:47:40.034370295 +0200
+--- ImageVis3D-3.1.0.orig/Tuvok/tvk.pro 2014-06-06 13:22:31.959143468 +0200
++++ ImageVis3D-3.1.0/Tuvok/tvk.pro 2014-06-06 13:22:31.991143470 +0200
@@ -19,7 +19,7 @@
QT += opengl
QMAKE_LIBDIR += IO/expressions
LIBS = -ltuvokexpr
-unix:LIBS += -lz -lpthread
-+unix:LIBS += -lz -lpthread -fopenmp
++unix:LIBS += -lz -lpthread -fopenmp -llz4
unix:LIBS += -llua5.2
win32:LIBS += shlwapi.lib
unix:QMAKE_CXXFLAGS += -std=c++0x
Index: ImageVis3D-3.1.0/Tuvok/test/render/render.pro
===================================================================
---- ImageVis3D-3.1.0.orig/Tuvok/test/render/render.pro 2014-05-30 15:25:51.000000000 +0200
-+++ ImageVis3D-3.1.0/Tuvok/test/render/render.pro 2014-05-30 15:47:40.034370295 +0200
+--- ImageVis3D-3.1.0.orig/Tuvok/test/render/render.pro 2014-06-06 13:22:31.959143468 +0200
++++ ImageVis3D-3.1.0/Tuvok/test/render/render.pro 2014-06-06 13:22:31.991143470 +0200
@@ -13,7 +13,7 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
@@ -30,8 +30,8 @@
# Try to link to GLU statically.
Index: ImageVis3D-3.1.0/Tuvok/test/shaders/shaders.pro
===================================================================
---- ImageVis3D-3.1.0.orig/Tuvok/test/shaders/shaders.pro 2014-05-30 15:25:51.000000000 +0200
-+++ ImageVis3D-3.1.0/Tuvok/test/shaders/shaders.pro 2014-05-30 15:47:40.034370295 +0200
+--- ImageVis3D-3.1.0.orig/Tuvok/test/shaders/shaders.pro 2014-06-06 13:22:31.959143468 +0200
++++ ImageVis3D-3.1.0/Tuvok/test/shaders/shaders.pro 2014-06-06 13:22:31.991143470 +0200
@@ -12,7 +12,7 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
@@ -43,8 +43,8 @@
unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
Index: ImageVis3D-3.1.0/Tuvok/test/context/context.pro
===================================================================
---- ImageVis3D-3.1.0.orig/Tuvok/test/context/context.pro 2014-05-30 15:25:51.000000000 +0200
-+++ ImageVis3D-3.1.0/Tuvok/test/context/context.pro 2014-05-30 15:47:40.034370295 +0200
+--- ImageVis3D-3.1.0.orig/Tuvok/test/context/context.pro 2014-06-06 13:22:31.959143468 +0200
++++ ImageVis3D-3.1.0/Tuvok/test/context/context.pro 2014-06-06 13:22:31.991143470 +0200
@@ -12,7 +12,7 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
@@ -56,14 +56,56 @@
# Try to link to GLU statically.
Index: ImageVis3D-3.1.0/ImageVis3D/ImageVis3D.pro
===================================================================
---- ImageVis3D-3.1.0.orig/ImageVis3D/ImageVis3D.pro 2014-05-30 15:25:51.000000000 +0200
-+++ ImageVis3D-3.1.0/ImageVis3D/ImageVis3D.pro 2014-05-30 15:47:40.034370295 +0200
+--- ImageVis3D-3.1.0.orig/ImageVis3D/ImageVis3D.pro 2014-06-06 13:22:31.959143468 +0200
++++ ImageVis3D-3.1.0/ImageVis3D/ImageVis3D.pro 2014-06-06 13:22:31.991143470 +0200
@@ -20,7 +20,7 @@
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
unix:LIBS += -lz
-unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
-+unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2 -fopenmp
++unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2 -fopenmp -llz4
win32:LIBS += shlwapi.lib
macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
+Index: ImageVis3D-3.1.0/CmdLineConverter/CmdLineConverter.pro
+===================================================================
+--- ImageVis3D-3.1.0.orig/CmdLineConverter/CmdLineConverter.pro 2014-06-06 13:22:31.959143468 +0200
++++ ImageVis3D-3.1.0/CmdLineConverter/CmdLineConverter.pro 2014-06-06 13:22:31.991143470 +0200
+@@ -17,7 +17,7 @@
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS += -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
+-unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
++unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2 -llz4
+ win32:LIBS += shlwapi.lib
+ macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
+ macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
+Index: ImageVis3D-3.1.0/UVFReader/UVFReader.pro
+===================================================================
+--- ImageVis3D-3.1.0.orig/UVFReader/UVFReader.pro 2014-06-06 13:22:31.959143468 +0200
++++ ImageVis3D-3.1.0/UVFReader/UVFReader.pro 2014-06-06 13:22:31.991143470 +0200
+@@ -17,7 +17,7 @@
+ QMAKE_LIBDIR += ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
+-unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
++unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2 -llz4
+ win32:LIBS += shlwapi.lib
+ QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
+ unix:QMAKE_CXXFLAGS += -std=c++0x
+Index: ImageVis3D-3.1.0/BatchRenderer/BatchRenderer.pro
+===================================================================
+--- ImageVis3D-3.1.0.orig/BatchRenderer/BatchRenderer.pro 2014-04-07 14:51:47.000000000 +0200
++++ ImageVis3D-3.1.0/BatchRenderer/BatchRenderer.pro 2014-06-06 14:13:03.787204952 +0200
+@@ -7,9 +7,10 @@
+ INCLUDEPATH += ../Tuvok/Basics/3rdParty
+ INCLUDEPATH += ../Tuvok/3rdParty/GLEW
+ INCLUDEPATH += ../Tuvok/IO/3rdParty/boost/
++INCLUDEPATH += /usr/include/lua5.2
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -llz4 -lbz2
+ !macx:unix:QMAKE_LFLAGS += -fopenmp
+
+ # Operating system definitions now in the makefile instead of
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2014-06-06 08:40:12 UTC (rev 17047)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2014-06-06 12:14:18 UTC (rev 17048)
@@ -8,5 +8,5 @@
fixcomp.patch
systemlua.patch
#linkjpeg.patch
+typos.patch
fopenmp.patch
-typos.patch
More information about the debian-med-commit
mailing list