[med-svn] r16654 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Thu Apr 10 16:22:28 UTC 2014
Author: malat
Date: 2014-04-10 16:22:28 +0000 (Thu, 10 Apr 2014)
New Revision: 16654
Modified:
trunk/packages/imagevis3d/trunk/debian/changelog
trunk/packages/imagevis3d/trunk/debian/copyright
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/kfreebsd.patch
trunk/packages/imagevis3d/trunk/debian/patches/series
trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch
trunk/packages/imagevis3d/trunk/debian/patches/typos.patch
trunk/packages/imagevis3d/trunk/debian/watch
Log:
start working on imagevis3d
Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog 2014-04-10 14:52:43 UTC (rev 16653)
+++ trunk/packages/imagevis3d/trunk/debian/changelog 2014-04-10 16:22:28 UTC (rev 16654)
@@ -1,3 +1,9 @@
+imagevis3d (3.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream
+
+ -- Mathieu Malaterre <malat at debian.org> Thu, 10 Apr 2014 17:03:39 +0200
+
imagevis3d (3.0.0-3) unstable; urgency=low
* Use internal JPEG implementation. Closes: #688614
Modified: trunk/packages/imagevis3d/trunk/debian/copyright
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/copyright 2014-04-10 14:52:43 UTC (rev 16653)
+++ trunk/packages/imagevis3d/trunk/debian/copyright 2014-04-10 16:22:28 UTC (rev 16654)
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ImageVis3D
-Upstream-Contact: Tom Fogal
+Upstream-Contact: iv3d-users at sci.utah.edu
Source: http://www.imagevis3d.com
Files: *
@@ -30,6 +30,6 @@
DEALINGS IN THE SOFTWARE.
Files: debian/*
-Copyright: 2011; Mathieu Malaterre <malat at debian.org>
+Copyright: © 2011-2014 Mathieu Malaterre <malat at debian.org>
License: MIT
Same as above
Modified: trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2014-04-10 14:52:43 UTC (rev 16653)
+++ trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2014-04-10 16:22:28 UTC (rev 16654)
@@ -2,14 +2,102 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-3.0.0/Tuvok/tvk.pro
+Index: ImageVis3D-3.1.0/Tuvok/IO/scio.pro
===================================================================
---- 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 @@
+--- ImageVis3D-3.1.0.orig/Tuvok/IO/scio.pro 2014-04-10 17:51:10.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/IO/scio.pro 2014-04-10 17:51:12.000000000 +0200
+@@ -36,13 +36,6 @@
# Input
+ SOURCES += \
+- ./3rdParty/bzip2/blocksort.c \
+- ./3rdParty/bzip2/bzlib.c \
+- ./3rdParty/bzip2/compress.c \
+- ./3rdParty/bzip2/crctable.c \
+- ./3rdParty/bzip2/decompress.c \
+- ./3rdParty/bzip2/huffman.c \
+- ./3rdParty/bzip2/randtable.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 \
+- ./3rdParty/tiff/tif_color.c \
+- ./3rdParty/tiff/tif_compress.c \
+- ./3rdParty/tiff/tif_dir.c \
+- ./3rdParty/tiff/tif_dirinfo.c \
+- ./3rdParty/tiff/tif_dirread.c \
+- ./3rdParty/tiff/tif_dirwrite.c \
+- ./3rdParty/tiff/tif_dumpmode.c \
+- ./3rdParty/tiff/tif_error.c \
+- ./3rdParty/tiff/tif_extension.c \
+- ./3rdParty/tiff/tif_fax3.c \
+- ./3rdParty/tiff/tif_fax3sm.c \
+- ./3rdParty/tiff/tif_flush.c \
+- ./3rdParty/tiff/tif_getimage.c \
+- ./3rdParty/tiff/tif_luv.c \
+- ./3rdParty/tiff/tif_lzw.c \
+- ./3rdParty/tiff/tif_next.c \
+- ./3rdParty/tiff/tif_open.c \
+- ./3rdParty/tiff/tif_packbits.c \
+- ./3rdParty/tiff/tif_pixarlog.c \
+- ./3rdParty/tiff/tif_predict.c \
+- ./3rdParty/tiff/tif_print.c \
+- ./3rdParty/tiff/tif_read.c \
+- ./3rdParty/tiff/tif_strip.c \
+- ./3rdParty/tiff/tif_swab.c \
+- ./3rdParty/tiff/tif_thunder.c \
+- ./3rdParty/tiff/tif_tile.c \
+- ./3rdParty/tiff/tif_unix.c \
+- ./3rdParty/tiff/tif_version.c \
+- ./3rdParty/tiff/tif_warning.c \
+- ./3rdParty/tiff/tif_write.c \
+- ./3rdParty/tiff/tif_zip.c \
+ ./AbstrConverter.cpp \
+ ./AbstrGeoConverter.cpp \
+ ./AnalyzeConverter.cpp \
+@@ -202,8 +161,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 \
+@@ -221,19 +178,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 \
+- ./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-3.1.0/Tuvok/tvk.pro
+===================================================================
+--- ImageVis3D-3.1.0.orig/Tuvok/tvk.pro 2014-04-10 17:51:10.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/tvk.pro 2014-04-10 17:51:12.000000000 +0200
+@@ -63,33 +63,6 @@
+
+ # Input
+ HEADERS += \
- 3rdParty/GLEW/GL/glew.h \
- 3rdParty/GLEW/GL/glxew.h \
- 3rdParty/GLEW/GL/wglew.h \
@@ -30,17 +118,17 @@
- 3rdParty/LUA/lstring.h \
- 3rdParty/LUA/ltable.h \
- 3rdParty/LUA/ltm.h \
+- 3rdParty/LUA/luaconf.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 \
-@@ -118,7 +91,6 @@
+ Basics/AvgMinMaxTracker.h \
+@@ -121,7 +94,6 @@
DebugOut/ConsoleOut.h \
DebugOut/MultiplexOut.h \
DebugOut/TextfileOut.h \
@@ -48,10 +136,46 @@
IO/3rdParty/jpeglib/cderror.h \
IO/3rdParty/jpeglib/cdjpeg.h \
IO/3rdParty/jpeglib/jchuff.h \
-@@ -136,16 +108,6 @@
+@@ -139,52 +111,6 @@
IO/3rdParty/jpeglib/jversion.h \
IO/3rdParty/jpeglib/mangle_jpeg.h \
IO/3rdParty/jpeglib/transupp.h \
+- IO/3rdParty/lz4/lz4.h \
+- IO/3rdParty/lz4/lz4hc.h \
+- IO/3rdParty/lzham/lzham_assert.h \
+- IO/3rdParty/lzham/lzham_checksum.h \
+- IO/3rdParty/lzham/lzham_comp.h \
+- IO/3rdParty/lzham/lzham_config.h \
+- IO/3rdParty/lzham/lzham_core.h \
+- IO/3rdParty/lzham/lzham_decomp.h \
+- IO/3rdParty/lzham/lzham.h \
+- IO/3rdParty/lzham/lzham_helpers.h \
+- IO/3rdParty/lzham/lzham_huffman_codes.h \
+- IO/3rdParty/lzham/lzham_lzbase.h \
+- IO/3rdParty/lzham/lzham_lzcomp_internal.h \
+- IO/3rdParty/lzham/lzham_lzdecompbase.h \
+- IO/3rdParty/lzham/lzham_match_accel.h \
+- IO/3rdParty/lzham/lzham_math.h \
+- IO/3rdParty/lzham/lzham_mem.h \
+- IO/3rdParty/lzham/lzham_null_threading.h \
+- IO/3rdParty/lzham/lzham_platform.h \
+- IO/3rdParty/lzham/lzham_polar_codes.h \
+- IO/3rdParty/lzham/lzham_prefix_coding.h \
+- IO/3rdParty/lzham/lzham_pthreads_threading.h \
+- IO/3rdParty/lzham/lzham_static_lib.h \
+- IO/3rdParty/lzham/lzham_symbol_codec.h \
+- IO/3rdParty/lzham/lzham_threading.h \
+- IO/3rdParty/lzham/lzham_timer.h \
+- IO/3rdParty/lzham/lzham_traits.h \
+- IO/3rdParty/lzham/lzham_types.h \
+- IO/3rdParty/lzham/lzham_utils.h \
+- IO/3rdParty/lzham/lzham_vector.h \
+- IO/3rdParty/lzham/lzham_win32_threading.h \
+- IO/3rdParty/lzma/LzFind.h \
+- IO/3rdParty/lzma/LzHash.h \
+- IO/3rdParty/lzma/LzmaDec.h \
+- IO/3rdParty/lzma/LzmaEnc.h \
+- IO/3rdParty/lzma/Types.h \
- IO/3rdParty/tiff/t4.h \
- IO/3rdParty/tiff/tif_dir.h \
- IO/3rdParty/tiff/tif_fax3.h \
@@ -63,9 +187,9 @@
- IO/3rdParty/tiff/tif_predict.h \
- IO/3rdParty/tiff/uvcode.h \
IO/AbstrConverter.h \
+ IO/AbstrGeoConverter.h \
IO/AmiraConverter.h \
- IO/AnalyzeConverter.h \
-@@ -283,39 +245,6 @@
+@@ -334,39 +260,6 @@
Basics/LargeFileMMap.h
SOURCES += \
@@ -105,7 +229,7 @@
Basics/Appendix.cpp \
Basics/ArcBall.cpp \
Basics/Checksums/MD5.cpp \
-@@ -340,13 +269,6 @@
+@@ -391,13 +284,6 @@
DebugOut/ConsoleOut.cpp \
DebugOut/MultiplexOut.cpp \
DebugOut/TextfileOut.cpp \
@@ -119,10 +243,36 @@
IO/3rdParty/jpeglib/cdjpeg.c \
IO/3rdParty/jpeglib/jcapimin.c \
IO/3rdParty/jpeglib/jcapistd.c \
-@@ -412,42 +334,6 @@
+@@ -463,66 +349,6 @@
IO/3rdParty/jpeglib/rdcolmap.c \
IO/3rdParty/jpeglib/rdswitch.c \
IO/3rdParty/jpeglib/transupp.c \
+- IO/3rdParty/lz4/lz4.c \
+- IO/3rdParty/lz4/lz4hc.c \
+- IO/3rdParty/lzham/lzham_api.cpp \
+- IO/3rdParty/lzham/lzham_assert.cpp \
+- IO/3rdParty/lzham/lzham_checksum.cpp \
+- IO/3rdParty/lzham/lzham_huffman_codes.cpp \
+- IO/3rdParty/lzham/lzham_lib.cpp \
+- IO/3rdParty/lzham/lzham_lzbase.cpp \
+- IO/3rdParty/lzham/lzham_lzcomp.cpp \
+- IO/3rdParty/lzham/lzham_lzcomp_internal.cpp \
+- IO/3rdParty/lzham/lzham_lzcomp_state.cpp \
+- IO/3rdParty/lzham/lzham_lzdecompbase.cpp \
+- IO/3rdParty/lzham/lzham_lzdecomp.cpp \
+- IO/3rdParty/lzham/lzham_match_accel.cpp \
+- IO/3rdParty/lzham/lzham_mem.cpp \
+- IO/3rdParty/lzham/lzham_platform.cpp \
+- IO/3rdParty/lzham/lzham_polar_codes.cpp \
+- IO/3rdParty/lzham/lzham_prefix_coding.cpp \
+- IO/3rdParty/lzham/lzham_pthreads_threading.cpp \
+- IO/3rdParty/lzham/lzham_symbol_codec.cpp \
+- 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 \
- IO/3rdParty/tiff/tif_aux.c \
- IO/3rdParty/tiff/tif_close.c \
- IO/3rdParty/tiff/tif_codec.c \
@@ -139,6 +289,7 @@
- IO/3rdParty/tiff/tif_fax3sm.c \
- IO/3rdParty/tiff/tif_flush.c \
- IO/3rdParty/tiff/tif_getimage.c \
+- IO/3rdParty/tiff/tif_jpeg.c \
- IO/3rdParty/tiff/tif_luv.c \
- IO/3rdParty/tiff/tif_lzw.c \
- IO/3rdParty/tiff/tif_next.c \
@@ -156,113 +307,6 @@
- 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/AbstrGeoConverter.cpp \
IO/AmiraConverter.cpp \
- IO/AnalyzeConverter.cpp \
-@@ -564,7 +450,6 @@
- Basics/LargeFileAIO.cpp \
- Basics/LargeFileFD.cpp \
- Basics/LargeFileMMap.cpp \
-- IO/3rdParty/tiff/tif_unix.c
-
- win32 {
- HEADERS += \
-@@ -581,7 +466,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-3.0.0/Tuvok/IO/scio.pro
-===================================================================
---- 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 += \
-- ./3rdParty/bzip2/blocksort.c \
-- ./3rdParty/bzip2/bzlib.c \
-- ./3rdParty/bzip2/compress.c \
-- ./3rdParty/bzip2/crctable.c \
-- ./3rdParty/bzip2/decompress.c \
-- ./3rdParty/bzip2/huffman.c \
-- ./3rdParty/bzip2/randtable.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 \
-- ./3rdParty/tiff/tif_color.c \
-- ./3rdParty/tiff/tif_compress.c \
-- ./3rdParty/tiff/tif_dir.c \
-- ./3rdParty/tiff/tif_dirinfo.c \
-- ./3rdParty/tiff/tif_dirread.c \
-- ./3rdParty/tiff/tif_dirwrite.c \
-- ./3rdParty/tiff/tif_dumpmode.c \
-- ./3rdParty/tiff/tif_error.c \
-- ./3rdParty/tiff/tif_extension.c \
-- ./3rdParty/tiff/tif_fax3.c \
-- ./3rdParty/tiff/tif_fax3sm.c \
-- ./3rdParty/tiff/tif_flush.c \
-- ./3rdParty/tiff/tif_getimage.c \
-- ./3rdParty/tiff/tif_luv.c \
-- ./3rdParty/tiff/tif_lzw.c \
-- ./3rdParty/tiff/tif_next.c \
-- ./3rdParty/tiff/tif_open.c \
-- ./3rdParty/tiff/tif_packbits.c \
-- ./3rdParty/tiff/tif_pixarlog.c \
-- ./3rdParty/tiff/tif_predict.c \
-- ./3rdParty/tiff/tif_print.c \
-- ./3rdParty/tiff/tif_read.c \
-- ./3rdParty/tiff/tif_strip.c \
-- ./3rdParty/tiff/tif_swab.c \
-- ./3rdParty/tiff/tif_thunder.c \
-- ./3rdParty/tiff/tif_tile.c \
-- ./3rdParty/tiff/tif_unix.c \
-- ./3rdParty/tiff/tif_version.c \
-- ./3rdParty/tiff/tif_warning.c \
-- ./3rdParty/tiff/tif_write.c \
-- ./3rdParty/tiff/tif_zip.c \
- ./AbstrConverter.cpp \
- ./AbstrGeoConverter.cpp \
- ./AnalyzeConverter.cpp \
-@@ -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 \
-@@ -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 \
-- ./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 \
Modified: trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch 2014-04-10 14:52:43 UTC (rev 16653)
+++ trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch 2014-04-10 16:22:28 UTC (rev 16654)
@@ -2,10 +2,10 @@
Author: Mathieu Malaterre <malat at debian.org>
Forwarded: no
-Index: imagevis3d-2.1.1/Tuvok/Basics/LargeFile.cpp
+Index: ImageVis3D-3.1.0/Tuvok/Basics/LargeFile.cpp
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/Basics/LargeFile.cpp 2012-07-30 21:30:34.000000000 +0000
-+++ imagevis3d-2.1.1/Tuvok/Basics/LargeFile.cpp 2012-09-20 13:08:07.503555158 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/Basics/LargeFile.cpp 2014-04-07 10:09:36.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/Basics/LargeFile.cpp 2014-04-10 17:43:44.000000000 +0200
@@ -38,6 +38,9 @@
# include <unistd.h>
#endif
@@ -16,12 +16,12 @@
#ifndef NDEBUG
# include <iostream>
# define DEBUG(...) do { std::cerr << __VA_ARGS__ << "\n"; } while(0)
-Index: imagevis3d-2.1.1/Tuvok/Basics/LargeFileC.cpp
+Index: ImageVis3D-3.1.0/Tuvok/Basics/LargeFileC.cpp
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/Basics/LargeFileC.cpp 2012-07-30 21:30:34.000000000 +0000
-+++ imagevis3d-2.1.1/Tuvok/Basics/LargeFileC.cpp 2012-09-20 13:09:17.839552619 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/Basics/LargeFileC.cpp 2014-04-07 10:09:36.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/Basics/LargeFileC.cpp 2014-04-10 17:43:44.000000000 +0200
@@ -46,6 +46,9 @@
- #ifdef DETECTED_OS_APPLE
+ #if defined(DETECTED_OS_APPLE) || defined(DETECTED_OS_LINUX)
# include <unistd.h>
#endif
+#include <unistd.h>
Modified: trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch 2014-04-10 14:52:43 UTC (rev 16653)
+++ trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch 2014-04-10 16:22:28 UTC (rev 16654)
@@ -2,11 +2,11 @@
Author: Mathieu Malaterre <malat at debian.org>
Forwarded: no
-Index: imagevis3d-3.0.0/Tuvok/tvk.pro
+Index: ImageVis3D-3.1.0/Tuvok/tvk.pro
===================================================================
---- 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 @@
+--- ImageVis3D-3.1.0.orig/Tuvok/tvk.pro 2014-04-10 17:54:07.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/tvk.pro 2014-04-10 17:57:36.000000000 +0200
+@@ -19,7 +19,7 @@
QT += opengl
QMAKE_LIBDIR += IO/expressions
LIBS = -ltuvokexpr
@@ -15,10 +15,10 @@
unix:LIBS += -llua5.2
win32:LIBS += shlwapi.lib
unix:QMAKE_CXXFLAGS += -std=c++0x
-Index: imagevis3d-3.0.0/Tuvok/test/render/render.pro
+Index: ImageVis3D-3.1.0/Tuvok/test/render/render.pro
===================================================================
---- 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
+--- ImageVis3D-3.1.0.orig/Tuvok/test/render/render.pro 2014-04-10 17:54:07.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/test/render/render.pro 2014-04-10 17:57:36.000000000 +0200
@@ -13,7 +13,7 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
@@ -28,10 +28,10 @@
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
+Index: ImageVis3D-3.1.0/Tuvok/test/shaders/shaders.pro
===================================================================
---- 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
+--- ImageVis3D-3.1.0.orig/Tuvok/test/shaders/shaders.pro 2014-04-10 17:54:07.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/test/shaders/shaders.pro 2014-04-10 17:57:36.000000000 +0200
@@ -12,7 +12,7 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
@@ -41,10 +41,10 @@
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
+Index: ImageVis3D-3.1.0/Tuvok/test/context/context.pro
===================================================================
---- 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
+--- ImageVis3D-3.1.0.orig/Tuvok/test/context/context.pro 2014-04-10 17:54:07.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/test/context/context.pro 2014-04-10 17:57:36.000000000 +0200
@@ -12,7 +12,7 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
@@ -54,23 +54,23 @@
unix:LIBS += -lGL -lX11
unix:!macx:LIBS += -lGLU
# Try to link to GLU statically.
-Index: imagevis3d-3.0.0/CmdLineConverter/CmdLineConverter.pro
+Index: ImageVis3D-3.1.0/CmdLineConverter/CmdLineConverter.pro
===================================================================
---- 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
+--- ImageVis3D-3.1.0.orig/CmdLineConverter/CmdLineConverter.pro 2014-04-10 17:56:16.000000000 +0200
++++ ImageVis3D-3.1.0/CmdLineConverter/CmdLineConverter.pro 2014-04-10 17:57:36.000000000 +0200
@@ -15,7 +15,7 @@
+ DEPENDPATH += $$incpath
+ INCLUDEPATH += $$incpath
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
- LIBS = -lTuvok -ltuvokexpr
- unix:LIBS += -lz
-unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
+unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2 -fopenmp
- win3:LIBS += shlwapi.lib
- unix:!macx:LIBS += -lGLU
- macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
-Index: imagevis3d-3.0.0/ImageVis3D/ImageVis3D.pro
+ LIBS += -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
+ unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
+Index: ImageVis3D-3.1.0/ImageVis3D/ImageVis3D.pro
===================================================================
---- 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
+--- ImageVis3D-3.1.0.orig/ImageVis3D/ImageVis3D.pro 2014-04-10 17:54:07.000000000 +0200
++++ ImageVis3D-3.1.0/ImageVis3D/ImageVis3D.pro 2014-04-10 17:57:36.000000000 +0200
@@ -20,7 +20,7 @@
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
@@ -78,18 +78,5 @@
-unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
+unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2 -fopenmp
win32:LIBS += shlwapi.lib
- unix:!macx:LIBS += -lGLU
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-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
- unix:LIBS += -lz
--unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
-+unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2 -fopenmp
- win32:LIBS += shlwapi.lib
- unix:!macx:LIBS += -lGLU
- QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
+ macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
Modified: trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch 2014-04-10 14:52:43 UTC (rev 16653)
+++ trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch 2014-04-10 16:22:28 UTC (rev 16654)
@@ -3,11 +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.1.0/Tuvok/Basics/SysTools.cpp
+Index: ImageVis3D-3.1.0/Tuvok/Basics/SysTools.cpp
===================================================================
---- 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 @@
+--- ImageVis3D-3.1.0.orig/Tuvok/Basics/SysTools.cpp 2014-04-07 10:09:36.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/Basics/SysTools.cpp 2014-04-10 17:43:39.000000000 +0200
+@@ -391,7 +391,11 @@
#ifdef DETECTED_OS_WINDOWS
# define MAX_PATH_LENGTH MAX_PATH
#else
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2014-04-10 14:52:43 UTC (rev 16653)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2014-04-10 16:22:28 UTC (rev 16654)
@@ -7,7 +7,6 @@
kfreebsd.patch
fixcomp.patch
systemlua.patch
-kfreebsd2.patch
#linkjpeg.patch
fopenmp.patch
typos.patch
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch 2014-04-10 14:52:43 UTC (rev 16653)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch 2014-04-10 16:22:28 UTC (rev 16654)
@@ -2,10 +2,10 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-3.0.0/Tuvok/LuaScripting/LuaScripting.h
+Index: ImageVis3D-3.1.0/Tuvok/LuaScripting/LuaScripting.h
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/LuaScripting.h 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/Tuvok/LuaScripting/LuaScripting.h 2012-10-28 09:02:29.809519512 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/LuaScripting/LuaScripting.h 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/LuaScripting/LuaScripting.h 2014-04-10 18:10:09.000000000 +0200
@@ -46,7 +46,7 @@
#ifndef LUASCRIPTING_NO_TUVOK
@@ -15,10 +15,10 @@
#else
-Index: imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h
+Index: ImageVis3D-3.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2012-10-28 09:02:29.809519512 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2014-04-10 18:10:09.000000000 +0200
@@ -35,7 +35,7 @@
#ifndef TUVOK_LUATUVOKSPECIFICTYPES_H_
#define TUVOK_LUATUVOKSPECIFICTYPES_H_
@@ -28,23 +28,23 @@
// LuaFunBinding must always come before our implementation, because we depend
// on the templates it has built.
-Index: imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp
+Index: ImageVis3D-3.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2012-10-28 09:02:29.809519512 +0000
-@@ -31,7 +31,7 @@
- */
+--- ImageVis3D-3.1.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2014-04-10 18:10:09.000000000 +0200
+@@ -32,7 +32,7 @@
- #include "Controller/Controller.h"
+ #include <vector>
+
-#include "3rdParty/LUA/lua.hpp"
+#include "lua.hpp"
- #include "IO/IOManager.h"
+ #include "Controller/Controller.h"
+ #include "IO/DynamicBrickingDS.h"
#include "IO/FileBackedDataset.h"
- #include "IO/uvfDataset.h"
-Index: imagevis3d-3.0.0/Tuvok/Renderer/RenderRegion.cpp
+Index: ImageVis3D-3.1.0/Tuvok/Renderer/RenderRegion.cpp
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/Renderer/RenderRegion.cpp 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/Tuvok/Renderer/RenderRegion.cpp 2012-10-28 09:02:29.809519512 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/Renderer/RenderRegion.cpp 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/Renderer/RenderRegion.cpp 2014-04-10 18:10:09.000000000 +0200
@@ -27,7 +27,7 @@
*/
@@ -54,10 +54,10 @@
// Standard
#include "../Basics/Vectors.h"
-Index: imagevis3d-3.0.0/ImageVis3D/ImageVis3D.pro
+Index: ImageVis3D-3.1.0/ImageVis3D/ImageVis3D.pro
===================================================================
---- imagevis3d-3.0.0.orig/ImageVis3D/ImageVis3D.pro 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/ImageVis3D/ImageVis3D.pro 2012-10-28 09:05:16.761520504 +0000
+--- ImageVis3D-3.1.0.orig/ImageVis3D/ImageVis3D.pro 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/ImageVis3D/ImageVis3D.pro 2014-04-10 18:14:59.000000000 +0200
@@ -12,6 +12,7 @@
incpath += ../Tuvok
incpath += DebugOut UI UI/AutoGen
@@ -72,33 +72,12 @@
unix:LIBS += -lz
+unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
win32:LIBS += shlwapi.lib
- unix:!macx:LIBS += -lGLU
macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
-@@ -26,13 +28,13 @@
- macx:LIBS += -stdlib=libc++ -framework CoreFoundation -mmacosx-version-min=10.7
- QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
- # Try to link to GLU statically.
--gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
--for(d, gludirs) {
-- if(exists($${d}/libGLU.a) && static) {
-- LIBS -= -lGLU;
-- LIBS += $${d}/libGLU.a
-- }
--}
-+#gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
-+#for(d, gludirs) {
-+# if(exists($${d}/libGLU.a) && static) {
-+# LIBS -= -lGLU;
-+# LIBS += $${d}/libGLU.a
-+# }
-+#}
-
- # Find the location of QtGui's prl file, and include it here so we can look at
- # the QMAKE_PRL_CONFIG variable.
-Index: imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro
+ macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
+Index: ImageVis3D-3.1.0/Tuvok/test/shaders/shaders.pro
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/test/shaders/shaders.pro 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro 2012-10-28 09:02:29.809519512 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/test/shaders/shaders.pro 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/test/shaders/shaders.pro 2014-04-10 18:14:59.000000000 +0200
@@ -6,25 +6,26 @@
INCLUDEPATH += ../../ ../../IO/3rdParty/boost
INCLUDEPATH += ../../Basics/3rdParty
@@ -134,13 +113,13 @@
macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
-Index: imagevis3d-3.0.0/Tuvok/tvk.pro
+Index: ImageVis3D-3.1.0/Tuvok/tvk.pro
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/tvk.pro 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/Tuvok/tvk.pro 2012-10-28 09:02:29.809519512 +0000
-@@ -14,10 +14,12 @@
- DEPENDPATH += . Basics Controller DebugOut IO Renderer
- INCLUDEPATH += . 3rdParty/GLEW IO/3rdParty/boost IO/3rdParty/zlib
+--- ImageVis3D-3.1.0.orig/Tuvok/tvk.pro 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/tvk.pro 2014-04-10 18:14:59.000000000 +0200
+@@ -15,10 +15,12 @@
+ 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 += Basics IO/exception
+INCLUDEPATH += /usr/include/lua5.2
QT += opengl
@@ -151,7 +130,7 @@
win32:LIBS += shlwapi.lib
unix:QMAKE_CXXFLAGS += -std=c++0x
unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
-@@ -28,13 +30,13 @@
+@@ -31,13 +33,13 @@
macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
macx:LIBS += -stdlib=libc++ -framework CoreFoundation -mmacosx-version-min=10.7
# Try to link to GLU statically.
@@ -172,10 +151,10 @@
# Find the location of QtGui's prl file, and include it here so we can look at
# the QMAKE_PRL_CONFIG variable.
-Index: imagevis3d-3.0.0/Tuvok/test/render/render.pro
+Index: ImageVis3D-3.1.0/Tuvok/test/render/render.pro
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/test/render/render.pro 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/Tuvok/test/render/render.pro 2012-10-28 09:02:29.809519512 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/test/render/render.pro 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/test/render/render.pro 2014-04-10 18:14:59.000000000 +0200
@@ -9,20 +9,21 @@
DEPENDPATH = $$p
INCLUDEPATH = $$p
@@ -207,10 +186,10 @@
unix:QMAKE_CXXFLAGS += -std=c++0x
unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
unix:QMAKE_CFLAGS += -fno-strict-aliasing -g
-Index: imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp
+Index: ImageVis3D-3.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp 2012-10-28 09:02:29.809519512 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp 2014-04-10 18:10:09.000000000 +0200
@@ -33,7 +33,7 @@
#include <vector>
#include "Controller/Controller.h"
@@ -220,43 +199,25 @@
#include "../LuaScripting.h"
#include "../LuaClassRegistration.h"
#include "LuaTuvokTypes.h"
-Index: imagevis3d-3.0.0/CmdLineConverter/CmdLineConverter.pro
+Index: ImageVis3D-3.1.0/CmdLineConverter/CmdLineConverter.pro
===================================================================
---- imagevis3d-3.0.0.orig/CmdLineConverter/CmdLineConverter.pro 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/CmdLineConverter/CmdLineConverter.pro 2012-10-28 09:02:57.365519676 +0000
-@@ -15,6 +15,7 @@
+--- ImageVis3D-3.1.0.orig/CmdLineConverter/CmdLineConverter.pro 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/CmdLineConverter/CmdLineConverter.pro 2014-04-10 18:14:59.000000000 +0200
+@@ -15,8 +15,10 @@
+ DEPENDPATH += $$incpath
+ INCLUDEPATH += $$incpath
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
- LIBS = -lTuvok -ltuvokexpr
++unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
+ LIBS += -lTuvok -ltuvokexpr
unix:LIBS += -lz
+unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
- win3:LIBS += shlwapi.lib
- unix:!macx:LIBS += -lGLU
+ win32:LIBS += shlwapi.lib
macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
-@@ -22,13 +23,13 @@
- macx:LIBS += -stdlib=libc++ -framework CoreFoundation -mmacosx-version-min=10.7
- QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
- # Try to link to GLU statically.
--gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
--for(d, gludirs) {
-- if(exists($${d}/libGLU.a) && static) {
-- LIBS -= -lGLU;
-- LIBS += $${d}/libGLU.a
-- }
--}
-+#gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
-+#for(d, gludirs) {
-+# if(exists($${d}/libGLU.a) && static) {
-+# LIBS -= -lGLU;
-+# LIBS += $${d}/libGLU.a
-+# }
-+#}
-
- # Find the location of QtGui's prl file, and include it here so we can look at
- # the QMAKE_PRL_CONFIG variable.
-Index: imagevis3d-3.0.0/Tuvok/test/context/context.pro
+ macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
+Index: ImageVis3D-3.1.0/Tuvok/test/context/context.pro
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/test/context/context.pro 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/Tuvok/test/context/context.pro 2012-10-28 09:02:29.809519512 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/test/context/context.pro 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/test/context/context.pro 2014-04-10 18:14:59.000000000 +0200
@@ -12,17 +12,17 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
@@ -283,40 +244,10 @@
unix:QMAKE_CXXFLAGS += -std=c++0x
unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
unix:QMAKE_CFLAGS += -fno-strict-aliasing -g
-Index: imagevis3d-3.0.0/UVFReader/UVFReader.pro
+Index: ImageVis3D-3.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun2DProxy.cpp
===================================================================
---- imagevis3d-3.0.0.orig/UVFReader/UVFReader.pro 2012-10-28 09:02:28.165519502 +0000
-+++ imagevis3d-3.0.0/UVFReader/UVFReader.pro 2012-10-28 09:04:45.505520318 +0000
-@@ -12,17 +12,18 @@
- QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
- LIBS = -lTuvok -ltuvokexpr
- unix:LIBS += -lz
-+unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
- win32:LIBS += shlwapi.lib
- unix:!macx:LIBS += -lGLU
- QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
- # Try to link to GLU statically.
--gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
--for(d, gludirs) {
-- if(exists($${d}/libGLU.a) && static) {
-- LIBS -= -lGLU;
-- LIBS += $${d}/libGLU.a
-- }
--}
-+#gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
-+#for(d, gludirs) {
-+# if(exists($${d}/libGLU.a) && static) {
-+# LIBS -= -lGLU;
-+# LIBS += $${d}/libGLU.a
-+# }
-+#}
- unix:QMAKE_CXXFLAGS += -std=c++0x
- unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
- unix:QMAKE_CFLAGS += -fno-strict-aliasing
-Index: imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun2DProxy.cpp
-===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun2DProxy.cpp 2012-10-24 18:18:28.000000000 +0000
-+++ imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun2DProxy.cpp 2012-10-28 09:25:46.669527806 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun2DProxy.cpp 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun2DProxy.cpp 2014-04-10 18:10:09.000000000 +0200
@@ -32,7 +32,7 @@
#include <vector>
@@ -326,10 +257,10 @@
#include "../LuaScripting.h"
#include "../LuaClassRegistration.h"
#include "LuaTuvokTypes.h"
-Index: imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaIOManagerProxy.cpp
+Index: ImageVis3D-3.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaIOManagerProxy.cpp
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaIOManagerProxy.cpp 2012-10-24 18:18:28.000000000 +0000
-+++ imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaIOManagerProxy.cpp 2012-10-28 09:26:19.933528003 +0000
+--- ImageVis3D-3.1.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaIOManagerProxy.cpp 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaIOManagerProxy.cpp 2014-04-10 18:10:09.000000000 +0200
@@ -31,7 +31,7 @@
*/
@@ -339,3 +270,27 @@
#include "IO/IOManager.h"
#include "IO/FileBackedDataset.h"
#include "IO/uvfDataset.h"
+Index: ImageVis3D-3.1.0/UVFReader/UVFReader.pro
+===================================================================
+--- ImageVis3D-3.1.0.orig/UVFReader/UVFReader.pro 2014-04-10 18:10:01.000000000 +0200
++++ ImageVis3D-3.1.0/UVFReader/UVFReader.pro 2014-04-10 18:10:09.000000000 +0200
+@@ -17,6 +17,7 @@
+ QMAKE_LIBDIR += ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
++unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
+ win32:LIBS += shlwapi.lib
+ QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
+ unix:QMAKE_CXXFLAGS += -std=c++0x
+Index: ImageVis3D-3.1.0/Tuvok/doc/genlua/genlua.pro
+===================================================================
+--- ImageVis3D-3.1.0.orig/Tuvok/doc/genlua/genlua.pro 2014-04-07 10:09:36.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/doc/genlua/genlua.pro 2014-04-10 18:15:27.000000000 +0200
+@@ -11,6 +11,7 @@
+ QMAKE_LIBDIR += ../../IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
++unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2 -llzma -llz4
+ win32:LIBS += shlwapi.lib
+ macx:LIBS += -stdlib=libc++
+ macx:LIBS += -mmacosx-version-min=10.7
Modified: trunk/packages/imagevis3d/trunk/debian/patches/typos.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/typos.patch 2014-04-10 14:52:43 UTC (rev 16653)
+++ trunk/packages/imagevis3d/trunk/debian/patches/typos.patch 2014-04-10 16:22:28 UTC (rev 16654)
@@ -2,10 +2,10 @@
Author: Mathieu Malaterre <malat at debian.org>
Forwarded: no
-Index: imagevis3d-3.0.0/ImageVis3D/UI/UI/ImageVis3D.ui
+Index: ImageVis3D-3.1.0/ImageVis3D/UI/UI/ImageVis3D.ui
===================================================================
---- imagevis3d-3.0.0.orig/ImageVis3D/UI/UI/ImageVis3D.ui 2013-09-05 17:48:54.194639198 +0200
-+++ imagevis3d-3.0.0/ImageVis3D/UI/UI/ImageVis3D.ui 2013-09-05 17:50:29.862639134 +0200
+--- ImageVis3D-3.1.0.orig/ImageVis3D/UI/UI/ImageVis3D.ui 2014-04-10 17:41:05.000000000 +0200
++++ ImageVis3D-3.1.0/ImageVis3D/UI/UI/ImageVis3D.ui 2014-04-10 17:44:27.000000000 +0200
@@ -1617,10 +1617,10 @@
</size>
</property>
@@ -90,11 +90,11 @@
</string>
</property>
<property name="minimum">
-Index: imagevis3d-3.0.0/UVFReader/DataSource.h
+Index: ImageVis3D-3.1.0/UVFReader/DataSource.h
===================================================================
---- imagevis3d-3.0.0.orig/UVFReader/DataSource.h 2013-09-05 17:50:53.114639119 +0200
-+++ imagevis3d-3.0.0/UVFReader/DataSource.h 2013-09-05 17:51:00.070639114 +0200
-@@ -385,9 +385,9 @@
+--- ImageVis3D-3.1.0.orig/UVFReader/DataSource.h 2014-04-10 17:41:05.000000000 +0200
++++ ImageVis3D-3.1.0/UVFReader/DataSource.h 2014-04-10 17:44:27.000000000 +0200
+@@ -647,9 +647,9 @@
metaPairs->AddPair("Description","Dummy file for testing purposes.");
if (EndianConvert::IsLittleEndian())
@@ -106,10 +106,10 @@
metaPairs->AddPair("Source Type","integer");
metaPairs->AddPair("Source Bit width",SysTools::ToString(iBitSize));
-Index: imagevis3d-3.0.0/Tuvok/IO/OBJGeoConverter.cpp
+Index: ImageVis3D-3.1.0/Tuvok/IO/OBJGeoConverter.cpp
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/IO/OBJGeoConverter.cpp 2013-09-05 17:51:15.570639104 +0200
-+++ imagevis3d-3.0.0/Tuvok/IO/OBJGeoConverter.cpp 2013-09-05 17:51:22.774639099 +0200
+--- ImageVis3D-3.1.0.orig/Tuvok/IO/OBJGeoConverter.cpp 2014-04-07 10:09:36.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/IO/OBJGeoConverter.cpp 2014-04-10 17:44:27.000000000 +0200
@@ -348,7 +348,7 @@
}
} else {
@@ -119,10 +119,10 @@
"use OBJX files to also export colors.");
}
-Index: imagevis3d-3.0.0/Tuvok/IO/VFFConverter.cpp
+Index: ImageVis3D-3.1.0/Tuvok/IO/VFFConverter.cpp
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/IO/VFFConverter.cpp 2013-09-05 17:51:35.730639090 +0200
-+++ imagevis3d-3.0.0/Tuvok/IO/VFFConverter.cpp 2013-09-05 17:51:48.554639082 +0200
+--- ImageVis3D-3.1.0.orig/Tuvok/IO/VFFConverter.cpp 2014-04-07 10:09:36.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/IO/VFFConverter.cpp 2014-04-10 17:44:27.000000000 +0200
@@ -193,7 +193,7 @@
}
@@ -132,10 +132,10 @@
return false;
}
-Index: imagevis3d-3.0.0/Tuvok/IO/QVISConverter.cpp
+Index: ImageVis3D-3.1.0/Tuvok/IO/QVISConverter.cpp
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/IO/QVISConverter.cpp 2013-09-05 17:53:03.426639032 +0200
-+++ imagevis3d-3.0.0/Tuvok/IO/QVISConverter.cpp 2013-09-05 17:53:19.566639021 +0200
+--- ImageVis3D-3.1.0.orig/Tuvok/IO/QVISConverter.cpp 2014-04-07 10:09:36.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/IO/QVISConverter.cpp 2014-04-10 17:44:27.000000000 +0200
@@ -209,7 +209,7 @@
fTarget << "ObjectType: TEXTURE_VOLUME_OBJECT" << endl;
fTarget << "ObjectModel: RGBA" << endl;
@@ -145,11 +145,11 @@
fTarget.close();
-Index: imagevis3d-3.0.0/Tuvok/IO/IOManager.cpp
+Index: ImageVis3D-3.1.0/Tuvok/IO/IOManager.cpp
===================================================================
---- imagevis3d-3.0.0.orig/Tuvok/IO/IOManager.cpp 2013-09-05 17:53:29.098639015 +0200
-+++ imagevis3d-3.0.0/Tuvok/IO/IOManager.cpp 2013-09-05 17:53:35.210639011 +0200
-@@ -364,7 +364,7 @@
+--- ImageVis3D-3.1.0.orig/Tuvok/IO/IOManager.cpp 2014-04-07 10:09:36.000000000 +0200
++++ ImageVis3D-3.1.0/Tuvok/IO/IOManager.cpp 2014-04-10 17:44:27.000000000 +0200
+@@ -370,7 +370,7 @@
}
if (pDICOMStack->m_bIsBigEndian != EndianConvert::IsBigEndian()) {
Modified: trunk/packages/imagevis3d/trunk/debian/watch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/watch 2014-04-10 14:52:43 UTC (rev 16653)
+++ trunk/packages/imagevis3d/trunk/debian/watch 2014-04-10 16:22:28 UTC (rev 16654)
@@ -1,3 +1,5 @@
version=3
-#http://www.sci.utah.edu/releases/imagevis3d_v([\d\.]+)/ImageVis3D-([\d\.]+)-src\.tar\.gz
-http://www.sci.utah.edu/download/imagevis3d.html .*/ImageVis3D-([\d\.]+)-src\.tar\.gz
+# github does not lib submodule, you also need:
+# https://github.com/SCIInstitute/Tuvok/archive/3.1.0.tar.gz
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/ImageVis3D-$1\.tar\.gz/ \
+ https://github.com/SCIInstitute/ImageVis3D/tags .*/v?(\d\S*)\.tar\.gz
More information about the debian-med-commit
mailing list