[Pkg-octave-commit] rev 810 - in trunk/packages/octaviz/debian: .
patches
Thomas Weber
thomas-guest at alioth.debian.org
Sun Nov 26 22:39:49 CET 2006
Author: thomas-guest
Date: 2006-11-26 22:39:49 +0100 (Sun, 26 Nov 2006)
New Revision: 810
Modified:
trunk/packages/octaviz/debian/changelog
trunk/packages/octaviz/debian/patches/60-vtkdata-path.patch
trunk/packages/octaviz/debian/rules
Log:
Bug fix for # 400071; all examples use vtkGetDataRoot.m now which exits with an
explaining error message if the vtkdata package is missing
Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog 2006-11-26 21:36:13 UTC (rev 809)
+++ trunk/packages/octaviz/debian/changelog 2006-11-26 21:39:49 UTC (rev 810)
@@ -1,3 +1,10 @@
+octaviz (0.4.5-4) unstable; urgency=low
+
+ * Changed 60-vtkdata-path, to warn if vtkdata package is not installed
+ (Closes: 400071)
+
+ --
+
octaviz (0.4.5-3) unstable; urgency=low
[ Thomas Weber ]
Modified: trunk/packages/octaviz/debian/patches/60-vtkdata-path.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/60-vtkdata-path.patch 2006-11-26 21:36:13 UTC (rev 809)
+++ trunk/packages/octaviz/debian/patches/60-vtkdata-path.patch 2006-11-26 21:39:49 UTC (rev 810)
@@ -1,11 +1,98 @@
-diff -Nur octaviz-0.4.0+cvs20060921/Scripts/vtkGetDataRoot.m octaviz-0.4.0+cvs20060921.new/Scripts/vtkGetDataRoot.m
---- octaviz-0.4.0+cvs20060921/Scripts/vtkGetDataRoot.m 2005-04-21 17:04:22.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Scripts/vtkGetDataRoot.m 2006-09-26 10:51:01.982706225 +0000
-@@ -2,6 +2,6 @@
+diff -Nur octaviz-0.4.5/Examples/PolyCut.m octaviz-0.4.5.new/Examples/PolyCut.m
+--- octaviz-0.4.5/Examples/PolyCut.m 2004-09-21 22:50:41.000000000 +0000
++++ octaviz-0.4.5.new/Examples/PolyCut.m 2006-11-24 14:18:32.509476763 +0000
+@@ -6,7 +6,9 @@
+ % First start by reading a cow model. We also generate surface normals for;
+ % prettier rendering.;
+ cow = vtkBYUReader();
+-cow.SetGeometryFileName("/usr/share/vtkdata/Data/Viewpoint/cow.g");
++##cow.SetGeometryFileName("/usr/share/vtkdata/Data/Viewpoint/cow.g");
++VTK_DATA_ROOT = vtkGetDataRoot();
++cow.SetGeometryFileName(strcat(VTK_DATA_ROOT,"/Data/Viewpoint/cow.g"));
+ cowNormals = vtkPolyDataNormals();
+ cowNormals.SetInput(cow.GetOutput());
+@@ -103,4 +105,4 @@
+
+ %renWin.SetSize(300, 300);
+
+-vtk_update(f);
+\ No newline at end of file
++vtk_update(f);
+diff -Nur octaviz-0.4.5/Examples/vtk_image_demo.m octaviz-0.4.5.new/Examples/vtk_image_demo.m
+--- octaviz-0.4.5/Examples/vtk_image_demo.m 2004-09-21 22:50:43.000000000 +0000
++++ octaviz-0.4.5.new/Examples/vtk_image_demo.m 2006-11-24 14:18:32.510476553 +0000
+@@ -18,7 +18,9 @@
+
+ reader = vtkPNGReader();
+ reader.SetDataSpacing(0.8, 0.8, 1.5)
+-reader.SetFileName("/usr/share/vtkdata/Data/fullhead15.png")
++% reader.SetFileName("/usr/share/vtkdata/Data/fullhead15.png")
++VTK_DATA_ROOT = vtkGetDataRoot();
++reader.SetFileName(strcat(VTK_DATA_ROOT,"/Data/fullhead15.png"));
+ shiftScale = vtkImageShiftScale();
+ shiftScale.SetInput(reader.GetOutput())
+ shiftScale.SetShift(0)
+diff -Nur octaviz-0.4.5/Examples/xyPlot.m octaviz-0.4.5.new/Examples/xyPlot.m
+--- octaviz-0.4.5/Examples/xyPlot.m 2004-09-21 22:50:41.000000000 +0000
++++ octaviz-0.4.5.new/Examples/xyPlot.m 2006-11-24 14:18:32.510476553 +0000
+@@ -14,10 +14,11 @@
+
+ vtk_init
+
++VTK_DATA_ROOT = vtkGetDataRoot();
+ % Create a PLOT3D reader and load the data.
+ pl3d = vtkPLOT3DReader("New");
+- pl3d.SetXYZFileName("/usr/share/vtkdata/Data/combxyz.bin")
+- pl3d.SetQFileName("/usr/share/vtkdata/Data/combq.bin")
++ pl3d.SetXYZFileName(strcat(VTK_DATA_ROOT,"/Data/combxyz.bin"));
++ pl3d.SetQFileName(strcat(VTK_DATA_ROOT,"/Data/combq.bin"));
+ pl3d.SetScalarFunctionNumber(100)
+ pl3d.SetVectorFunctionNumber(202)
+ pl3d.Update()
+diff -Nur octaviz-0.4.5/Scripts/vtkGetDataRoot.m octaviz-0.4.5.new/Scripts/vtkGetDataRoot.m
+--- octaviz-0.4.5/Scripts/vtkGetDataRoot.m 2005-04-21 17:04:22.000000000 +0000
++++ octaviz-0.4.5.new/Scripts/vtkGetDataRoot.m 2006-11-24 14:22:58.446568914 +0000
+@@ -2,6 +2,41 @@
+
## I guess this is a locally set variable; should put this in documents
## f = "/usr/share/vtkdata";
- f = "/usr/local/share/vtk/VTKData-release-4-4";
-+ f = "/usr/share/VTKData";
++
++ f = "";
++
++ ## The file that marks the VTKData/ directory
++ readme = "VTKData.readme";
++
++ ## check for a possible environmental variable
++ env_data_root = getenv("VTK_DATA_ROOT");
++
++ ## set at Octaviz's compile time
++ oct_data_root = "@VTK_DATA_ROOT@";
++
++ ## locally set path
++ local_data_root = "/usr/local/share/VTKData";
++
++ data_root_path = [ env_data_root; local_data_root; oct_data_root ];
++
++ ## check where we have the readme file
++ if (! isempty(data_root_path))
++ for i=[1:rows(data_root_path)]
++ curpath = strrep(data_root_path(i, :), " ", "");
++ ## remove all spaces; Octave pads all strings in data_root_path to the
++ ## same length
++ filename = [curpath, filesep, readme];
++ if (! isempty(stat(filename)))
++ f = curpath;
++ break;
++ endif
++ endfor
++ else
++ error("Empty search path for VTK_DATA_ROOT!");
++ endif
++
++ if (isempty(f))
++ error([readme, " not found! \n\t Did you install the vtkdata package?"]);
++ endif
endfunction
Modified: trunk/packages/octaviz/debian/rules
===================================================================
--- trunk/packages/octaviz/debian/rules 2006-11-26 21:36:13 UTC (rev 809)
+++ trunk/packages/octaviz/debian/rules 2006-11-26 21:39:49 UTC (rev 810)
@@ -48,7 +48,8 @@
( cd build ; \
cmake \
-DCMAKE_SKIP_RPATH:BOOL=YES \
- -DVTK_DIR:STRING=/usr/lib/vtk \
+ -DVTK_DIR:PATH=/usr/lib/vtk \
+ -DVTK_DATA_ROOT:PATH=/usr/share/VTKData \
-DOCTAVE_CONFIG:FILEPATH=/usr/bin/octave-config-$(OCT_VER) \
-DOCTAVE_OCT_DIR:PATH=$(OCTDIR) \
-DOCTAVE_M_DIR:PATH=$(MDIR) \
More information about the Pkg-octave-commit
mailing list