[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. debian/0.60.1-1-3-g31e3bf7

Anton Gladky gladky.anton at gmail.com
Sun Feb 20 15:54:28 UTC 2011


The following commit has been merged in the master branch:
commit 061cadd2400651103d7768701d6a79b721dda567
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Feb 20 16:49:07 2011 +0100

    VTK is disabled temporarily, while compatibility with vtk-5.6 is not resolved.

diff --git a/debian/patches/disable-vtk-temporarily b/debian/patches/disable-vtk-temporarily
new file mode 100644
index 0000000..c370531
--- /dev/null
+++ b/debian/patches/disable-vtk-temporarily
@@ -0,0 +1,11 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -115,7 +115,7 @@
+ 	('optimize','Turn on optimizations (-1, 0 or 1); negative value sets optimization based on debugging: not optimize with debugging and vice versa.',-1,None,int),
+ 	ListVariable('exclude','Yade components that will not be built','none',names=['gui','extra','common','dem','lattice','snow']),
+ 	EnumVariable('PGO','Whether to "gen"erate or "use" Profile-Guided Optimization','',['','gen','use'],{'no':'','0':'','false':''},1),
+-	ListVariable('features','Optional features that are turned on','log4cxx,opengl,gts,openmp,vtk',names=['opengl','log4cxx','cgal','openmp','gts','vtk','python','gl2ps','devirt-functors','qt4','never_use_this_one']),
++	ListVariable('features','Optional features that are turned on','log4cxx,opengl,gts,openmp',names=['opengl','log4cxx','cgal','openmp','gts','vtk','python','gl2ps','devirt-functors','qt4','never_use_this_one']),
+ 	('jobs','Number of jobs to run at the same time (same as -j, but saved)',2,None,int),
+ 	#('extraModules', 'Extra directories with their own SConscript files (must be in-tree) (whitespace separated)',None,None,Split),
+ 	('buildPrefix','Where to create build-[version][variant] directory for intermediary files','..'),
diff --git a/debian/patches/series b/debian/patches/series
index 8c31b5d..b0520d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+disable-vtk-temporarily
 fix-memory-leak-in-insertionsortcollider.patch

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.



More information about the debian-science-commits mailing list