[med-svn] r8864 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Fri Dec 9 08:53:55 UTC 2011
Author: malat-guest
Date: 2011-12-09 08:53:55 +0000 (Fri, 09 Dec 2011)
New Revision: 8864
Modified:
trunk/packages/imagevis3d/trunk/debian/get-orig-source
trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch
trunk/packages/imagevis3d/trunk/debian/patches/glew.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch
trunk/packages/imagevis3d/trunk/debian/patches/series
trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch
Log:
Redo patches for release 2.0.1
Modified: trunk/packages/imagevis3d/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/get-orig-source 2011-12-09 08:30:28 UTC (rev 8863)
+++ trunk/packages/imagevis3d/trunk/debian/get-orig-source 2011-12-09 08:53:55 UTC (rev 8864)
@@ -10,9 +10,24 @@
TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
-REVISION=1672
+# Do the svn:externals checkout ourself:
+# https://gforge.sci.utah.edu/svn/imagevis3d
+# https://code.sci.utah.edu/svn/Tuvok
+# https://gforge.sci.utah.edu/svn/basics
+# https://gforge.sci.utah.edu/svn/scio
-svn export -r ${REVISION} https://gforge.sci.utah.edu/svn/imagevis3d ${FOLDER}
+IMAGEVIS3D_REVISION=1672
+TUVOK_REVISION=1879
+BASICS_REVISION=153
+SCIO_REVISION=1623
+
+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
+
# convenients copies of:
# boost/ bzip2/ cxxtest/ jpeglib/ tiff/ zlib/
rm -rf ${FOLDER}/Tuvok/IO/3rdParty
Modified: trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch 2011-12-09 08:30:28 UTC (rev 8863)
+++ trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch 2011-12-09 08:53:55 UTC (rev 8864)
@@ -1,8 +1,8 @@
-Index: imagevis3d-2.1.0/Tuvok/tvk.pro
+Index: imagevis3d-2.0.1/Tuvok/tvk.pro
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/tvk.pro 2011-12-08 18:06:06.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/tvk.pro 2011-12-08 18:06:39.000000000 +0100
-@@ -72,34 +72,6 @@
+--- imagevis3d-2.0.1.orig/Tuvok/tvk.pro 2011-12-09 09:51:15.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/tvk.pro 2011-12-09 09:51:22.000000000 +0100
+@@ -70,34 +70,6 @@
DebugOut/ConsoleOut.h \
DebugOut/MultiplexOut.h \
DebugOut/TextfileOut.h \
@@ -37,7 +37,7 @@
IO/AbstrConverter.h \
IO/AnalyzeConverter.h \
IO/BOVConverter.h \
-@@ -220,114 +192,6 @@
+@@ -210,114 +182,6 @@
DebugOut/ConsoleOut.cpp \
DebugOut/MultiplexOut.cpp \
DebugOut/TextfileOut.cpp \
Modified: trunk/packages/imagevis3d/trunk/debian/patches/glew.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/glew.patch 2011-12-09 08:30:28 UTC (rev 8863)
+++ trunk/packages/imagevis3d/trunk/debian/patches/glew.patch 2011-12-09 08:53:55 UTC (rev 8864)
@@ -1,8 +1,8 @@
-Index: imagevis3d-2.1.0/Tuvok/tvk.pro
+Index: imagevis3d-2.0.1/Tuvok/tvk.pro
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/tvk.pro 2011-12-08 18:03:14.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/tvk.pro 2011-12-08 18:03:23.000000000 +0100
-@@ -49,9 +49,6 @@
+--- imagevis3d-2.0.1.orig/Tuvok/tvk.pro 2011-12-09 09:49:40.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/tvk.pro 2011-12-09 09:51:15.000000000 +0100
+@@ -47,9 +47,6 @@
# Input
HEADERS += \
@@ -12,18 +12,18 @@
Basics/Appendix.h \
Basics/ArcBall.h \
Basics/Checksums/crc32.h \
-@@ -205,7 +202,6 @@
- Basics/LargeFileMMap.h
+@@ -195,7 +192,6 @@
+ StdTuvokDefines.h
SOURCES += \
- 3rdParty/GLEW/GL/glew.c \
Basics/Appendix.cpp \
Basics/ArcBall.cpp \
Basics/Checksums/MD5.cpp \
-Index: imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
+Index: imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2011-12-08 18:03:55.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2011-12-08 18:04:27.000000000 +0100
+--- imagevis3d-2.0.1.orig/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2011-12-09 09:49:40.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2011-12-09 09:51:15.000000000 +0100
@@ -41,7 +41,7 @@
#include <deque>
#include <utility>
@@ -33,10 +33,10 @@
#include "Basics/Vectors.h"
#include "GPUMemManDataStructs.h"
-Index: imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
+Index: imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2011-12-08 18:05:03.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2011-12-08 18:05:10.000000000 +0100
+--- imagevis3d-2.0.1.orig/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2011-12-09 09:49:40.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2011-12-09 09:51:15.000000000 +0100
@@ -49,7 +49,7 @@
#include <deque>
#include <string>
@@ -46,10 +46,10 @@
#include "boost/noncopyable.hpp"
#include "Basics/Vectors.h"
#include "IO/Brick.h"
-Index: imagevis3d-2.1.0/Tuvok/Renderer/GL/GLInclude.h
+Index: imagevis3d-2.0.1/Tuvok/Renderer/GL/GLInclude.h
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/Renderer/GL/GLInclude.h 2011-12-08 18:05:32.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/Renderer/GL/GLInclude.h 2011-12-08 18:05:42.000000000 +0100
+--- imagevis3d-2.0.1.orig/Tuvok/Renderer/GL/GLInclude.h 2011-12-09 09:49:40.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/Renderer/GL/GLInclude.h 2011-12-09 09:51:15.000000000 +0100
@@ -40,7 +40,7 @@
#define TUVOK_GLINCLUDE_H
Modified: trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch 2011-12-09 08:30:28 UTC (rev 8863)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch 2011-12-09 08:53:55 UTC (rev 8864)
@@ -1,7 +1,7 @@
-Index: imagevis3d-2.1.0/Tuvok/IO/IOManager.cpp
+Index: imagevis3d-2.0.1/Tuvok/IO/IOManager.cpp
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/IOManager.cpp 2011-12-08 18:10:13.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/IO/IOManager.cpp 2011-12-08 18:11:01.000000000 +0100
+--- imagevis3d-2.0.1.orig/Tuvok/IO/IOManager.cpp 2011-12-09 09:50:19.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/IO/IOManager.cpp 2011-12-09 09:51:27.000000000 +0100
@@ -45,7 +45,7 @@
#include <map>
#include <memory>
@@ -11,7 +11,7 @@
#include "IOManager.h"
-@@ -342,7 +342,7 @@
+@@ -339,7 +339,7 @@
const char *jpeg_data = jpg.data();
copy(jpeg_data, jpeg_data + jpg.size(), &vData[0]);
Modified: trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch 2011-12-09 08:30:28 UTC (rev 8863)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch 2011-12-09 08:53:55 UTC (rev 8864)
@@ -1,7 +1,7 @@
-Index: imagevis3d-2.1.0/Tuvok/IO/TuvokJPEG.cpp
+Index: imagevis3d-2.0.1/Tuvok/IO/TuvokJPEG.cpp
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/TuvokJPEG.cpp 2011-12-08 21:45:30.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/IO/TuvokJPEG.cpp 2011-12-08 21:46:39.000000000 +0100
+--- imagevis3d-2.0.1.orig/Tuvok/IO/TuvokJPEG.cpp 2011-12-09 09:48:39.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/IO/TuvokJPEG.cpp 2011-12-09 09:51:35.000000000 +0100
@@ -39,7 +39,7 @@
#include <fstream>
#include <iterator>
@@ -20,17 +20,3 @@
if(jpeg_read_header(&(this->jinfo), TRUE) != JPEG_HEADER_OK) {
T_ERROR("Could not read JPEG header, bailing...");
return;
-Index: imagevis3d-2.1.0/Tuvok/tvk.pro
-===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/tvk.pro 2011-12-08 21:48:03.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/tvk.pro 2011-12-08 21:48:14.000000000 +0100
-@@ -278,8 +278,7 @@
- Basics/LargeFile.cpp \
- Basics/LargeFileAIO.cpp \
- Basics/LargeFileFD.cpp \
-- Basics/LargeFileMMap.cpp \
-- IO/3rdParty/tiff/tif_unix.c
-+ Basics/LargeFileMMap.cpp
-
- win32 {
- HEADERS += \
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2011-12-09 08:30:28 UTC (rev 8863)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2011-12-09 08:53:55 UTC (rev 8864)
@@ -1,5 +1,4 @@
remove_convenientlibs.patch
-boost.patch
glew.patch
bzip2.patch
zlib.patch
@@ -7,7 +6,4 @@
bzip22.patch
tiff.patch
jpeg2.patch
-libs.patch
jpeg3.patch
-libs2.patch
-missing.patch
Modified: trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch 2011-12-09 08:30:28 UTC (rev 8863)
+++ trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch 2011-12-09 08:53:55 UTC (rev 8864)
@@ -1,8 +1,8 @@
-Index: imagevis3d-2.1.0/Tuvok/IO/scio.pro
+Index: imagevis3d-2.0.1/Tuvok/IO/scio.pro
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/scio.pro 2011-12-08 18:07:18.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/IO/scio.pro 2011-12-08 18:07:33.000000000 +0100
-@@ -85,38 +85,6 @@
+--- imagevis3d-2.0.1.orig/Tuvok/IO/scio.pro 2011-12-09 09:50:51.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/IO/scio.pro 2011-12-09 09:51:24.000000000 +0100
+@@ -83,38 +83,6 @@
./VGStudioConverter.cpp
HEADERS += \
@@ -41,10 +41,10 @@
./AbstrConverter.h \
./AbstrGeoConverter.h \
./AnalyzeConverter.h \
-Index: imagevis3d-2.1.0/Tuvok/IO/IASSConverter.cpp
+Index: imagevis3d-2.0.1/Tuvok/IO/IASSConverter.cpp
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/IASSConverter.cpp 2011-12-08 18:07:55.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/IO/IASSConverter.cpp 2011-12-08 18:08:14.000000000 +0100
+--- imagevis3d-2.0.1.orig/Tuvok/IO/IASSConverter.cpp 2011-12-09 09:48:39.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/IO/IASSConverter.cpp 2011-12-09 09:51:24.000000000 +0100
@@ -38,7 +38,7 @@
#include <sstream>
#include "boost/cstdint.hpp"
@@ -54,10 +54,10 @@
#endif
#include "IASSConverter.h"
#include <Basics/EndianConvert.h>
-Index: imagevis3d-2.1.0/Tuvok/IO/gzio.h
+Index: imagevis3d-2.0.1/Tuvok/IO/gzio.h
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/gzio.h 2011-12-08 18:09:12.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/IO/gzio.h 2011-12-08 18:09:45.000000000 +0100
+--- imagevis3d-2.0.1.orig/Tuvok/IO/gzio.h 2011-12-09 09:48:39.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/IO/gzio.h 2011-12-09 09:51:24.000000000 +0100
@@ -31,7 +31,7 @@
#define IV3D_GZIO_H
More information about the debian-med-commit
mailing list