[3Depict/f12/master] * Update to 0.0.4

mycae mycae at fedoraproject.org
Sun Jan 23 19:56:33 UTC 2011


commit 73eb63aaf060d281e3ab382b76d88d7757578de6
Author: mycae <mycae at yahoo.com>
Date:   Sun Jan 23 19:56:07 2011 +0000

    * Update to 0.0.4

 .gitignore                                         |    1 +
 3Depict-0.0.4-no-debug-wait-for-cin.patch          |   19 +++++++++++++++++++
 ...-path.patch => 3Depict-0.0.4-texture-path.patch |    2 +-
 3Depict.spec                                       |   15 ++++++++++-----
 sources                                            |    2 +-
 5 files changed, 32 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94cf9e5..f93bb8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /3Depict-0.0.2.tar.gz
 /3Depict-0.0.3.tar.gz
+/3Depict-0.0.4.tar.gz
diff --git a/3Depict-0.0.4-no-debug-wait-for-cin.patch b/3Depict-0.0.4-no-debug-wait-for-cin.patch
new file mode 100644
index 0000000..62015d2
--- /dev/null
+++ b/3Depict-0.0.4-no-debug-wait-for-cin.patch
@@ -0,0 +1,19 @@
+--- src/basics.cpp	2011-01-23 03:08:13.000000000 +0000
++++ src/basics.cpp.new	2011-01-23 19:33:49.499236864 +0000
+@@ -93,7 +93,7 @@
+     std::cerr << "ASSERTION ERROR!" << std::endl;
+     std::cerr << "Filename: " << filename << std::endl;
+     std::cerr << "Line number: " << lineNumber << std::endl;
+-
++/*
+ 	std::cerr << "Do you wish to continue?(y/n)";
+ 	char y = 'a';
+ 	while (y != 'n' && y != 'y')
+@@ -101,6 +101,7 @@
+ 
+ 	if (y != 'y')
+ 		exit(1);
++*/
+ }
+ 
+ void dh_warn(const char * const filename, const unsigned int lineNumber,const char *message) 
diff --git a/3Depict-0.0.3-texture-path.patch b/3Depict-0.0.4-texture-path.patch
similarity index 93%
rename from 3Depict-0.0.3-texture-path.patch
rename to 3Depict-0.0.4-texture-path.patch
index cfc9ef4..6434461 100644
--- a/3Depict-0.0.3-texture-path.patch
+++ b/3Depict-0.0.4-texture-path.patch
@@ -1,7 +1,7 @@
 diff -r bf43078bcaed src/basics.h
 --- src/basics.h	Fri Nov 26 00:20:07 2010 +0000
 +++ src/basics.h	Fri Nov 26 00:21:07 2010 +0000
-@@ -107,7 +107,7 @@
+@@ -109,7 +109,7 @@
  
  	//Mac
  	//	- Look in cwd
diff --git a/3Depict.spec b/3Depict.spec
index b0d5737..14b83bb 100644
--- a/3Depict.spec
+++ b/3Depict.spec
@@ -1,5 +1,5 @@
 Name:		3Depict
-Version:	0.0.3
+Version:	0.0.4
 Release:	1%{?dist}
 Summary:	Valued 3D point cloud visualization and analysis
 Group:		Applications/Engineering
@@ -46,10 +46,12 @@ useful for general scalar valued point data purposes.
 %patch0
 
 %build
-#enable parallel build
-export CFLAGS="$CFLAGS %{optflags} -fopenmp" 
-export CXXFLAGS+="$CXXFLAGS %{optflags} -fopenmp -DGLIBCXX_PARALLEL"
-%configure 
+#--enable-openmp-parallel does not work -- there is a bug in the
+# tr1 headers with -D_GLIBCXX_PARALLEL . Lets drop that and only use
+# -fopenmp
+export CFLAGS="$CFLAGS -fopenmp"
+export CXXFLAGS="$CFLAGS -fopenmp"
+%configure  --enable-no-debug-checks
 make %{?_smp_mflags}
 
 pushd docs/manual-latex
@@ -95,6 +97,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jan 22 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.4-1
+- Update to 0.0.4
+
 * Fri Nov 26 2010 D Haley <mycae(a!t)yahoo.com> - 0.0.3-1
 - Update to 0.0.3
 
diff --git a/sources b/sources
index 8a52e08..90256e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5a6ae1c5d55aabb306467bae987dc64  3Depict-0.0.3.tar.gz
+7775fad11781b5481328733256b4024e  3Depict-0.0.4.tar.gz


More information about the scm-commits mailing list