[med-svn] r8846 - trunk/packages/imagevis3d/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Thu Dec 8 21:09:19 UTC 2011
Author: malat-guest
Date: 2011-12-08 21:09:18 +0000 (Thu, 08 Dec 2011)
New Revision: 8846
Added:
trunk/packages/imagevis3d/trunk/debian/patches/boost.patch
trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch
trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch
trunk/packages/imagevis3d/trunk/debian/patches/glew.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch
trunk/packages/imagevis3d/trunk/debian/patches/libs.patch
trunk/packages/imagevis3d/trunk/debian/patches/libs2.patch
trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch
trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch
Modified:
trunk/packages/imagevis3d/trunk/debian/patches/series
Log:
redo the links
Added: trunk/packages/imagevis3d/trunk/debian/patches/boost.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/boost.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/boost.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,13 @@
+Index: imagevis3d-2.1.0/Tuvok/Basics/StdDefines.h
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/Basics/StdDefines.h 2011-12-08 18:02:32.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/Basics/StdDefines.h 2011-12-08 18:02:38.000000000 +0100
+@@ -39,7 +39,7 @@
+ #ifndef STDDEFINES_H
+ #define STDDEFINES_H
+
+-#include "3rdParty/boost/cstdint.hpp"
++#include "boost/cstdint.hpp"
+ #undef UINT32
+
+ typedef boost::uint64_t UINT64;
Added: trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,154 @@
+Index: imagevis3d-2.1.0/Tuvok/tvk.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/tvk.pro 2011-12-08 18:06:06.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/tvk.pro 2011-12-08 18:06:39.000000000 +0100
+@@ -72,34 +72,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/tiff/t4.h \
+- IO/3rdParty/tiff/tif_dir.h \
+- IO/3rdParty/tiff/tif_fax3.h \
+- IO/3rdParty/tiff/tiffconf.h \
+- IO/3rdParty/tiff/tiff.h \
+- IO/3rdParty/tiff/tiffio.h \
+- IO/3rdParty/tiff/tiffiop.h \
+- IO/3rdParty/tiff/tiffvers.h \
+- IO/3rdParty/tiff/tif_predict.h \
+- IO/3rdParty/tiff/uvcode.h \
+ IO/AbstrConverter.h \
+ IO/AnalyzeConverter.h \
+ IO/BOVConverter.h \
+@@ -220,114 +192,6 @@
+ DebugOut/ConsoleOut.cpp \
+ DebugOut/MultiplexOut.cpp \
+ DebugOut/TextfileOut.cpp \
+- IO/3rdParty/bzip2/blocksort.c \
+- IO/3rdParty/bzip2/bzlib.c \
+- IO/3rdParty/bzip2/compress.c \
+- IO/3rdParty/bzip2/crctable.c \
+- 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/tiff/tif_aux.c \
+- IO/3rdParty/tiff/tif_close.c \
+- IO/3rdParty/tiff/tif_codec.c \
+- IO/3rdParty/tiff/tif_color.c \
+- IO/3rdParty/tiff/tif_compress.c \
+- IO/3rdParty/tiff/tif_dir.c \
+- IO/3rdParty/tiff/tif_dirinfo.c \
+- IO/3rdParty/tiff/tif_dirread.c \
+- IO/3rdParty/tiff/tif_dirwrite.c \
+- IO/3rdParty/tiff/tif_dumpmode.c \
+- IO/3rdParty/tiff/tif_error.c \
+- IO/3rdParty/tiff/tif_extension.c \
+- IO/3rdParty/tiff/tif_fax3.c \
+- IO/3rdParty/tiff/tif_fax3sm.c \
+- IO/3rdParty/tiff/tif_flush.c \
+- IO/3rdParty/tiff/tif_getimage.c \
+- IO/3rdParty/tiff/tif_luv.c \
+- IO/3rdParty/tiff/tif_lzw.c \
+- IO/3rdParty/tiff/tif_next.c \
+- IO/3rdParty/tiff/tif_open.c \
+- IO/3rdParty/tiff/tif_packbits.c \
+- IO/3rdParty/tiff/tif_pixarlog.c \
+- IO/3rdParty/tiff/tif_predict.c \
+- IO/3rdParty/tiff/tif_print.c \
+- IO/3rdParty/tiff/tif_read.c \
+- IO/3rdParty/tiff/tif_strip.c \
+- IO/3rdParty/tiff/tif_swab.c \
+- IO/3rdParty/tiff/tif_thunder.c \
+- IO/3rdParty/tiff/tif_tile.c \
+- IO/3rdParty/tiff/tif_version.c \
+- IO/3rdParty/tiff/tif_warning.c \
+- IO/3rdParty/tiff/tif_write.c \
+- IO/3rdParty/tiff/tif_zip.c \
+- IO/3rdParty/tiff/tif_jbig.c \
+- IO/3rdParty/tiff/tif_jpeg.c \
+- IO/3rdParty/tiff/tif_ojpeg.c \
+ IO/AbstrConverter.cpp \
+ IO/AnalyzeConverter.cpp \
+ IO/BOVConverter.cpp \
Added: trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,13 @@
+Index: imagevis3d-2.1.0/Tuvok/IO/RAWConverter.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/RAWConverter.cpp 2011-12-08 18:11:45.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/RAWConverter.cpp 2011-12-08 18:12:00.000000000 +0100
+@@ -38,7 +38,7 @@
+ #include <cstring>
+ #include <iterator>
+ #include <list>
+-#include "3rdParty/bzip2/bzlib.h"
++#include "bzlib.h"
+ #include "boost/cstdint.hpp"
+
+ #include "RAWConverter.h"
Added: trunk/packages/imagevis3d/trunk/debian/patches/glew.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/glew.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/glew.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,61 @@
+Index: imagevis3d-2.1.0/Tuvok/tvk.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/tvk.pro 2011-12-08 18:03:14.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/tvk.pro 2011-12-08 18:03:23.000000000 +0100
+@@ -49,9 +49,6 @@
+
+ # Input
+ HEADERS += \
+- 3rdParty/GLEW/GL/glew.h \
+- 3rdParty/GLEW/GL/glxew.h \
+- 3rdParty/GLEW/GL/wglew.h \
+ Basics/Appendix.h \
+ Basics/ArcBall.h \
+ Basics/Checksums/crc32.h \
+@@ -205,7 +202,6 @@
+ Basics/LargeFileMMap.h
+
+ SOURCES += \
+- 3rdParty/GLEW/GL/glew.c \
+ Basics/Appendix.cpp \
+ Basics/ArcBall.cpp \
+ Basics/Checksums/MD5.cpp \
+Index: imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2011-12-08 18:03:55.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2011-12-08 18:04:27.000000000 +0100
+@@ -41,7 +41,7 @@
+ #include <deque>
+ #include <utility>
+ #include "../../StdTuvokDefines.h"
+-#include "3rdParty/GLEW/GL/glew.h"
++#include "GL/glew.h"
+ #include "Basics/Vectors.h"
+ #include "GPUMemManDataStructs.h"
+
+Index: imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2011-12-08 18:05:03.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2011-12-08 18:05:10.000000000 +0100
+@@ -49,7 +49,7 @@
+ #include <deque>
+ #include <string>
+ #include <vector>
+-#include "3rdParty/GLEW/GL/glew.h"
++#include "GL/glew.h"
+ #include "boost/noncopyable.hpp"
+ #include "Basics/Vectors.h"
+ #include "IO/Brick.h"
+Index: imagevis3d-2.1.0/Tuvok/Renderer/GL/GLInclude.h
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/Renderer/GL/GLInclude.h 2011-12-08 18:05:32.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/Renderer/GL/GLInclude.h 2011-12-08 18:05:42.000000000 +0100
+@@ -40,7 +40,7 @@
+ #define TUVOK_GLINCLUDE_H
+
+ #include "../../StdTuvokDefines.h"
+-#include "3rdParty/GLEW/GL/glew.h"
++#include "GL/glew.h"
+
+ #ifdef WIN32
+ #define NOMINMAX
Added: trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,22 @@
+Index: imagevis3d-2.1.0/Tuvok/IO/IOManager.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/IOManager.cpp 2011-12-08 18:10:13.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/IOManager.cpp 2011-12-08 18:11:01.000000000 +0100
+@@ -45,7 +45,7 @@
+ #include <map>
+ #include <memory>
+ #include "boost/cstdint.hpp"
+-#include "3rdParty/jpeglib/jconfig.h"
++#include "jconfig.h"
+
+ #include "IOManager.h"
+
+@@ -342,7 +342,7 @@
+
+ const char *jpeg_data = jpg.data();
+ copy(jpeg_data, jpeg_data + jpg.size(), &vData[0]);
+- pDICOMStack->m_iAllocated = BITS_IN_JSAMPLE;
++ pDICOMStack->m_iAllocated = 8; //BITS_IN_JSAMPLE;
+ } else {
+ pDICOMStack->m_Elements[j]->GetData(vData);
+ MESSAGE("Creating intermediate file %s\n%u%%",
Added: trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,36 @@
+Index: imagevis3d-2.1.0/Tuvok/IO/TuvokJPEG.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/TuvokJPEG.cpp 2011-12-08 21:45:30.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/TuvokJPEG.cpp 2011-12-08 21:46:39.000000000 +0100
+@@ -39,7 +39,7 @@
+ #include <fstream>
+ #include <iterator>
+ #include <vector>
+-#include "3rdParty/jpeglib/jpeglib.h"
++#include "jpeglib.h"
+ #include "TuvokJPEG.h"
+ #include "Controller/Controller.h"
+
+@@ -92,7 +92,7 @@
+ void set_data(const std::vector<char>& mem) {
+ this->data = mem;
+ this->jinfo.src->bytes_in_buffer = this->data.size();
+- this->jinfo.src->next_input_byte = &(this->data.at(0));
++ this->jinfo.src->next_input_byte = (const JOCTET*)&(this->data.at(0));
+ if(jpeg_read_header(&(this->jinfo), TRUE) != JPEG_HEADER_OK) {
+ T_ERROR("Could not read JPEG header, bailing...");
+ return;
+Index: imagevis3d-2.1.0/Tuvok/tvk.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/tvk.pro 2011-12-08 21:48:03.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/tvk.pro 2011-12-08 21:48:14.000000000 +0100
+@@ -278,8 +278,7 @@
+ Basics/LargeFile.cpp \
+ Basics/LargeFileAIO.cpp \
+ Basics/LargeFileFD.cpp \
+- Basics/LargeFileMMap.cpp \
+- IO/3rdParty/tiff/tif_unix.c
++ Basics/LargeFileMMap.cpp
+
+ win32 {
+ HEADERS += \
Added: trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,35 @@
+Index: imagevis3d-2.1.0/ImageVis3D/UI/QDataRadioButton.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/ImageVis3D/UI/QDataRadioButton.cpp 2011-12-08 21:56:41.000000000 +0100
++++ imagevis3d-2.1.0/ImageVis3D/UI/QDataRadioButton.cpp 2011-12-08 21:57:13.000000000 +0100
+@@ -39,7 +39,7 @@
+ #include <QtGui/QMouseEvent>
+ #include "../Tuvok/IO/TuvokJPEG.h"
+ #include "../Tuvok/IO/DICOM/DICOMParser.h"
+-#include "../Tuvok/IO/3rdParty/jpeglib/jconfig.h"
++#include "jconfig.h"
+
+ QDataRadioButton::QDataRadioButton(std::tr1::shared_ptr<FileStackInfo> stack,
+ QWidget *parent) :
+@@ -103,7 +103,7 @@
+ (m_stackInfo->m_Elements[i])->GetOffsetToData());
+ const char *jpg_data = jpg.data();
+ // JPEG library automagically downsamples the data.
+- m_stackInfo->m_iAllocated = BITS_IN_JSAMPLE;
++ m_stackInfo->m_iAllocated = 8; //BITS_IN_JSAMPLE;
+ vData.resize(jpg.size());
+ std::copy(jpg_data, jpg_data + jpg.size(), &vData[0]);
+ } else {
+Index: imagevis3d-2.1.0/ImageVis3D/UI/RenderWindowGL.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/ImageVis3D/UI/RenderWindowGL.cpp 2011-12-08 21:57:42.000000000 +0100
++++ imagevis3d-2.1.0/ImageVis3D/UI/RenderWindowGL.cpp 2011-12-08 21:57:48.000000000 +0100
+@@ -37,7 +37,7 @@
+
+ #include "../Tuvok/StdTuvokDefines.h"
+ #include <sstream>
+-#include <3rdParty/GLEW/GL/glew.h>
++#include <GL/glew.h>
+ #if defined(__GNUC__) && defined(DETECTED_OS_LINUX)
+ # pragma GCC visibility push(default)
+ #endif
Added: trunk/packages/imagevis3d/trunk/debian/patches/libs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/libs.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/libs.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,26 @@
+Index: imagevis3d-2.1.0/Tuvok/test/render/render.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/test/render/render.pro 2011-12-08 21:51:02.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/test/render/render.pro 2011-12-08 21:52:41.000000000 +0100
+@@ -12,7 +12,7 @@
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz
++LIBS += -lTuvok -ltuvokexpr -lz -lGLEW -ltiff -lbz2
+ macx:LIBS += -lX11 -lGL -framework CoreFoundation
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
+ unix:QMAKE_CFLAGS += -fno-strict-aliasing -g
+Index: imagevis3d-2.1.0/Tuvok/test/shaders/shaders.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/test/shaders/shaders.pro 2011-12-08 21:53:58.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/test/shaders/shaders.pro 2011-12-08 21:54:50.000000000 +0100
+@@ -11,7 +11,7 @@
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz
++LIBS += -lTuvok -ltuvokexpr -lz -lGLEW -ljpeg -ltiff
+ macx:LIBS += -lX11 -lGL -framework CoreFoundation
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
+ unix:QMAKE_CFLAGS += -fno-strict-aliasing -g
Added: trunk/packages/imagevis3d/trunk/debian/patches/libs2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/libs2.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/libs2.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,39 @@
+Index: imagevis3d-2.1.0/ImageVis3D/ImageVis3D.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/ImageVis3D/ImageVis3D.pro 2011-12-08 22:01:21.000000000 +0100
++++ imagevis3d-2.1.0/ImageVis3D/ImageVis3D.pro 2011-12-08 22:02:23.000000000 +0100
+@@ -22,7 +22,7 @@
+ QT += opengl network
+ LIBPATH += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+-unix:LIBS += -lz
++unix:LIBS += -lz -lGLEW -ljpeg -ltiff -lbz2
+ macx:LIBS +=-framework CoreFoundation
+ win32:LIBS += shlwapi.lib
+ RESOURCES = ImageVis3D.qrc
+Index: imagevis3d-2.1.0/CmdLineConverter/CmdLineConverter.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/CmdLineConverter/CmdLineConverter.pro 2011-12-08 22:02:59.000000000 +0100
++++ imagevis3d-2.1.0/CmdLineConverter/CmdLineConverter.pro 2011-12-08 22:05:49.000000000 +0100
+@@ -18,7 +18,7 @@
+ INCLUDEPATH += $$incpath
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+-unix:LIBS += -lz
++unix:LIBS += -lz -lGLEW -ljpeg -ltiff -lbz2
+ macx:LIBS += -framework CoreFoundation
+ win32:LIBS += shlwapi.lib
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+Index: imagevis3d-2.1.0/UVFReader/UVFReader.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/UVFReader/UVFReader.pro 2011-12-08 22:07:45.000000000 +0100
++++ imagevis3d-2.1.0/UVFReader/UVFReader.pro 2011-12-08 22:08:29.000000000 +0100
+@@ -15,7 +15,7 @@
+ INCLUDEPATH += ../Tuvok ../Tuvok/Basics/3rdParty ../Tuvok/Basics
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+-unix:LIBS += -lz
++unix:LIBS += -lz -lGLEW -ljpeg -ltiff -lbz2
+ macx:LIBS += -framework CoreFoundation
+ win32:LIBS += shlwapi.lib
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2011-12-08 16:59:01 UTC (rev 8845)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2011-12-08 21:09:18 UTC (rev 8846)
@@ -1 +1,12 @@
remove_convenientlibs.patch
+boost.patch
+glew.patch
+bzip2.patch
+zlib.patch
+jpeg.patch
+bzip22.patch
+tiff.patch
+jpeg2.patch
+libs.patch
+jpeg3.patch
+libs2.patch
Added: trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,26 @@
+Index: imagevis3d-2.1.0/Tuvok/IO/StkConverter.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/StkConverter.cpp 2011-12-08 21:40:24.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/StkConverter.cpp 2011-12-08 21:40:32.000000000 +0100
+@@ -34,7 +34,7 @@
+ */
+ #include "boost/cstdint.hpp"
+ #ifndef TUVOK_NO_IO
+-# include "3rdParty/tiff/tiffio.h"
++# include "tiffio.h"
+ #else
+ struct TIFF;
+ #endif
+Index: imagevis3d-2.1.0/Tuvok/IO/TiffVolumeConverter.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/TiffVolumeConverter.cpp 2011-12-08 21:44:44.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/TiffVolumeConverter.cpp 2011-12-08 21:44:51.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include <cstring>
+ #include "boost/cstdint.hpp"
+ #ifndef TUVOK_NO_IO
+-# include "3rdParty/tiff/tiffio.h"
++# include "tiffio.h"
+ #else
+ struct TIFF;
+ #endif
Added: trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch 2011-12-08 21:09:18 UTC (rev 8846)
@@ -0,0 +1,69 @@
+Index: imagevis3d-2.1.0/Tuvok/IO/scio.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/scio.pro 2011-12-08 18:07:18.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/scio.pro 2011-12-08 18:07:33.000000000 +0100
+@@ -85,38 +85,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/tiff/t4.h \
+- ./3rdParty/tiff/tif_config.h \
+- ./3rdParty/tiff/tif_dir.h \
+- ./3rdParty/tiff/tif_fax3.h \
+- ./3rdParty/tiff/tiffconf.h \
+- ./3rdParty/tiff/tiff.h \
+- ./3rdParty/tiff/tiffio.h \
+- ./3rdParty/tiff/tiffiop.h \
+- ./3rdParty/tiff/tiffvers.h \
+- ./3rdParty/tiff/tif_predict.h \
+- ./3rdParty/tiff/uvcode.h \
+- ./3rdParty/zlib/zconf.h \
+- ./3rdParty/zlib/zlib.h \
+ ./AbstrConverter.h \
+ ./AbstrGeoConverter.h \
+ ./AnalyzeConverter.h \
+Index: imagevis3d-2.1.0/Tuvok/IO/IASSConverter.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/IASSConverter.cpp 2011-12-08 18:07:55.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/IASSConverter.cpp 2011-12-08 18:08:14.000000000 +0100
+@@ -38,7 +38,7 @@
+ #include <sstream>
+ #include "boost/cstdint.hpp"
+ #ifndef TUVOK_NO_ZLIB
+-# include "3rdParty/zlib/zlib.h"
++# include "zlib.h"
+ #endif
+ #include "IASSConverter.h"
+ #include <Basics/EndianConvert.h>
+Index: imagevis3d-2.1.0/Tuvok/IO/gzio.h
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/gzio.h 2011-12-08 18:09:12.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/gzio.h 2011-12-08 18:09:45.000000000 +0100
+@@ -31,7 +31,7 @@
+ #define IV3D_GZIO_H
+
+ #include <stdio.h>
+-#include "3rdParty/zlib/zlib.h"
++#include "zlib.h"
+
+ #ifdef __cplusplus
+ extern "C" {
More information about the debian-med-commit
mailing list