[med-svn] r15683 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Tue Dec 31 08:32:21 UTC 2013
Author: malat
Date: 2013-12-31 08:32:21 +0000 (Tue, 31 Dec 2013)
New Revision: 15683
Modified:
trunk/packages/imagevis3d/trunk/debian/changelog
trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch
trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch
trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch
trunk/packages/imagevis3d/trunk/debian/patches/series
trunk/packages/imagevis3d/trunk/debian/patches/typos.patch
Log:
Work toward 688614
Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog 2013-12-31 08:13:51 UTC (rev 15682)
+++ trunk/packages/imagevis3d/trunk/debian/changelog 2013-12-31 08:32:21 UTC (rev 15683)
@@ -1,3 +1,9 @@
+imagevis3d (3.0.0-3) UNRELEASED; urgency=low
+
+ * Use internal JPEG implementation. Closes: #688614
+
+ -- Mathieu Malaterre <malat at debian.org> Tue, 31 Dec 2013 09:32:00 +0100
+
imagevis3d (3.0.0-2) unstable; urgency=low
* fix kfreebsd compilation. Closes: #697015
Modified: trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2013-12-31 08:13:51 UTC (rev 15682)
+++ trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2013-12-31 08:32:21 UTC (rev 15683)
@@ -4,8 +4,8 @@
Index: imagevis3d-3.0.0/Tuvok/tvk.pro
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/tvk.pro 2012-10-24 20:18:29.000000000 +0200
-+++ imagevis3d-3.0.0/Tuvok/tvk.pro 2012-10-28 09:40:20.549511620 +0100
+--- imagevis3d-3.0.0.orig/Tuvok/tvk.pro 2013-12-31 09:10:31.000000000 +0100
++++ imagevis3d-3.0.0/Tuvok/tvk.pro 2013-12-31 09:24:02.000000000 +0100
@@ -60,33 +60,6 @@
# Input
@@ -40,28 +40,18 @@
Basics/Appendix.h \
Basics/ArcBall.h \
Basics/Checksums/crc32.h \
-@@ -118,34 +91,6 @@
+@@ -118,7 +91,6 @@
DebugOut/ConsoleOut.h \
DebugOut/MultiplexOut.h \
DebugOut/TextfileOut.h \
- IO/3rdParty/bzip2/bzlib_private.h \
-- IO/3rdParty/jpeglib/cderror.h \
-- IO/3rdParty/jpeglib/cdjpeg.h \
-- IO/3rdParty/jpeglib/jchuff.h \
-- IO/3rdParty/jpeglib/jconfig.h \
-- IO/3rdParty/jpeglib/jdct.h \
-- IO/3rdParty/jpeglib/jdhuff.h \
-- IO/3rdParty/jpeglib/jerror.h \
-- IO/3rdParty/jpeglib/jinclude.h \
-- IO/3rdParty/jpeglib/jlossls.h \
-- IO/3rdParty/jpeglib/jlossy.h \
-- IO/3rdParty/jpeglib/jmemsys.h \
-- IO/3rdParty/jpeglib/jmorecfg.h \
-- IO/3rdParty/jpeglib/jpegint.h \
-- IO/3rdParty/jpeglib/jpeglib.h \
-- IO/3rdParty/jpeglib/jversion.h \
-- IO/3rdParty/jpeglib/mangle_jpeg.h \
-- IO/3rdParty/jpeglib/transupp.h \
+ IO/3rdParty/jpeglib/cderror.h \
+ IO/3rdParty/jpeglib/cdjpeg.h \
+ IO/3rdParty/jpeglib/jchuff.h \
+@@ -136,16 +108,6 @@
+ IO/3rdParty/jpeglib/jversion.h \
+ IO/3rdParty/jpeglib/mangle_jpeg.h \
+ IO/3rdParty/jpeglib/transupp.h \
- IO/3rdParty/tiff/t4.h \
- IO/3rdParty/tiff/tif_dir.h \
- IO/3rdParty/tiff/tif_fax3.h \
@@ -75,7 +65,7 @@
IO/AbstrConverter.h \
IO/AmiraConverter.h \
IO/AnalyzeConverter.h \
-@@ -283,39 +228,6 @@
+@@ -283,39 +245,6 @@
Basics/LargeFileMMap.h
SOURCES += \
@@ -115,7 +105,7 @@
Basics/Appendix.cpp \
Basics/ArcBall.cpp \
Basics/Checksums/MD5.cpp \
-@@ -340,114 +252,6 @@
+@@ -340,13 +269,6 @@
DebugOut/ConsoleOut.cpp \
DebugOut/MultiplexOut.cpp \
DebugOut/TextfileOut.cpp \
@@ -126,71 +116,13 @@
- IO/3rdParty/bzip2/decompress.c \
- IO/3rdParty/bzip2/huffman.c \
- IO/3rdParty/bzip2/randtable.c \
-- IO/3rdParty/jpeglib/cdjpeg.c \
-- IO/3rdParty/jpeglib/jcapimin.c \
-- IO/3rdParty/jpeglib/jcapistd.c \
-- IO/3rdParty/jpeglib/jccoefct.c \
-- IO/3rdParty/jpeglib/jccolor.c \
-- IO/3rdParty/jpeglib/jcdctmgr.c \
-- IO/3rdParty/jpeglib/jcdiffct.c \
-- IO/3rdParty/jpeglib/jchuff.c \
-- IO/3rdParty/jpeglib/jcinit.c \
-- IO/3rdParty/jpeglib/jclhuff.c \
-- IO/3rdParty/jpeglib/jclossls.c \
-- IO/3rdParty/jpeglib/jclossy.c \
-- IO/3rdParty/jpeglib/jcmainct.c \
-- IO/3rdParty/jpeglib/jcmarker.c \
-- IO/3rdParty/jpeglib/jcmaster.c \
-- IO/3rdParty/jpeglib/jcodec.c \
-- IO/3rdParty/jpeglib/jcomapi.c \
-- IO/3rdParty/jpeglib/jcparam.c \
-- IO/3rdParty/jpeglib/jcphuff.c \
-- IO/3rdParty/jpeglib/jcpred.c \
-- IO/3rdParty/jpeglib/jcprepct.c \
-- IO/3rdParty/jpeglib/jcsample.c \
-- IO/3rdParty/jpeglib/jcscale.c \
-- IO/3rdParty/jpeglib/jcshuff.c \
-- IO/3rdParty/jpeglib/jctrans.c \
-- IO/3rdParty/jpeglib/jdapimin.c \
-- IO/3rdParty/jpeglib/jdapistd.c \
-- IO/3rdParty/jpeglib/jdatadst.c \
-- IO/3rdParty/jpeglib/jdatasrc.c \
-- IO/3rdParty/jpeglib/jdcoefct.c \
-- IO/3rdParty/jpeglib/jdcolor.c \
-- IO/3rdParty/jpeglib/jddctmgr.c \
-- IO/3rdParty/jpeglib/jddiffct.c \
-- IO/3rdParty/jpeglib/jdhuff.c \
-- IO/3rdParty/jpeglib/jdinput.c \
-- IO/3rdParty/jpeglib/jdlhuff.c \
-- IO/3rdParty/jpeglib/jdlossls.c \
-- IO/3rdParty/jpeglib/jdlossy.c \
-- IO/3rdParty/jpeglib/jdmainct.c \
-- IO/3rdParty/jpeglib/jdmarker.c \
-- IO/3rdParty/jpeglib/jdmaster.c \
-- IO/3rdParty/jpeglib/jdmerge.c \
-- IO/3rdParty/jpeglib/jdphuff.c \
-- IO/3rdParty/jpeglib/jdpostct.c \
-- IO/3rdParty/jpeglib/jdpred.c \
-- IO/3rdParty/jpeglib/jdsample.c \
-- IO/3rdParty/jpeglib/jdscale.c \
-- IO/3rdParty/jpeglib/jdshuff.c \
-- IO/3rdParty/jpeglib/jdtrans.c \
-- IO/3rdParty/jpeglib/jerror.c \
-- IO/3rdParty/jpeglib/jfdctflt.c \
-- IO/3rdParty/jpeglib/jfdctfst.c \
-- IO/3rdParty/jpeglib/jfdctint.c \
-- IO/3rdParty/jpeglib/jidctflt.c \
-- IO/3rdParty/jpeglib/jidctfst.c \
-- IO/3rdParty/jpeglib/jidctint.c \
-- IO/3rdParty/jpeglib/jidctred.c \
-- IO/3rdParty/jpeglib/jmemmgr.c \
-- IO/3rdParty/jpeglib/jmemnobs.c \
-- IO/3rdParty/jpeglib/jquant1.c \
-- IO/3rdParty/jpeglib/jquant2.c \
-- IO/3rdParty/jpeglib/jutils.c \
-- IO/3rdParty/jpeglib/rdcolmap.c \
-- IO/3rdParty/jpeglib/rdswitch.c \
-- IO/3rdParty/jpeglib/transupp.c \
+ IO/3rdParty/jpeglib/cdjpeg.c \
+ IO/3rdParty/jpeglib/jcapimin.c \
+ IO/3rdParty/jpeglib/jcapistd.c \
+@@ -412,42 +334,6 @@
+ IO/3rdParty/jpeglib/rdcolmap.c \
+ IO/3rdParty/jpeglib/rdswitch.c \
+ IO/3rdParty/jpeglib/transupp.c \
- IO/3rdParty/tiff/tif_aux.c \
- IO/3rdParty/tiff/tif_close.c \
- IO/3rdParty/tiff/tif_codec.c \
@@ -230,7 +162,7 @@
IO/AbstrConverter.cpp \
IO/AmiraConverter.cpp \
IO/AnalyzeConverter.cpp \
-@@ -564,7 +368,6 @@
+@@ -564,7 +450,6 @@
Basics/LargeFileAIO.cpp \
Basics/LargeFileFD.cpp \
Basics/LargeFileMMap.cpp \
@@ -238,7 +170,7 @@
win32 {
HEADERS += \
-@@ -581,7 +384,6 @@
+@@ -581,7 +466,6 @@
SOURCES += \
Basics/DynamicDX.cpp \
@@ -248,9 +180,9 @@
Renderer/DX/DXSBVR.cpp \
Index: imagevis3d-3.0.0/Tuvok/IO/scio.pro
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/IO/scio.pro 2012-10-24 20:18:35.000000000 +0200
-+++ imagevis3d-3.0.0/Tuvok/IO/scio.pro 2012-10-28 09:40:20.549511620 +0100
-@@ -36,113 +36,6 @@
+--- imagevis3d-3.0.0.orig/Tuvok/IO/scio.pro 2013-12-31 09:24:24.000000000 +0100
++++ imagevis3d-3.0.0/Tuvok/IO/scio.pro 2013-12-31 09:25:53.000000000 +0100
+@@ -36,13 +36,6 @@
# Input
SOURCES += \
@@ -261,72 +193,13 @@
- ./3rdParty/bzip2/decompress.c \
- ./3rdParty/bzip2/huffman.c \
- ./3rdParty/bzip2/randtable.c \
-- ./3rdParty/jpeglib/cdjpeg.c \
-- ./3rdParty/jpeglib/jcapimin.c \
-- ./3rdParty/jpeglib/jcapistd.c \
-- ./3rdParty/jpeglib/jccoefct.c \
-- ./3rdParty/jpeglib/jccolor.c \
-- ./3rdParty/jpeglib/jcdctmgr.c \
-- ./3rdParty/jpeglib/jcdiffct.c \
-- ./3rdParty/jpeglib/jchuff.c \
-- ./3rdParty/jpeglib/jcinit.c \
-- ./3rdParty/jpeglib/jclhuff.c \
-- ./3rdParty/jpeglib/jclossls.c \
-- ./3rdParty/jpeglib/jclossy.c \
-- ./3rdParty/jpeglib/jcmainct.c \
-- ./3rdParty/jpeglib/jcmarker.c \
-- ./3rdParty/jpeglib/jcmaster.c \
-- ./3rdParty/jpeglib/jcodec.c \
-- ./3rdParty/jpeglib/jcomapi.c \
-- ./3rdParty/jpeglib/jcparam.c \
-- ./3rdParty/jpeglib/jcphuff.c \
-- ./3rdParty/jpeglib/jcpred.c \
-- ./3rdParty/jpeglib/jcprepct.c \
-- ./3rdParty/jpeglib/jcsample.c \
-- ./3rdParty/jpeglib/jcscale.c \
-- ./3rdParty/jpeglib/jcshuff.c \
-- ./3rdParty/jpeglib/jctrans.c \
-- ./3rdParty/jpeglib/jdapimin.c \
-- ./3rdParty/jpeglib/jdapistd.c \
-- ./3rdParty/jpeglib/jdatadst.c \
-- ./3rdParty/jpeglib/jdatasrc.c \
-- ./3rdParty/jpeglib/jdcoefct.c \
-- ./3rdParty/jpeglib/jdcolor.c \
-- ./3rdParty/jpeglib/jddctmgr.c \
-- ./3rdParty/jpeglib/jddiffct.c \
-- ./3rdParty/jpeglib/jdhuff.c \
-- ./3rdParty/jpeglib/jdinput.c \
-- ./3rdParty/jpeglib/jdlhuff.c \
-- ./3rdParty/jpeglib/jdlossls.c \
-- ./3rdParty/jpeglib/jdlossy.c \
-- ./3rdParty/jpeglib/jdmainct.c \
-- ./3rdParty/jpeglib/jdmarker.c \
-- ./3rdParty/jpeglib/jdmaster.c \
-- ./3rdParty/jpeglib/jdmerge.c \
-- ./3rdParty/jpeglib/jdphuff.c \
-- ./3rdParty/jpeglib/jdpostct.c \
-- ./3rdParty/jpeglib/jdpred.c \
-- ./3rdParty/jpeglib/jdsample.c \
-- ./3rdParty/jpeglib/jdscale.c \
-- ./3rdParty/jpeglib/jdshuff.c \
-- ./3rdParty/jpeglib/jdtrans.c \
-- ./3rdParty/jpeglib/jerror.c \
-- ./3rdParty/jpeglib/jfdctflt.c \
-- ./3rdParty/jpeglib/jfdctfst.c \
-- ./3rdParty/jpeglib/jfdctint.c \
-- ./3rdParty/jpeglib/jidctflt.c \
-- ./3rdParty/jpeglib/jidctfst.c \
-- ./3rdParty/jpeglib/jidctint.c \
-- ./3rdParty/jpeglib/jidctred.c \
-- ./3rdParty/jpeglib/jmemmgr.c \
-- ./3rdParty/jpeglib/jmemnobs.c \
-- ./3rdParty/jpeglib/jmemsrc.c \
-- ./3rdParty/jpeglib/jquant1.c \
-- ./3rdParty/jpeglib/jquant2.c \
-- ./3rdParty/jpeglib/jutils.c \
-- ./3rdParty/jpeglib/rdcolmap.c \
-- ./3rdParty/jpeglib/rdswitch.c \
-- ./3rdParty/jpeglib/transupp.c \
+ ./3rdParty/jpeglib/cdjpeg.c \
+ ./3rdParty/jpeglib/jcapimin.c \
+ ./3rdParty/jpeglib/jcapistd.c \
+@@ -109,40 +102,6 @@
+ ./3rdParty/jpeglib/rdcolmap.c \
+ ./3rdParty/jpeglib/rdswitch.c \
+ ./3rdParty/jpeglib/transupp.c \
- ./3rdParty/tiff/tif_aux.c \
- ./3rdParty/tiff/tif_close.c \
- ./3rdParty/tiff/tif_codec.c \
@@ -364,29 +237,19 @@
./AbstrConverter.cpp \
./AbstrGeoConverter.cpp \
./AnalyzeConverter.cpp \
-@@ -201,38 +94,6 @@
+@@ -201,8 +160,6 @@
./VGStudioConverter.cpp
HEADERS += \
- ./3rdParty/bzip2/bzlib.h \
- ./3rdParty/bzip2/bzlib_private.h \
-- ./3rdParty/jpeglib/cderror.h \
-- ./3rdParty/jpeglib/cdjpeg.h \
-- ./3rdParty/jpeglib/jchuff.h \
-- ./3rdParty/jpeglib/jconfig.h \
-- ./3rdParty/jpeglib/jdct.h \
-- ./3rdParty/jpeglib/jdhuff.h \
-- ./3rdParty/jpeglib/jerror.h \
-- ./3rdParty/jpeglib/jinclude.h \
-- ./3rdParty/jpeglib/jlossls.h \
-- ./3rdParty/jpeglib/jlossy.h \
-- ./3rdParty/jpeglib/jmemsys.h \
-- ./3rdParty/jpeglib/jmorecfg.h \
-- ./3rdParty/jpeglib/jpegint.h \
-- ./3rdParty/jpeglib/jpeglib.h \
-- ./3rdParty/jpeglib/jversion.h \
-- ./3rdParty/jpeglib/mangle_jpeg.h \
-- ./3rdParty/jpeglib/transupp.h \
+ ./3rdParty/jpeglib/cderror.h \
+ ./3rdParty/jpeglib/cdjpeg.h \
+ ./3rdParty/jpeglib/jchuff.h \
+@@ -220,19 +177,6 @@
+ ./3rdParty/jpeglib/jversion.h \
+ ./3rdParty/jpeglib/mangle_jpeg.h \
+ ./3rdParty/jpeglib/transupp.h \
- ./3rdParty/tiff/t4.h \
- ./3rdParty/tiff/tif_config.h \
- ./3rdParty/tiff/tif_dir.h \
Modified: trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch 2013-12-31 08:13:51 UTC (rev 15682)
+++ trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch 2013-12-31 08:32:21 UTC (rev 15683)
@@ -1,5 +1,6 @@
Description: truncate() prototype was missing
Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
Index: imagevis3d-2.1.1/Tuvok/Basics/LargeFile.cpp
===================================================================
Modified: trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch 2013-12-31 08:13:51 UTC (rev 15682)
+++ trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch 2013-12-31 08:32:21 UTC (rev 15683)
@@ -1,59 +1,63 @@
+Description: Make sure to add -fopenmp flag
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
Index: imagevis3d-3.0.0/Tuvok/tvk.pro
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/tvk.pro 2013-09-05 17:40:49.058639521 +0200
-+++ imagevis3d-3.0.0/Tuvok/tvk.pro 2013-09-05 17:41:44.722639484 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/tvk.pro 2013-12-31 09:26:38.000000000 +0100
++++ imagevis3d-3.0.0/Tuvok/tvk.pro 2013-12-31 09:27:50.000000000 +0100
@@ -18,7 +18,7 @@
QT += opengl
QMAKE_LIBDIR += IO/expressions
LIBS = -ltuvokexpr
--unix:LIBS += -lz -lpthread -ljpeg
-+unix:LIBS += -lz -lpthread -ljpeg -fopenmp
+-unix:LIBS += -lz -lpthread
++unix:LIBS += -lz -lpthread -fopenmp
unix:LIBS += -llua5.2
win32:LIBS += shlwapi.lib
unix:QMAKE_CXXFLAGS += -std=c++0x
Index: imagevis3d-3.0.0/Tuvok/test/render/render.pro
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/test/render/render.pro 2013-09-05 17:43:59.442639395 +0200
-+++ imagevis3d-3.0.0/Tuvok/test/render/render.pro 2013-09-05 17:44:04.290639392 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/test/render/render.pro 2013-12-31 09:26:38.000000000 +0100
++++ imagevis3d-3.0.0/Tuvok/test/render/render.pro 2013-12-31 09:28:11.000000000 +0100
@@ -13,7 +13,7 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
QT += opengl
--LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lbz2 -lGLEW -ltiff -ljpeg
-+LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lbz2 -lGLEW -ltiff -ljpeg -fopenmp
+-LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lbz2 -lGLEW -ltiff
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lbz2 -lGLEW -ltiff -fopenmp
unix:LIBS += -lGL -lX11 -llua5.2
unix:!macx:LIBS += -lGLU
# Try to link to GLU statically.
Index: imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/test/shaders/shaders.pro 2013-09-05 17:44:45.850639365 +0200
-+++ imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro 2013-09-05 17:44:51.990639361 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/test/shaders/shaders.pro 2013-12-31 09:26:38.000000000 +0100
++++ imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro 2013-12-31 09:28:49.000000000 +0100
@@ -12,7 +12,7 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
QT += opengl
--LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -ltiff -lbz2 -lGLEW -ljpeg
-+LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -ltiff -lbz2 -lGLEW -ljpeg -fopenmp
+-LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -ltiff -lbz2 -lGLEW
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -ltiff -lbz2 -lGLEW -fopenmp
unix:LIBS += -lGL -lX11
unix:QMAKE_CXXFLAGS += -std=c++0x
unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
Index: imagevis3d-3.0.0/Tuvok/test/context/context.pro
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/test/context/context.pro 2013-09-05 17:45:22.698639339 +0200
-+++ imagevis3d-3.0.0/Tuvok/test/context/context.pro 2013-09-05 17:45:27.018639336 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/test/context/context.pro 2013-12-31 09:26:38.000000000 +0100
++++ imagevis3d-3.0.0/Tuvok/test/context/context.pro 2013-12-31 09:29:05.000000000 +0100
@@ -12,7 +12,7 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
QT += opengl
--LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -lbz2 -ljpeg
-+LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -lbz2 -ljpeg -fopenmp
+-LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -lbz2
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -lbz2 -fopenmp
unix:LIBS += -lGL -lX11
unix:!macx:LIBS += -lGLU
# Try to link to GLU statically.
Index: imagevis3d-3.0.0/CmdLineConverter/CmdLineConverter.pro
===================================================================
---- imagevis3d-3.0.0.orig/CmdLineConverter/CmdLineConverter.pro 2013-09-05 17:47:10.470639267 +0200
-+++ imagevis3d-3.0.0/CmdLineConverter/CmdLineConverter.pro 2013-09-05 17:47:14.514639266 +0200
+--- imagevis3d-3.0.0.orig/CmdLineConverter/CmdLineConverter.pro 2013-12-31 09:26:38.000000000 +0100
++++ imagevis3d-3.0.0/CmdLineConverter/CmdLineConverter.pro 2013-12-31 09:26:47.000000000 +0100
@@ -15,7 +15,7 @@
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
@@ -65,8 +69,8 @@
macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
Index: imagevis3d-3.0.0/ImageVis3D/ImageVis3D.pro
===================================================================
---- imagevis3d-3.0.0.orig/ImageVis3D/ImageVis3D.pro 2013-09-05 17:46:42.518639286 +0200
-+++ imagevis3d-3.0.0/ImageVis3D/ImageVis3D.pro 2013-09-05 17:46:48.234639282 +0200
+--- imagevis3d-3.0.0.orig/ImageVis3D/ImageVis3D.pro 2013-12-31 09:26:38.000000000 +0100
++++ imagevis3d-3.0.0/ImageVis3D/ImageVis3D.pro 2013-12-31 09:26:47.000000000 +0100
@@ -20,7 +20,7 @@
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
@@ -78,8 +82,8 @@
macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
Index: imagevis3d-3.0.0/UVFReader/UVFReader.pro
===================================================================
---- imagevis3d-3.0.0.orig/UVFReader/UVFReader.pro 2013-09-05 17:47:57.442639236 +0200
-+++ imagevis3d-3.0.0/UVFReader/UVFReader.pro 2013-09-05 17:48:01.342639233 +0200
+--- imagevis3d-3.0.0.orig/UVFReader/UVFReader.pro 2013-12-31 09:26:38.000000000 +0100
++++ imagevis3d-3.0.0/UVFReader/UVFReader.pro 2013-12-31 09:26:47.000000000 +0100
@@ -12,7 +12,7 @@
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
Modified: trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch 2013-12-31 08:13:51 UTC (rev 15682)
+++ trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch 2013-12-31 08:32:21 UTC (rev 15683)
@@ -1,3 +1,7 @@
+Description: Add missing -ljpeg link
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
Index: imagevis3d-3.0.0/Tuvok/tvk.pro
===================================================================
--- imagevis3d-3.0.0.orig/Tuvok/tvk.pro 2013-09-05 17:23:13.410640225 +0200
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2013-12-31 08:13:51 UTC (rev 15682)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2013-12-31 08:32:21 UTC (rev 15683)
@@ -1,13 +1,13 @@
convenientlibs.patch
systemglew.patch
systemzlib.patch
-systemjpeg.patch
+#systemjpeg.patch
systembzip2.patch
systemtiff.patch
kfreebsd.patch
fixcomp.patch
systemlua.patch
kfreebsd2.patch
-linkjpeg.patch
+#linkjpeg.patch
fopenmp.patch
typos.patch
Modified: trunk/packages/imagevis3d/trunk/debian/patches/typos.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/typos.patch 2013-12-31 08:13:51 UTC (rev 15682)
+++ trunk/packages/imagevis3d/trunk/debian/patches/typos.patch 2013-12-31 08:32:21 UTC (rev 15683)
@@ -1,3 +1,7 @@
+Description: Fix typos reported by lintian
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
Index: imagevis3d-3.0.0/ImageVis3D/UI/UI/ImageVis3D.ui
===================================================================
--- imagevis3d-3.0.0.orig/ImageVis3D/UI/UI/ImageVis3D.ui 2013-09-05 17:48:54.194639198 +0200
More information about the debian-med-commit
mailing list