[med-svn] r17052 - trunk/packages/imagevis3d/trunk/debian/patches
Mathieu Malaterre
malat at moszumanska.debian.org
Fri Jun 6 12:33:56 UTC 2014
Author: malat
Date: 2014-06-06 12:33:56 +0000 (Fri, 06 Jun 2014)
New Revision: 17052
Removed:
trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch
trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch
Modified:
trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd2.patch
trunk/packages/imagevis3d/trunk/debian/patches/series
Log:
patch cleanup
Modified: trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd2.patch 2014-06-06 12:29:13 UTC (rev 17051)
+++ trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd2.patch 2014-06-06 12:33:56 UTC (rev 17052)
@@ -1,5 +1,5 @@
Description: Allow compilation on kfreebsd
- Accroding to
+ According to
http://pubs.opengroup.org/onlinepubs/9699919799/functions/posix_fadvise.html
"The posix_fadvise() function is part of the Advisory Information option
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch 2014-06-06 12:29:13 UTC (rev 17051)
+++ trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch 2014-06-06 12:33:56 UTC (rev 17052)
@@ -1,56 +0,0 @@
-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
-+++ imagevis3d-3.0.0/Tuvok/tvk.pro 2013-09-05 17:23:13.442640226 +0200
-@@ -18,7 +18,7 @@
- QT += opengl
- QMAKE_LIBDIR += IO/expressions
- LIBS = -ltuvokexpr
--unix:LIBS += -lz -lpthread
-+unix:LIBS += -lz -lpthread -ljpeg
- 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:24:19.006640181 +0200
-+++ imagevis3d-3.0.0/Tuvok/test/render/render.pro 2013-09-05 17:24:24.186640178 +0200
-@@ -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
-+LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lbz2 -lGLEW -ltiff -ljpeg
- 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:25:27.914640135 +0200
-+++ imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro 2013-09-05 17:25:32.162640132 +0200
-@@ -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
-+LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -ltiff -lbz2 -lGLEW -ljpeg
- 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:26:14.198640104 +0200
-+++ imagevis3d-3.0.0/Tuvok/test/context/context.pro 2013-09-05 17:26:18.058640103 +0200
-@@ -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
-+LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -lbz2 -ljpeg
- unix:LIBS += -lGL -lX11
- unix:!macx:LIBS += -lGLU
- # Try to link to GLU statically.
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2014-06-06 12:29:13 UTC (rev 17051)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2014-06-06 12:33:56 UTC (rev 17052)
@@ -1,13 +1,11 @@
convenientlibs.patch
systemglew.patch
systemzlib.patch
-#systemjpeg.patch
systembzip2.patch
systemtiff.patch
kfreebsd.patch
fixcomp.patch
systemlua.patch
-#linkjpeg.patch
typos.patch
fopenmp.patch
thirdparty.patch
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch 2014-06-06 12:29:13 UTC (rev 17051)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch 2014-06-06 12:33:56 UTC (rev 17052)
@@ -1,70 +0,0 @@
-Description: Allow compilation with system installed jpeg lib
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-3.0.0/Tuvok/IO/TuvokJPEG.cpp
-===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/IO/TuvokJPEG.cpp 2012-10-24 20:18:35.000000000 +0200
-+++ imagevis3d-3.0.0/Tuvok/IO/TuvokJPEG.cpp 2012-10-28 09:40:33.073511694 +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"
-
-@@ -105,7 +105,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-3.0.0/ImageVis3D/UI/QDataRadioButton.cpp
-===================================================================
---- imagevis3d-3.0.0.orig/ImageVis3D/UI/QDataRadioButton.cpp 2012-10-24 20:15:41.000000000 +0200
-+++ imagevis3d-3.0.0/ImageVis3D/UI/QDataRadioButton.cpp 2012-10-28 09:40:33.073511694 +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::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-3.0.0/Tuvok/IO/IOManager.cpp
-===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/IO/IOManager.cpp 2012-10-24 20:18:35.000000000 +0200
-+++ imagevis3d-3.0.0/Tuvok/IO/IOManager.cpp 2012-10-28 09:40:33.073511694 +0100
-@@ -44,7 +44,7 @@
- #include <sstream>
- #include <map>
- #include <memory>
--#include "3rdParty/jpeglib/jconfig.h"
-+#include "jconfig.h"
-
- #include "IOManager.h"
-
-@@ -355,7 +355,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%%",
More information about the debian-med-commit
mailing list