[med-svn] r11527 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Wed Jul 4 08:12:06 UTC 2012
Author: malat
Date: 2012-07-04 08:12:06 +0000 (Wed, 04 Jul 2012)
New Revision: 11527
Added:
trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch
Removed:
trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch
trunk/packages/imagevis3d/trunk/debian/patches/manual.patch
trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch
trunk/packages/imagevis3d/trunk/debian/patches/missingsharedlibs.patch
trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch
trunk/packages/imagevis3d/trunk/debian/patches/warning.patch
Modified:
trunk/packages/imagevis3d/trunk/debian/changelog
trunk/packages/imagevis3d/trunk/debian/control
trunk/packages/imagevis3d/trunk/debian/get-orig-source
trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch
trunk/packages/imagevis3d/trunk/debian/patches/series
trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.patch
trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch
trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch
trunk/packages/imagevis3d/trunk/debian/patches/systemtiff.patch
trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch
trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch
Log:
Preparation for 2.1.0
Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/changelog 2012-07-04 08:12:06 UTC (rev 11527)
@@ -1,3 +1,9 @@
+imagevis3d (2.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream: 2.1.0
+
+ -- Mathieu Malaterre <malat at debian.org> Wed, 04 Jul 2012 09:28:15 +0200
+
imagevis3d (2.0.1-5) unstable; urgency=low
* Use my @d.o alias
Modified: trunk/packages/imagevis3d/trunk/debian/control
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/control 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/control 2012-07-04 08:12:06 UTC (rev 11527)
@@ -5,7 +5,7 @@
DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <malat at debian.org>
Build-Depends: debhelper (>= 8), libqt4-dev, libqt4-opengl-dev, qt4-qmake, libtclap-dev, libglew-dev, libz-dev,
- libbz2-dev, libjpeg-dev, libtiff5-dev | libtiff-dev, libboost-all-dev
+ libbz2-dev, libjpeg-dev, libtiff5-dev | libtiff-dev, libboost-all-dev, liblua5.2-dev
Standards-Version: 3.9.3
Homepage: http://www.imagevis3d.com
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/imagevis3d/trunk/
Modified: trunk/packages/imagevis3d/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/get-orig-source 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/get-orig-source 2012-07-04 08:12:06 UTC (rev 11527)
@@ -27,10 +27,10 @@
svn checkout --quiet https://gforge.sci.utah.edu/svn/imagevis3d ${FOLDER}
# fixup:
-svn up -qr ${IMAGEVIS3D_REVISION} ${FOLDER}
-svn up -qr ${TUVOK_REVISION} ${FOLDER}/Tuvok
-svn up -qr ${BASICS_REVISION} ${FOLDER}/Tuvok/Basics
-svn up -qr ${SCIO_REVISION} ${FOLDER}/Tuvok/IO
+#svn up -qr ${IMAGEVIS3D_REVISION} ${FOLDER}
+#svn up -qr ${TUVOK_REVISION} ${FOLDER}/Tuvok
+#svn up -qr ${BASICS_REVISION} ${FOLDER}/Tuvok/Basics
+#svn up -qr ${SCIO_REVISION} ${FOLDER}/Tuvok/IO
#find ${FOLDER} -name .svn -exec rm -rf {} \;
# convenients copies of:
Modified: trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -2,21 +2,45 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.0.1/Tuvok/tvk.pro
+Index: imagevis3d-2.1.0/Tuvok/tvk.pro
===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/tvk.pro 2012-05-04 15:43:41.216793679 +0200
-+++ imagevis3d-2.0.1/Tuvok/tvk.pro 2012-05-04 15:47:45.416784866 +0200
-@@ -47,9 +47,6 @@
+--- imagevis3d-2.1.0.orig/Tuvok/tvk.pro 2012-07-04 07:42:27.418644772 +0000
++++ imagevis3d-2.1.0/Tuvok/tvk.pro 2012-07-04 07:42:58.570645334 +0000
+@@ -58,33 +58,6 @@
# Input
HEADERS += \
- 3rdParty/GLEW/GL/glew.h \
- 3rdParty/GLEW/GL/glxew.h \
- 3rdParty/GLEW/GL/wglew.h \
+- 3rdParty/LUA/lapi.h \
+- 3rdParty/LUA/lauxlib.h \
+- 3rdParty/LUA/lcode.h \
+- 3rdParty/LUA/lctype.h \
+- 3rdParty/LUA/ldebug.h \
+- 3rdParty/LUA/ldo.h \
+- 3rdParty/LUA/lfunc.h \
+- 3rdParty/LUA/lgc.h \
+- 3rdParty/LUA/llimits.h \
+- 3rdParty/LUA/lmem.h \
+- 3rdParty/LUA/lobject.h \
+- 3rdParty/LUA/lopcodes.h \
+- 3rdParty/LUA/lparser.h \
+- 3rdParty/LUA/lstate.h \
+- 3rdParty/LUA/lstring.h \
+- 3rdParty/LUA/ltable.h \
+- 3rdParty/LUA/ltm.h \
+- 3rdParty/LUA/lua.h \
+- 3rdParty/LUA/lua.hpp \
+- 3rdParty/LUA/luaconf.h \
+- 3rdParty/LUA/lualib.h \
+- 3rdParty/LUA/lundump.h \
+- 3rdParty/LUA/lvm.h \
+- 3rdParty/LUA/lzio.h \
Basics/Appendix.h \
Basics/ArcBall.h \
Basics/Checksums/crc32.h \
-@@ -73,34 +70,6 @@
+@@ -112,34 +85,6 @@
DebugOut/ConsoleOut.h \
DebugOut/MultiplexOut.h \
DebugOut/TextfileOut.h \
@@ -49,17 +73,49 @@
- IO/3rdParty/tiff/tif_predict.h \
- IO/3rdParty/tiff/uvcode.h \
IO/AbstrConverter.h \
+ IO/AmiraConverter.h \
IO/AnalyzeConverter.h \
- IO/BOVConverter.h \
-@@ -195,7 +164,6 @@
- StdTuvokDefines.h
+@@ -270,39 +215,6 @@
+ Basics/LargeFileMMap.h
SOURCES += \
- 3rdParty/GLEW/GL/glew.c \
+- 3rdParty/LUA/lapi.cpp \
+- 3rdParty/LUA/lauxlib.cpp \
+- 3rdParty/LUA/lbaselib.cpp \
+- 3rdParty/LUA/lbitlib.cpp \
+- 3rdParty/LUA/lcode.cpp \
+- 3rdParty/LUA/lcorolib.cpp \
+- 3rdParty/LUA/lctype.cpp \
+- 3rdParty/LUA/ldblib.cpp \
+- 3rdParty/LUA/ldebug.cpp \
+- 3rdParty/LUA/ldo.cpp \
+- 3rdParty/LUA/ldump.cpp \
+- 3rdParty/LUA/lfunc.cpp \
+- 3rdParty/LUA/lgc.cpp \
+- 3rdParty/LUA/linit.cpp \
+- 3rdParty/LUA/liolib.cpp \
+- 3rdParty/LUA/llex.cpp \
+- 3rdParty/LUA/lmathlib.cpp \
+- 3rdParty/LUA/lmem.cpp \
+- 3rdParty/LUA/loadlib.cpp \
+- 3rdParty/LUA/lobject.cpp \
+- 3rdParty/LUA/lopcodes.cpp \
+- 3rdParty/LUA/loslib.cpp \
+- 3rdParty/LUA/lparser.cpp \
+- 3rdParty/LUA/lstate.cpp \
+- 3rdParty/LUA/lstring.cpp \
+- 3rdParty/LUA/lstrlib.cpp \
+- 3rdParty/LUA/ltable.cpp \
+- 3rdParty/LUA/ltablib.cpp \
+- 3rdParty/LUA/ltm.cpp \
+- 3rdParty/LUA/lundump.cpp \
+- 3rdParty/LUA/lvm.cpp \
+- 3rdParty/LUA/lzio.cpp \
Basics/Appendix.cpp \
Basics/ArcBall.cpp \
Basics/Checksums/MD5.cpp \
-@@ -214,114 +182,6 @@
+@@ -324,114 +236,6 @@
DebugOut/ConsoleOut.cpp \
DebugOut/MultiplexOut.cpp \
DebugOut/TextfileOut.cpp \
@@ -172,21 +228,28 @@
- IO/3rdParty/tiff/tif_jpeg.c \
- IO/3rdParty/tiff/tif_ojpeg.c \
IO/AbstrConverter.cpp \
+ IO/AmiraConverter.cpp \
IO/AnalyzeConverter.cpp \
- IO/BOVConverter.cpp \
-@@ -402,8 +262,6 @@
- Renderer/TFScaling.cpp \
- Scripting/Scripting.cpp
+@@ -540,7 +344,6 @@
+ Basics/LargeFileAIO.cpp \
+ Basics/LargeFileFD.cpp \
+ Basics/LargeFileMMap.cpp \
+- IO/3rdParty/tiff/tif_unix.c
--unix:SOURCES += IO/3rdParty/tiff/tif_unix.c
--
win32 {
HEADERS += \
- Basics/DynamicDX.h \
-Index: imagevis3d-2.0.1/Tuvok/IO/scio.pro
+@@ -557,7 +360,6 @@
+
+ SOURCES += \
+ Basics/DynamicDX.cpp \
+- IO/3rdParty/tiff/tif_win32.c \
+ Renderer/DX/DXRaycaster.cpp \
+ Renderer/DX/DXRenderer.cpp \
+ Renderer/DX/DXSBVR.cpp \
+Index: imagevis3d-2.1.0/Tuvok/IO/scio.pro
===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/scio.pro 2012-05-04 15:43:42.132793648 +0200
-+++ imagevis3d-2.0.1/Tuvok/IO/scio.pro 2012-05-04 15:47:45.416784866 +0200
+--- imagevis3d-2.1.0.orig/Tuvok/IO/scio.pro 2012-07-04 07:42:27.418644772 +0000
++++ imagevis3d-2.1.0/Tuvok/IO/scio.pro 2012-07-04 07:42:29.142644803 +0000
@@ -31,113 +31,6 @@
# Input
@@ -301,7 +364,7 @@
./AbstrConverter.cpp \
./AbstrGeoConverter.cpp \
./AnalyzeConverter.cpp \
-@@ -190,38 +83,6 @@
+@@ -195,38 +88,6 @@
./VGStudioConverter.cpp
HEADERS += \
@@ -340,4 +403,3 @@
./AbstrConverter.h \
./AbstrGeoConverter.h \
./AnalyzeConverter.h \
-
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -1,24 +0,0 @@
-Description: Fixed variable scoping issues to make GCC 4.7 happy.
-Forwarded: not-needed
-Origin: upstream, https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=browse&path=/&view=rev&revision=1771
-Bug-Debian: http://bugs.debian.org/667208
-Author: James Hughes <jhughes at sci.utah.edu>
-
-Index: imagevis3d-2.0.1/UVFReader/main.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/UVFReader/main.cpp 2011-12-12 12:16:18.000000000 +0100
-+++ imagevis3d-2.0.1/UVFReader/main.cpp 2012-05-04 15:18:46.768847625 +0200
-@@ -431,11 +431,11 @@
- uvfFile.Close();
- return EXIT_FAILURE;
- }
-- size_t j = 0;
-+ size_t jj = 0;
- for (size_t y = 0;y<ulTransformDimension;y++) {
- cout << " ";
- for (size_t x = 0;x<ulTransformDimension;x++) {
-- cout << " " << b->dDomainTransformation[j++];
-+ cout << " " << b->dDomainTransformation[jj++];
- }
- cout << endl;
- }
Modified: trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -3,49 +3,11 @@
Origin: upstream, https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=ScmCommitDetail&scm_commit_id=52110
Author: tom fogal <tfogal at sci.utah.edu>
-Index: imagevis3d-2.0.1/ImageVis3D/StdDefines.h
+Index: imagevis3d-2.1.0/Tuvok/Basics/SysTools.cpp
===================================================================
---- imagevis3d-2.0.1.orig/ImageVis3D/StdDefines.h 2011-12-20 13:56:23.000000000 +0100
-+++ imagevis3d-2.0.1/ImageVis3D/StdDefines.h 2011-12-20 13:57:50.000000000 +0100
-@@ -73,4 +73,13 @@
- #define UPDATE_VERSION_FILE "Linux_Latest_Version.txt"
- #endif
-
-+// make sure they have a definition, so code that uses the defines always
-+// compiles... even if that definition doesn't exactly make sense.
-+#ifndef UPDATE_FILE
-+# define UPDATE_FILE "ImageVis3D-Unsupported-Latest.zip"
-+#endif
-+#ifndef UPDATE_VERSION_FILE
-+# define UPDATE_VERSION_FILE "Unsupported-Latest-Version.txt"
-+#endif
-+
- #endif // STDIMAGEVISDEFINES_H
-Index: imagevis3d-2.0.1/ImageVis3D/UI/ImageVis3D_Help.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/ImageVis3D/UI/ImageVis3D_Help.cpp 2011-12-20 13:57:49.000000000 +0100
-+++ imagevis3d-2.0.1/ImageVis3D/UI/ImageVis3D_Help.cpp 2011-12-20 13:57:50.000000000 +0100
-@@ -127,6 +127,7 @@
- }
-
- void MainWindow::CheckForUpdatesInternal() {
-+#ifndef PACKAGE_MANAGER
- // cleanup updatefile, this codepath is taken for instance when the windows firewall blocked an http request
- if (m_pUpdateFile && m_pUpdateFile->isOpen()) {
- m_pUpdateFile->close();
-@@ -156,6 +157,7 @@
- QByteArray remotePath = QUrl::toPercentEncoding(url.path(), "!$&'()*+,;=:@/");
- if (remotePath.isEmpty()) remotePath = "/";
- m_iHttpGetId = m_pHttp->get(remotePath, m_pUpdateFile);
-+#endif
- }
-
- void MainWindow::httpRequestFinished(int requestId, bool error) {
-Index: imagevis3d-2.0.1/Tuvok/Basics/SysTools.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/Basics/SysTools.cpp 2011-12-20 13:58:04.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/Basics/SysTools.cpp 2011-12-20 13:59:05.000000000 +0100
-@@ -328,7 +328,11 @@
+--- imagevis3d-2.1.0.orig/Tuvok/Basics/SysTools.cpp 2012-07-04 09:29:25.000000000 +0200
++++ imagevis3d-2.1.0/Tuvok/Basics/SysTools.cpp 2012-07-04 09:31:44.910633187 +0200
+@@ -332,7 +332,11 @@
#ifdef DETECTED_OS_WINDOWS
# define MAX_PATH_LENGTH MAX_PATH
#else
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/manual.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/manual.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/manual.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -1,131 +0,0 @@
-Description: Use more portable Qt functions for opening manual.
- .. or try to. Qt fails to open the damn thing sometimes, and even
- worse it reports success even when it fails. Assuming it ever
- actually fixes the error reporting, I left the code in to manually
- launch a PDF viewer.
- ref. https://bugreports.qt.nokia.com/browse/QTBUG-23123
-Forwarded: not-needed
-Origin: upstream, https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=ScmCommitDetail&scm_commit_id=52124
-Author: tom fogal <tfogal at sci.utah.edu>
-
-Index: imagevis3d-2.0.1/ImageVis3D/UI/ImageVis3D_Help.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/ImageVis3D/UI/ImageVis3D_Help.cpp 2011-12-12 12:16:25.000000000 +0100
-+++ imagevis3d-2.0.1/ImageVis3D/UI/ImageVis3D_Help.cpp 2011-12-15 09:36:05.000000000 +0100
-@@ -38,6 +38,7 @@
- #include "../Tuvok/Basics/StdDefines.h"
- #include <algorithm>
- #include <cstdio>
-+#include <fstream>
- #include <string>
- #ifdef _MSC_VER
- # include <array>
-@@ -45,21 +46,15 @@
- # include <tr1/array>
- #endif
-
--#ifdef DETECTED_OS_LINUX
--# include <libgen.h>
--# include <unistd.h>
--#endif
--#include <fstream>
--
- #include <QtCore/QUrl>
- #include <QtCore/QTime>
- #include <QtCore/QDate>
- #include <QtCore/QDir>
--#include <QtCore/QTemporaryFile>
-+#include <QtCore/QFile>
- #include <QtCore/QFileInfo>
-+#include <QtCore/QSettings>
- #include <QtCore/QTemporaryFile>
- #include <QtCore/QTextStream>
--#include <QtCore/QSettings>
- #include <QtGui/QMessageBox>
- #include <QtGui/QDesktopServices>
- #include <QtNetwork/QHttp>
-@@ -399,11 +394,9 @@
- QDesktopServices::openUrl(QString(HELP_URL));
- }
-
--#ifdef DETECTED_OS_LINUX
--static bool readable(const std::string &f) {
-- return (access(f.c_str(), R_OK) == 0);
-+static bool readable(const std::string& f) {
-+ return QFile(QString(f.c_str())).permissions() & QFile::ReadUser;
- }
--#endif
-
- void MainWindow::OpenManual() {
- #ifdef DETECTED_OS_WINDOWS
-@@ -417,19 +410,20 @@
-
- /// Find out where our binary lives. The manual is placed in the same
- /// directory in the case of the binary tarballs we provide.
-- std::vector<std::string> paths(4);
-+ std::vector<std::string> paths; paths.reserve(4);
- char linkbuf[1024];
- memset(linkbuf, 0, 1024);
- if(readlink("/proc/self/exe", linkbuf, 1024) == -1) {
- T_ERROR("Error reading /proc/self/exe; ignoring binary directory while "
- "searching for manual.");
- } else {
-- paths.push_back(std::string(dirname(linkbuf)) + MANUAL_NAME);
-+ paths.push_back(QFileInfo(linkbuf).absolutePath().toStdString() +
-+ MANUAL_NAME);
- }
- paths.push_back(std::string("/usr/share/doc/imagevis3d/") + MANUAL_NAME);
- paths.push_back(std::string("/usr/local/share/doc/imagevis3d/") +
- MANUAL_NAME);
-- paths.push_back(std::string("./") + MANUAL_NAME);
-+ paths.push_back(MANUAL_NAME);
- std::vector<std::string>::const_iterator found = find_if(paths.begin(),
- paths.end(),
- readable);
-@@ -447,24 +441,28 @@
- }
- MESSAGE("Manual found at: %s", found->c_str());
-
-- // Now, figure out how to load the PDF. Ideally, we'd use FD.o's
-- // shared-mime-info to lookup which program the user wants to use for
-- // this. Qt is probably linking to this in some way, so it's likely
-- // we can use it directly, but I'm having trouble verifying that.
-- /// @todo FIXME use shared-mime-info to figure out PDF-reading program
-- // So, for now, just iterate through a hardcoded list and use the first that
-- // works.
--
-- typedef std::tr1::array<std::string, 3> progvec;
-- progvec viewers = {{ "evince", "xpdf", "acroread" }};
-- // Now iterate through each of those programs until one of them
-- // successfully launches.
-- for(progvec::const_iterator prog = viewers.begin(); prog != viewers.end();
-- ++prog) {
-- char manual[1024];
-- snprintf(manual, 1024, "%s %s", prog->c_str(), found->c_str());
-- if(system(manual) != -1) {
-- break;
-+ // Now, figure out how to load the PDF.
-+ QUrl uri;
-+ {
-+ std::ostringstream u;
-+ u << *found;
-+ QString pth = QFileInfo(u.str().c_str()).absoluteFilePath();
-+ uri.setUrl(pth);
-+ MESSAGE("uri: %s", pth.toStdString().c_str());
-+ }
-+ if(!QDesktopServices::openUrl(uri)) {
-+ MESSAGE("Manual open failed, relying on manual method.");
-+ typedef std::tr1::array<std::string, 3> progvec;
-+ progvec viewers = {{ "evince", "xpdf", "acroread" }};
-+ // Now iterate through each of those programs until one of them
-+ // successfully launches.
-+ for(progvec::const_iterator prog = viewers.begin(); prog != viewers.end();
-+ ++prog) {
-+ char manual[1024];
-+ snprintf(manual, 1024, "%s %s", prog->c_str(), found->c_str());
-+ if(system(manual) != -1) {
-+ break;
-+ }
- }
- }
- #endif
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -1,19 +0,0 @@
-Description: Add missing limits.h include.
- Needed for PATH_MAX.
- Reported-by: Mathieu Malaterre
-Forwarded: not-needed
-Origin: upstream, https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52071
-Author: tom fogal <tfogal at sci.utah.edu>
-
-Index: imagevis3d-2.0.1/Tuvok/Basics/SysTools.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/Basics/SysTools.cpp 2011-12-09 15:49:51.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/Basics/SysTools.cpp 2011-12-13 13:40:16.000000000 +0100
-@@ -44,6 +44,7 @@
- #include <cctype>
- #include <functional>
- #include <iterator>
-+#include <limits.h>
- #include <sstream>
- #include <sys/stat.h>
-
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/missingsharedlibs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/missingsharedlibs.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/missingsharedlibs.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -1,50 +0,0 @@
-Description: Add missing shared library links
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro
-===================================================================
---- imagevis3d-2.0.1.orig/ImageVis3D/ImageVis3D.pro 2011-12-09 10:45:24.000000000 +0100
-+++ imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro 2011-12-09 11:29:55.000000000 +0100
-@@ -20,11 +20,12 @@
- INCLUDEPATH += $$incpath
- #INCLUDEPATH += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW ../Tuvok
- QT += opengl network
--LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
-+LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
- RESOURCES = ImageVis3D.qrc
- RC_FILE = Resources/ImageVis3D.rc
- QMAKE_INFO_PLIST = ../IV3D.plist
- ICON = Resources/ImageVis3D.icns
-+unix:LIBS +=-lGLEW -ljpeg -ltiff -lbz2 -lz
- macx:LIBS +=-framework CoreFoundation
- unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
- unix:QMAKE_CFLAGS += -fno-strict-aliasing
-Index: imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro
-===================================================================
---- imagevis3d-2.0.1.orig/CmdLineConverter/CmdLineConverter.pro 2011-12-09 10:45:24.000000000 +0100
-+++ imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro 2011-12-09 11:30:48.000000000 +0100
-@@ -16,7 +16,8 @@
- incpath += ../Tuvok/Basics/3rdParty ../Tuvok
- DEPENDPATH += $$incpath
- INCLUDEPATH += $$incpath
--LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
-+LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
-+unix:LIBS += -lGLEW -ljpeg -ltiff -lbz2 -lz
- unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
- unix:QMAKE_CFLAGS += -fno-strict-aliasing
-
-Index: imagevis3d-2.0.1/UVFReader/UVFReader.pro
-===================================================================
---- imagevis3d-2.0.1.orig/UVFReader/UVFReader.pro 2011-12-09 10:45:24.000000000 +0100
-+++ imagevis3d-2.0.1/UVFReader/UVFReader.pro 2011-12-09 11:31:31.000000000 +0100
-@@ -13,7 +13,8 @@
- DEPENDPATH += .
- INCLUDEPATH += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW
- INCLUDEPATH += ../Tuvok ../Tuvok/Basics/3rdParty ../Tuvok/Basics
--LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
-+LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
-+unix:LIBS += -lGLEW -ltiff -ljpeg -lbz2 -lz
- unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
- unix:QMAKE_CFLAGS += -fno-strict-aliasing
-
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -1,18 +0,0 @@
-Description: Fix integer overflow issue.
-Forwarded: not-needed
-Origin: upstream, https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52089
-Author: tom fogal <tfogal at sci.utah.edu>
-
-Index: imagevis3d-2.0.1/Tuvok/Basics/SystemInfo.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/Basics/SystemInfo.cpp 2011-12-09 15:48:07.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/Basics/SystemInfo.cpp 2011-12-13 18:49:12.000000000 +0100
-@@ -192,7 +192,7 @@
- #else
- std::cerr << "Unknown system, can't lookup max memory. "
- << "Using a hard setting of 10 gb." << std::endl;
-- return 1024*1024*1024*10;
-+ return 1024ULL*1024ULL*1024ULL*10ULL;
- #endif
- #endif
- }
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2012-07-04 08:12:06 UTC (rev 11527)
@@ -4,11 +4,6 @@
systemjpeg.patch
systembzip2.patch
systemtiff.patch
-missingsharedlibs.patch
tuvok_details.patch
-maxpath.patch
-overflow.patch
-warning.patch
-manual.patch
kfreebsd.patch
-gcc47.patch
+systemlua.patch
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -4,14 +4,14 @@
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
+--- imagevis3d-2.1.0.orig/Tuvok/IO/RAWConverter.cpp 2012-07-04 07:30:43.126632073 +0000
++++ imagevis3d-2.1.0/Tuvok/IO/RAWConverter.cpp 2012-07-04 07:44:46.226647275 +0000
@@ -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"
+ #include "Basics/nonstd.h"
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -2,11 +2,11 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
+Index: imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-05-04 15:43:41.224793681 +0200
-+++ imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-05-04 15:47:45.416784866 +0200
-@@ -41,7 +41,7 @@
+--- imagevis3d-2.1.0.orig/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-07-04 09:29:07.000000000 +0200
++++ imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-07-04 09:30:25.162631749 +0200
+@@ -33,7 +33,7 @@
#include <deque>
#include <utility>
#include "../../StdTuvokDefines.h"
@@ -15,10 +15,10 @@
#include "Basics/Vectors.h"
#include "GPUMemManDataStructs.h"
-Index: imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
+Index: imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-05-04 15:43:41.236793681 +0200
-+++ imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-05-04 15:47:45.416784866 +0200
+--- imagevis3d-2.1.0.orig/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-07-04 09:29:07.000000000 +0200
++++ imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-07-04 09:30:25.162631749 +0200
@@ -49,7 +49,7 @@
#include <deque>
#include <string>
@@ -28,10 +28,10 @@
#include "boost/noncopyable.hpp"
#include "Basics/Vectors.h"
#include "IO/Brick.h"
-Index: imagevis3d-2.0.1/ImageVis3D/UI/RenderWindowGL.cpp
+Index: imagevis3d-2.1.0/ImageVis3D/UI/RenderWindowGL.cpp
===================================================================
---- imagevis3d-2.0.1.orig/ImageVis3D/UI/RenderWindowGL.cpp 2012-05-04 15:43:39.000793759 +0200
-+++ imagevis3d-2.0.1/ImageVis3D/UI/RenderWindowGL.cpp 2012-05-04 15:47:45.416784866 +0200
+--- imagevis3d-2.1.0.orig/ImageVis3D/UI/RenderWindowGL.cpp 2012-07-04 09:28:48.000000000 +0200
++++ imagevis3d-2.1.0/ImageVis3D/UI/RenderWindowGL.cpp 2012-07-04 09:30:25.162631749 +0200
@@ -37,7 +37,7 @@
#include "../Tuvok/StdTuvokDefines.h"
@@ -41,10 +41,10 @@
#if defined(__GNUC__) && defined(DETECTED_OS_LINUX)
# pragma GCC visibility push(default)
#endif
-Index: imagevis3d-2.0.1/Tuvok/Renderer/GL/GLInclude.h
+Index: imagevis3d-2.1.0/Tuvok/Renderer/GL/GLInclude.h
===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/Renderer/GL/GLInclude.h 2012-05-04 15:43:41.248793678 +0200
-+++ imagevis3d-2.0.1/Tuvok/Renderer/GL/GLInclude.h 2012-05-04 15:47:45.416784866 +0200
+--- imagevis3d-2.1.0.orig/Tuvok/Renderer/GL/GLInclude.h 2012-07-04 09:29:08.000000000 +0200
++++ imagevis3d-2.1.0/Tuvok/Renderer/GL/GLInclude.h 2012-07-04 09:30:25.162631749 +0200
@@ -40,7 +40,7 @@
#define TUVOK_GLINCLUDE_H
@@ -54,4 +54,3 @@
#ifdef WIN32
#define NOMINMAX
-
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -2,10 +2,10 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.0.1/Tuvok/IO/TuvokJPEG.cpp
+Index: imagevis3d-2.1.0/Tuvok/IO/TuvokJPEG.cpp
===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/TuvokJPEG.cpp 2012-05-04 15:41:39.124798086 +0200
-+++ imagevis3d-2.0.1/Tuvok/IO/TuvokJPEG.cpp 2012-05-04 15:43:01.860795102 +0200
+--- imagevis3d-2.1.0.orig/Tuvok/IO/TuvokJPEG.cpp 2012-07-04 07:40:59.034643178 +0000
++++ imagevis3d-2.1.0/Tuvok/IO/TuvokJPEG.cpp 2012-07-04 07:41:15.158643469 +0000
@@ -39,7 +39,7 @@
#include <fstream>
#include <iterator>
@@ -15,7 +15,7 @@
#include "TuvokJPEG.h"
#include "Controller/Controller.h"
-@@ -92,7 +92,7 @@
+@@ -105,7 +105,7 @@
void set_data(const std::vector<char>& mem) {
this->data = mem;
this->jinfo.src->bytes_in_buffer = this->data.size();
@@ -24,10 +24,10 @@
if(jpeg_read_header(&(this->jinfo), TRUE) != JPEG_HEADER_OK) {
T_ERROR("Could not read JPEG header, bailing...");
return;
-Index: imagevis3d-2.0.1/ImageVis3D/UI/QDataRadioButton.cpp
+Index: imagevis3d-2.1.0/ImageVis3D/UI/QDataRadioButton.cpp
===================================================================
---- imagevis3d-2.0.1.orig/ImageVis3D/UI/QDataRadioButton.cpp 2012-05-04 15:41:38.548798107 +0200
-+++ imagevis3d-2.0.1/ImageVis3D/UI/QDataRadioButton.cpp 2012-05-04 15:43:01.960795095 +0200
+--- imagevis3d-2.1.0.orig/ImageVis3D/UI/QDataRadioButton.cpp 2012-07-04 07:40:59.034643178 +0000
++++ imagevis3d-2.1.0/ImageVis3D/UI/QDataRadioButton.cpp 2012-07-04 07:41:15.158643469 +0000
@@ -39,7 +39,7 @@
#include <QtGui/QMouseEvent>
#include "../Tuvok/IO/TuvokJPEG.h"
@@ -46,20 +46,20 @@
vData.resize(jpg.size());
std::copy(jpg_data, jpg_data + jpg.size(), &vData[0]);
} else {
-Index: imagevis3d-2.0.1/Tuvok/IO/IOManager.cpp
+Index: imagevis3d-2.1.0/Tuvok/IO/IOManager.cpp
===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/IOManager.cpp 2012-05-04 15:41:40.804798029 +0200
-+++ imagevis3d-2.0.1/Tuvok/IO/IOManager.cpp 2012-05-04 15:43:01.964795097 +0200
-@@ -45,7 +45,7 @@
+--- imagevis3d-2.1.0.orig/Tuvok/IO/IOManager.cpp 2012-07-04 07:40:59.034643178 +0000
++++ imagevis3d-2.1.0/Tuvok/IO/IOManager.cpp 2012-07-04 07:41:41.378643941 +0000
+@@ -44,7 +44,7 @@
+ #include <sstream>
#include <map>
#include <memory>
- #include "boost/cstdint.hpp"
-#include "3rdParty/jpeglib/jconfig.h"
+#include "jconfig.h"
#include "IOManager.h"
-@@ -339,7 +339,7 @@
+@@ -349,7 +349,7 @@
const char *jpeg_data = jpg.data();
copy(jpeg_data, jpeg_data + jpg.size(), &vData[0]);
Added: trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -0,0 +1,163 @@
+Index: imagevis3d-2.1.0/Tuvok/LuaScripting/LuaScripting.h
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/LuaScripting/LuaScripting.h 2012-07-04 07:52:49.778655994 +0000
++++ imagevis3d-2.1.0/Tuvok/LuaScripting/LuaScripting.h 2012-07-04 07:54:15.278657536 +0000
+@@ -43,7 +43,7 @@
+
+ #ifndef LUASCRIPTING_NO_TUVOK
+
+-#include "3rdParty/LUA/lua.hpp"
++#include "lua.hpp"
+
+ #ifdef _MSC_VER
+ #include <functional>
+Index: imagevis3d-2.1.0/Tuvok/tvk.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/tvk.pro 2012-07-04 07:54:15.214657534 +0000
++++ imagevis3d-2.1.0/Tuvok/tvk.pro 2012-07-04 07:54:15.278657536 +0000
+@@ -14,10 +14,12 @@
+ DEPENDPATH += . Basics Controller DebugOut IO Renderer Scripting
+ INCLUDEPATH += . 3rdParty/GLEW IO/3rdParty/boost IO/3rdParty/zlib
+ INCLUDEPATH += Basics IO/exception
++INCLUDEPATH += /usr/include/lua5.2/
+ QT += opengl
+ LIBPATH += IO/expressions
+ LIBS = -ltuvokexpr
+ unix:LIBS += -lz
++unix:LIBS += -llua5.2.so
+ macx:LIBS += -framework CoreFoundation
+ win32:LIBS += shlwapi.lib
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+Index: imagevis3d-2.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2012-07-04 07:52:49.778655994 +0000
++++ imagevis3d-2.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2012-07-04 07:54:15.278657536 +0000
+@@ -35,7 +35,7 @@
+ #ifndef TUVOK_LUATUVOKSPECIFICTYPES_H_
+ #define TUVOK_LUATUVOKSPECIFICTYPES_H_
+
+-#include "3rdParty/LUA/lua.hpp"
++#include "lua.hpp"
+
+ // LuaFunBinding must always come before our implementation, because we depend
+ // on the templates it has built.
+Index: imagevis3d-2.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2012-07-04 07:52:49.778655994 +0000
++++ imagevis3d-2.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2012-07-04 07:54:15.278657536 +0000
+@@ -31,7 +31,7 @@
+ */
+
+ #include "Controller/Controller.h"
+-#include "3rdParty/LUA/lua.hpp"
++#include "lua.hpp"
+ #include "IO/IOManager.h"
+ #include "IO/FileBackedDataset.h"
+
+Index: imagevis3d-2.1.0/Tuvok/Renderer/RenderRegion.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/Renderer/RenderRegion.cpp 2012-07-04 07:52:49.778655994 +0000
++++ imagevis3d-2.1.0/Tuvok/Renderer/RenderRegion.cpp 2012-07-04 07:54:15.278657536 +0000
+@@ -27,7 +27,7 @@
+ */
+
+
+-#include "3rdParty/LUA/lua.hpp"
++#include "lua.hpp"
+
+ // Standard
+ #include "../Basics/Vectors.h"
+Index: imagevis3d-2.1.0/Tuvok/test/render/render.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/test/render/render.pro 2012-07-04 07:52:49.778655994 +0000
++++ imagevis3d-2.1.0/Tuvok/test/render/render.pro 2012-07-04 07:59:16.358662963 +0000
+@@ -9,11 +9,13 @@
+ DEPENDPATH = $$p
+ INCLUDEPATH = $$p
+ macx:INCLUDEPATH += /usr/X11R6/include
++unix:INCLUDEPATH += /usr/include/lua5.2
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+ LIBS += -lTuvok -ltuvokexpr -lz
+ unix:LIBS += -lGL -lX11
++unix:LIBS += -llua5.2 -lGLEW -lbz2 -ltiff
+ macx:LIBS += -framework CoreFoundation
+ unix:!macx:LIBS += -lGLU
+ # Try to link to GLU statically.
+Index: imagevis3d-2.1.0/ImageVis3D/ImageVis3D.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/ImageVis3D/ImageVis3D.pro 2012-07-04 07:30:55.574632297 +0000
++++ imagevis3d-2.1.0/ImageVis3D/ImageVis3D.pro 2012-07-04 08:05:09.834669338 +0000
+@@ -16,6 +16,7 @@
+ incpath += ../Tuvok/Scripting ../Tuvok
+ incpath += DebugOut UI UI/AutoGen
+ incpath += ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW
++incpath += /usr/include/lua5.2
+ DEPENDPATH += $$incpath
+ INCLUDEPATH += $$incpath
+ #INCLUDEPATH += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW ../Tuvok
+@@ -23,6 +24,7 @@
+ LIBPATH += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
++unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
+ macx:LIBS +=-framework CoreFoundation
+ win32:LIBS += shlwapi.lib
+ unix:!macx:LIBS += -lGLU
+Index: imagevis3d-2.1.0/Tuvok/test/shaders/shaders.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/test/shaders/shaders.pro 2012-07-04 07:29:05.000000000 +0000
++++ imagevis3d-2.1.0/Tuvok/test/shaders/shaders.pro 2012-07-04 08:01:16.826665136 +0000
+@@ -6,6 +6,7 @@
+ INCLUDEPATH += ../../ ../../IO/3rdParty/boost
+ INCLUDEPATH += ../../Basics/3rdParty
+ INCLUDEPATH += ../../3rdParty/GLEW
++INCLUDEPATH += /usr/include/lua5.2
+ # for glX
+ macx:INCLUDEPATH += /usr/X11R6/include
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+@@ -13,6 +14,7 @@
+ QT += opengl
+ LIBS += -lTuvok -ltuvokexpr -lz
+ unix:LIBS += -lGL -lX11
++unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
+ macx:LIBS += -lX11 -framework CoreFoundation
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
+ unix:QMAKE_CFLAGS += -fno-strict-aliasing -g
+Index: imagevis3d-2.1.0/Tuvok/test/context/context.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/test/context/context.pro 2012-07-04 07:29:05.000000000 +0000
++++ imagevis3d-2.1.0/Tuvok/test/context/context.pro 2012-07-04 08:02:26.182666387 +0000
+@@ -14,6 +14,7 @@
+ QT += opengl
+ LIBS += -lTuvok -ltuvokexpr -lz
+ unix:LIBS += -lGL -lX11
++unix:LIBS += -lGLEW -ltiff -lbz2 -llua5.2
+ macx:LIBS += -framework CoreFoundation
+ unix:!macx:LIBS += -lGLU
+ # Try to link to GLU statically.
+Index: imagevis3d-2.1.0/CmdLineConverter/CmdLineConverter.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/CmdLineConverter/CmdLineConverter.pro 2012-07-04 07:30:55.586632297 +0000
++++ imagevis3d-2.1.0/CmdLineConverter/CmdLineConverter.pro 2012-07-04 08:07:03.562671388 +0000
+@@ -19,6 +19,7 @@
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
++unix:LIBS += -ltiff -lbz2 -llua5.2 -lGLEW
+ macx:LIBS += -framework CoreFoundation
+ win32:LIBS += shlwapi.lib
+ unix:!macx:LIBS += -lGLU
+Index: imagevis3d-2.1.0/UVFReader/UVFReader.pro
+===================================================================
+--- imagevis3d-2.1.0.orig/UVFReader/UVFReader.pro 2012-07-04 07:30:55.598632297 +0000
++++ imagevis3d-2.1.0/UVFReader/UVFReader.pro 2012-07-04 08:08:40.818673142 +0000
+@@ -16,6 +16,7 @@
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
++unix:LIBS += -ltiff -lbz2 -llua5.2
+ macx:LIBS += -framework CoreFoundation
+ win32:LIBS += shlwapi.lib
+ unix:!macx:LIBS += -lGLU
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemtiff.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemtiff.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemtiff.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -4,11 +4,11 @@
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
+--- imagevis3d-2.1.0.orig/Tuvok/IO/StkConverter.cpp 2012-07-04 09:29:40.000000000 +0200
++++ imagevis3d-2.1.0/Tuvok/IO/StkConverter.cpp 2012-07-04 09:30:45.822632121 +0200
@@ -34,7 +34,7 @@
*/
- #include "boost/cstdint.hpp"
+
#ifndef TUVOK_NO_IO
-# include "3rdParty/tiff/tiffio.h"
+# include "tiffio.h"
@@ -17,11 +17,11 @@
#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 @@
+--- imagevis3d-2.1.0.orig/Tuvok/IO/TiffVolumeConverter.cpp 2012-07-04 09:29:40.000000000 +0200
++++ imagevis3d-2.1.0/Tuvok/IO/TiffVolumeConverter.cpp 2012-07-04 09:30:45.822632121 +0200
+@@ -34,7 +34,7 @@
+ */
#include <cstring>
- #include "boost/cstdint.hpp"
#ifndef TUVOK_NO_IO
-# include "3rdParty/tiff/tiffio.h"
+# include "tiffio.h"
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -2,23 +2,23 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.0.1/Tuvok/IO/IASSConverter.cpp
+Index: imagevis3d-2.1.0/Tuvok/IO/IASSConverter.cpp
===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/IASSConverter.cpp 2012-05-04 15:43:40.084793720 +0200
-+++ imagevis3d-2.0.1/Tuvok/IO/IASSConverter.cpp 2012-05-04 15:47:45.416784866 +0200
-@@ -38,7 +38,7 @@
+--- imagevis3d-2.1.0.orig/Tuvok/IO/IASSConverter.cpp 2012-07-04 09:29:40.000000000 +0200
++++ imagevis3d-2.1.0/Tuvok/IO/IASSConverter.cpp 2012-07-04 09:30:27.694631794 +0200
+@@ -37,7 +37,7 @@
+ #include <fstream>
#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.0.1/Tuvok/IO/gzio.h
+ #include "Basics/EndianConvert.h"
+Index: imagevis3d-2.1.0/Tuvok/IO/gzio.h
===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/gzio.h 2012-05-04 15:43:40.096793723 +0200
-+++ imagevis3d-2.0.1/Tuvok/IO/gzio.h 2012-05-04 15:47:45.416784866 +0200
+--- imagevis3d-2.1.0.orig/Tuvok/IO/gzio.h 2012-07-04 09:29:40.000000000 +0200
++++ imagevis3d-2.1.0/Tuvok/IO/gzio.h 2012-07-04 09:30:27.694631794 +0200
@@ -31,7 +31,7 @@
#define IV3D_GZIO_H
Modified: trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -5,12 +5,12 @@
Origin: upstream, https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52072
Author: tom fogal <tfogal at sci.utah.edu>
-Index: imagevis3d-2.0.1/Tuvok/Basics/StdDefines.h
+Index: imagevis3d-2.1.0/Tuvok/Basics/StdDefines.h
===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/Basics/StdDefines.h 2011-12-09 15:49:51.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/Basics/StdDefines.h 2011-12-13 13:39:23.000000000 +0100
-@@ -143,4 +143,8 @@
- #define TUVOK_DETAILS "Linux build"
+--- imagevis3d-2.1.0.orig/Tuvok/Basics/StdDefines.h 2012-07-04 09:29:25.000000000 +0200
++++ imagevis3d-2.1.0/Tuvok/Basics/StdDefines.h 2012-07-04 09:30:57.126632325 +0200
+@@ -154,4 +154,8 @@
+ # define TUVOK_DETAILS "Unsupported system build"
#endif
+#ifndef TUVOK_DETAILS
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/warning.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/warning.patch 2012-07-03 06:26:17 UTC (rev 11526)
+++ trunk/packages/imagevis3d/trunk/debian/patches/warning.patch 2012-07-04 08:12:06 UTC (rev 11527)
@@ -1,95 +0,0 @@
-Description: Get rid of some variables which were never actually used.
- gcc has a warning about this in newer versions.
-Forwarded: not-needed
-Origin: upstream, https://gforge.sci.utah.edu/gf/project/scio/scmsvn/?action=ScmCommitDetail&scm_commit_id=52091
-Author: tom fogal <tfogal at sci.utah.edu>
-
-Index: imagevis3d-2.0.1/Tuvok/IO/AbstrGeoConverter.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/AbstrGeoConverter.cpp 2011-12-09 15:49:57.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/IO/AbstrGeoConverter.cpp 2011-12-13 18:49:43.000000000 +0100
-@@ -115,7 +115,6 @@
- if(v.size() < 2) return;
-
- // find AA projection direction that is not coplanar to the polygon
-- size_t iPlane = 0;
- size_t iPlaneX = 2;
- size_t iPlaneY = 1;
-
-@@ -124,15 +123,13 @@
- FLOATVECTOR3 norm = tan%bin;
-
- if (norm.y != 0) {
-- iPlane = 1;
-- iPlaneX = 0;
-- iPlaneY = 2;
-+ iPlaneX = 0;
-+ iPlaneY = 2;
- } else
- if (norm.z != 0) {
-- iPlane = 2;
-- iPlaneX = 0;
-- iPlaneY = 1;
-- } // else use default wich is the x-plane
-+ iPlaneX = 0;
-+ iPlaneY = 1;
-+ } // else use default which is the x-plane
-
- // move bottom element to front of array
- for (size_t i = 1;i<v.size();i++) {
-Index: imagevis3d-2.0.1/Tuvok/IO/DICOM/DICOMParser.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/DICOM/DICOMParser.cpp 2011-12-09 15:49:57.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/IO/DICOM/DICOMParser.cpp 2011-12-13 18:50:14.000000000 +0100
-@@ -359,7 +359,9 @@
- fileDICOM.seekg(128); // skip first 128 bytes
-
- string value;
-+#ifdef DEBUG_DICOM
- float fSliceSpacing = 0;
-+#endif
- short iGroupID, iElementID;
- UINT32 iElemLength;
- DICOM_eType elementType;
-@@ -389,7 +391,9 @@
- } else {
- // Ok, at this point we are very sure that we are dealing with a DICOM File,
- // lets find out the dimensions, the sequence numbers
-+#ifdef DEBUG_DICOM
- fSliceSpacing = 0;
-+#endif
- int iMetaHeaderEnd=0;
- bool bParsingMetaHeader = true;
-
-@@ -559,8 +563,8 @@
- case 0x88 : { // Spacing
- value.resize(iElemLength);
- fileDICOM.read(&value[0],iElemLength);
-- fSliceSpacing = float(atof(value.c_str()));
- #ifdef DEBUG_DICOM
-+ fSliceSpacing = float(atof(value.c_str()));
- {
- stringstream ss;
- ss << fSliceSpacing << " (Slice Spacing: recognized)";
-Index: imagevis3d-2.0.1/Tuvok/IO/IOManager.h
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/IOManager.h 2011-12-09 15:49:57.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/IO/IOManager.h 2011-12-13 18:50:41.000000000 +0100
-@@ -309,9 +309,6 @@
- FLOATVECTOR3 vecBrickOffset(vBrickOffset);
- vecBrickOffset = vecBrickOffset * m_vScale;
-
-- FLOATVECTOR3 domShift = 0.5f * fMaxSize / FLOATVECTOR3(m_vDataSize);
--
--
- for (int i = 0;i<m_pMarchingCubes->m_Isosurface->iVertices;i++) {
- m_vertices.push_back((m_pMarchingCubes->m_Isosurface->vfVertices[i]+vecBrickOffset-FLOATVECTOR3(m_vDataSize)/2.0f)/fMaxSize);
- }
-@@ -343,7 +340,6 @@
- tuvok::VertVec m_vertices;
- tuvok::NormVec m_normals;
- tuvok::IndexVec m_indices;
--
- };
-
- class IOManager {
More information about the debian-med-commit
mailing list