[med-svn] r17125 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Wed Jun 11 10:31:03 UTC 2014
Author: malat
Date: 2014-06-11 10:31:03 +0000 (Wed, 11 Jun 2014)
New Revision: 17125
Modified:
trunk/packages/imagevis3d/trunk/debian/changelog
trunk/packages/imagevis3d/trunk/debian/control
trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch
Log:
next upload
Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog 2014-06-11 10:07:48 UTC (rev 17124)
+++ trunk/packages/imagevis3d/trunk/debian/changelog 2014-06-11 10:31:03 UTC (rev 17125)
@@ -1,8 +1,10 @@
-imagevis3d (3.1.0-2) UNRELEASED; urgency=low
+imagevis3d (3.1.0-2) unstable; urgency=low
+ * Make sure to use recent lz4. Closes: #751227
* Really remove all references to 3rdParty
+ * Use system installed lzma
- -- Mathieu Malaterre <malat at debian.org> Wed, 11 Jun 2014 11:57:47 +0200
+ -- Mathieu Malaterre <malat at debian.org> Wed, 11 Jun 2014 12:30:54 +0200
imagevis3d (3.1.0-1) unstable; urgency=low
Modified: trunk/packages/imagevis3d/trunk/debian/control
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/control 2014-06-11 10:07:48 UTC (rev 17124)
+++ trunk/packages/imagevis3d/trunk/debian/control 2014-06-11 10:31:03 UTC (rev 17125)
@@ -13,7 +13,7 @@
libjpeg-dev,
liblua5.2-dev,
liblz4-dev (>= 0.0~r114),
- liblzma-dev,
+ liblzma-dev, lzma-dev,
libqt4-dev,
libqt4-opengl-dev,
libtclap-dev,
Modified: trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch 2014-06-11 10:07:48 UTC (rev 17124)
+++ trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch 2014-06-11 10:31:03 UTC (rev 17125)
@@ -3,8 +3,8 @@
Index: imagevis3d-3.1.0/ImageVis3D/UI/RenderWindowDX.cpp
===================================================================
---- imagevis3d-3.1.0.orig/ImageVis3D/UI/RenderWindowDX.cpp 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/ImageVis3D/UI/RenderWindowDX.cpp 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/ImageVis3D/UI/RenderWindowDX.cpp 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/ImageVis3D/UI/RenderWindowDX.cpp 2014-06-11 12:24:57.171956212 +0200
@@ -43,7 +43,7 @@
/// We need this first because GPUMemMan depends on OpenGL
/// but shouldn't, and GLEW will blow up if we don't include
@@ -16,8 +16,8 @@
#include "ImageVis3D.h"
Index: imagevis3d-3.1.0/StandaloneTuvok/GLContext.cpp
===================================================================
---- imagevis3d-3.1.0.orig/StandaloneTuvok/GLContext.cpp 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/StandaloneTuvok/GLContext.cpp 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/StandaloneTuvok/GLContext.cpp 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/StandaloneTuvok/GLContext.cpp 2014-06-11 12:24:57.171956212 +0200
@@ -1,10 +1,10 @@
#include "GLContext.h"
-#include "3rdParty/GLEW/GL/glew.h"
@@ -34,8 +34,8 @@
GLContext::GLContext(UINT32 width, UINT32 height, BYTE colorBits, BYTE depthBits, BYTE stencilBits, bool useDoubleBuffer, std::wostream * errorOutput) :
Index: imagevis3d-3.1.0/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp 2014-06-11 12:24:57.171956212 +0200
@@ -6,7 +6,7 @@
#include "BzlibCompression.h"
@@ -47,8 +47,8 @@
namespace {
Index: imagevis3d-3.1.0/Tuvok/Renderer/GL/GLInclude.h
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/Renderer/GL/GLInclude.h 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/Tuvok/Renderer/GL/GLInclude.h 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/Renderer/GL/GLInclude.h 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/Tuvok/Renderer/GL/GLInclude.h 2014-06-11 12:24:57.171956212 +0200
@@ -44,7 +44,7 @@
#ifdef WIN32
@@ -60,8 +60,8 @@
#ifdef max
Index: imagevis3d-3.1.0/BatchRenderer/BatchRenderer.pro
===================================================================
---- imagevis3d-3.1.0.orig/BatchRenderer/BatchRenderer.pro 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/BatchRenderer/BatchRenderer.pro 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/BatchRenderer/BatchRenderer.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/BatchRenderer/BatchRenderer.pro 2014-06-11 12:24:57.171956212 +0200
@@ -3,10 +3,6 @@
TARGET = BatchRenderer
DEPENDPATH = .
@@ -75,8 +75,8 @@
QT += opengl
Index: imagevis3d-3.1.0/UVFReader/UVFReader.pro
===================================================================
---- imagevis3d-3.1.0.orig/UVFReader/UVFReader.pro 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/UVFReader/UVFReader.pro 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/UVFReader/UVFReader.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/UVFReader/UVFReader.pro 2014-06-11 12:24:57.171956212 +0200
@@ -8,10 +8,7 @@
QT += opengl
DEPENDPATH += .
@@ -90,31 +90,43 @@
QMAKE_LIBDIR += ../Tuvok/IO/expressions
Index: imagevis3d-3.1.0/Tuvok/tvk.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/tvk.pro 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/Tuvok/tvk.pro 2014-06-11 12:03:57.067880536 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/tvk.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/Tuvok/tvk.pro 2014-06-11 12:24:57.175956212 +0200
+@@ -3,7 +3,7 @@
+ CONFIG += warn_on qt rtti static staticlib stl largefile
+ CONFIG += exceptions
+ macx:DEFINES += QT_MAC_USE_COCOA=1 LUA_USE_MACOSX=1
+-unix:DEFINES += LZHAM_ANSI_CPLUSPLUS=1
++unix:DEFINES += LZHAM_ANSI_CPLUSPLUS=1 _7ZIP_ST=1
+ DEFINES += _FILE_OFFSET_BITS=64
+ TARGET = Build/Tuvok
+ win32 {
@@ -13,7 +13,7 @@
RCC_DIR = Build/rcc
OBJECTS_DIR = Build/objects
DEPENDPATH += . Basics Controller DebugOut IO Renderer
-INCLUDEPATH += . 3rdParty/GLEW IO/3rdParty/boost IO/3rdParty/zlib IO/3rdParty/lzma IO/3rdParty/lz4 IO/3rdParty/lzham
-+INCLUDEPATH += . IO/3rdParty/lzham
++INCLUDEPATH += . IO/3rdParty/lzham /usr/include/lzma
INCLUDEPATH += Basics IO/exception
INCLUDEPATH += /usr/include/lua5.2
QT += opengl
-@@ -372,9 +372,6 @@
+@@ -372,9 +372,9 @@
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 \
++ /usr/include/lzma/LzFind.c \
++ /usr/include/lzma/LzmaDec.c \
++ /usr/include/lzma/LzmaEnc.c \
IO/AbstrConverter.cpp \
IO/AbstrGeoConverter.cpp \
IO/AmiraConverter.cpp \
Index: imagevis3d-3.1.0/Tuvok/doc/genlua/genlua.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/doc/genlua/genlua.pro 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/Tuvok/doc/genlua/genlua.pro 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/doc/genlua/genlua.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/Tuvok/doc/genlua/genlua.pro 2014-06-11 12:24:57.175956212 +0200
@@ -6,8 +6,6 @@
DEPENDPATH = .
INCLUDEPATH = ../../
@@ -126,8 +138,8 @@
LIBS = -lTuvok -ltuvokexpr
Index: imagevis3d-3.1.0/Tuvok/IO/expressions/libexpr.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/IO/expressions/libexpr.pro 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/Tuvok/IO/expressions/libexpr.pro 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/IO/expressions/libexpr.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/expressions/libexpr.pro 2014-06-11 12:24:57.175956212 +0200
@@ -5,7 +5,7 @@
DEFINES += YY_NO_UNPUT _FILE_OFFSET_BITS=64
TARGET = tuvokexpr
@@ -139,8 +151,8 @@
unix:QMAKE_CFLAGS += -fno-strict-aliasing
Index: imagevis3d-3.1.0/Tuvok/test/shaders/shaders.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/test/shaders/shaders.pro 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/Tuvok/test/shaders/shaders.pro 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/test/shaders/shaders.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/Tuvok/test/shaders/shaders.pro 2014-06-11 12:24:57.175956212 +0200
@@ -3,9 +3,6 @@
TARGET = shtest
DEPENDPATH += . ../../
@@ -153,8 +165,8 @@
macx:INCLUDEPATH += /usr/X11R6/include
Index: imagevis3d-3.1.0/Tuvok/IO/expressions/debug.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/IO/expressions/debug.pro 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/Tuvok/IO/expressions/debug.pro 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/IO/expressions/debug.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/expressions/debug.pro 2014-06-11 12:24:57.175956212 +0200
@@ -5,7 +5,7 @@
macx:DEFINES += QT_MAC_USE_COCOA=1
TARGET = lexdbg
@@ -166,8 +178,8 @@
unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
Index: imagevis3d-3.1.0/Tuvok/IO/test/test.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/IO/test/test.pro 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/Tuvok/IO/test/test.pro 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/IO/test/test.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/test/test.pro 2014-06-11 12:24:57.175956212 +0200
@@ -4,7 +4,7 @@
TARGET = cxxtester
DEFINES += _FILE_OFFSET_BITS=64
@@ -179,8 +191,8 @@
QMAKE_LIBDIR += ../../Build ../expressions
Index: imagevis3d-3.1.0/ExtractDebugInfo/ExtractDebugInfo.pro
===================================================================
---- imagevis3d-3.1.0.orig/ExtractDebugInfo/ExtractDebugInfo.pro 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/ExtractDebugInfo/ExtractDebugInfo.pro 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/ExtractDebugInfo/ExtractDebugInfo.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/ExtractDebugInfo/ExtractDebugInfo.pro 2014-06-11 12:24:57.175956212 +0200
@@ -5,7 +5,7 @@
macx:DEFINES += QT_MAC_USE_COCOA=1
TARGET = Build/ExtractDebugInfo
@@ -192,8 +204,8 @@
QT += opengl
Index: imagevis3d-3.1.0/ImageVis3D/ImageVis3D.pro
===================================================================
---- imagevis3d-3.1.0.orig/ImageVis3D/ImageVis3D.pro 2014-06-11 11:44:31.535810540 +0200
-+++ imagevis3d-3.1.0/ImageVis3D/ImageVis3D.pro 2014-06-11 11:44:34.043810691 +0200
+--- imagevis3d-3.1.0.orig/ImageVis3D/ImageVis3D.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/ImageVis3D/ImageVis3D.pro 2014-06-11 12:24:57.175956212 +0200
@@ -11,11 +11,9 @@
incpath += ../Tuvok/IO ../Tuvok/IO/exception ../Tuvok/Renderer
incpath += ../Tuvok
@@ -208,8 +220,8 @@
LIBS = -lTuvok -ltuvokexpr
Index: imagevis3d-3.1.0/BatchRenderer/main.cpp
===================================================================
---- imagevis3d-3.1.0.orig/BatchRenderer/main.cpp 2014-04-07 14:51:47.000000000 +0200
-+++ imagevis3d-3.1.0/BatchRenderer/main.cpp 2014-06-11 11:51:53.607837089 +0200
+--- imagevis3d-3.1.0.orig/BatchRenderer/main.cpp 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/BatchRenderer/main.cpp 2014-06-11 12:24:57.175956212 +0200
@@ -32,7 +32,7 @@
#include <cstdlib>
#include <iostream>
@@ -221,8 +233,8 @@
#include "LuaScripting/LuaScripting.h"
Index: imagevis3d-3.1.0/BatchRenderer/BatchContext.cpp
===================================================================
---- imagevis3d-3.1.0.orig/BatchRenderer/BatchContext.cpp 2014-04-07 14:51:47.000000000 +0200
-+++ imagevis3d-3.1.0/BatchRenderer/BatchContext.cpp 2014-06-11 11:52:24.731838958 +0200
+--- imagevis3d-3.1.0.orig/BatchRenderer/BatchContext.cpp 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/BatchRenderer/BatchContext.cpp 2014-06-11 12:24:57.175956212 +0200
@@ -37,7 +37,7 @@
#include <iostream>
#include <stdexcept>
@@ -234,8 +246,8 @@
#include "BatchContext.h"
Index: imagevis3d-3.1.0/Tuvok/Basics/basics.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/Basics/basics.pro 2014-04-07 10:09:36.000000000 +0200
-+++ imagevis3d-3.1.0/Tuvok/Basics/basics.pro 2014-06-11 11:55:15.291849201 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/Basics/basics.pro 2014-06-11 12:24:55.527956113 +0200
++++ imagevis3d-3.1.0/Tuvok/Basics/basics.pro 2014-06-11 12:24:57.175956212 +0200
@@ -5,7 +5,7 @@
TARGET = tuvokbasics
win32 { DESTDIR = Build }
More information about the debian-med-commit
mailing list