[choreonoid] 03/07: Add patch to fix OpenScene Graph compilation issues (close: #719387, close: #719387)
Thomas Moulard
thomas_moulard-guest at alioth.debian.org
Thu Sep 26 05:22:32 UTC 2013
This is an automated email from the git hooks/post-receive script.
thomas_moulard-guest pushed a commit to branch master
in repository choreonoid.
commit 6a955316bd562f70f7911c395ab74701bf12c222
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date: Wed Sep 25 14:46:25 2013 +0900
Add patch to fix OpenScene Graph compilation issues (close: #719387, close: #719387)
---
...ilation-failure-with-recent-Boost-version.patch | 4 +-
...event-moc-qt-from-analyzing-Boost-headers.patch | 2 +-
debian/patches/0003-Fix-multiarchi-support.patch | 2 +-
...reonoid-program-when-build-type-is-RelWit.patch | 2 +-
...all-pkg-config-file-in-lib-arch-directory.patch | 2 +-
.../patches/0006-Port-to-Boost-Filesystem-v3.patch | 34 +++----
...t-from-pointer-to-udword-losing-precision.patch | 6 +-
...008-Fix-OpenSceneGraph-compilation-issues.patch | 107 ++++++++++++++++++++
debian/patches/series | 1 +
9 files changed, 134 insertions(+), 26 deletions(-)
diff --git a/debian/patches/0001-Fix-compilation-failure-with-recent-Boost-version.patch b/debian/patches/0001-Fix-compilation-failure-with-recent-Boost-version.patch
index 5d50c6a..1d87a12 100644
--- a/debian/patches/0001-Fix-compilation-failure-with-recent-Boost-version.patch
+++ b/debian/patches/0001-Fix-compilation-failure-with-recent-Boost-version.patch
@@ -10,8 +10,8 @@ See https://svn.boost.org/trac/boost/ticket/6943
Forwarded: yes
Author: Thomas Moulard <thomas.moulard at gmail.com>
---
- src/Util/Referenced.h | 8 ++++----
- src/Util/YamlNodes.h | 8 ++++----
+ src/Util/Referenced.h | 8 ++++----
+ src/Util/YamlNodes.h | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Util/Referenced.h b/src/Util/Referenced.h
diff --git a/debian/patches/0002-Prevent-moc-qt-from-analyzing-Boost-headers.patch b/debian/patches/0002-Prevent-moc-qt-from-analyzing-Boost-headers.patch
index a01dfd7..4d71f74 100644
--- a/debian/patches/0002-Prevent-moc-qt-from-analyzing-Boost-headers.patch
+++ b/debian/patches/0002-Prevent-moc-qt-from-analyzing-Boost-headers.patch
@@ -5,7 +5,7 @@ Subject: Prevent moc-qt from analyzing Boost headers.
Forwarded: yes
Author: Thomas Moulard <thomas.moulard at gmail.com>
---
- src/CMakeLists.txt | 4 ++++
+ src/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/debian/patches/0003-Fix-multiarchi-support.patch b/debian/patches/0003-Fix-multiarchi-support.patch
index 40530ae..d50dbcd 100644
--- a/debian/patches/0003-Fix-multiarchi-support.patch
+++ b/debian/patches/0003-Fix-multiarchi-support.patch
@@ -7,7 +7,7 @@ Do not make the assumption that the library directory is lib.
Forwarded: yes
Author: Thomas Moulard <thomas.moulard at gmail.com>
---
- CMakeLists.txt | 11 +++++++----
+ CMakeLists.txt | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch b/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch
index 237cd9f..80e71d6 100644
--- a/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch
+++ b/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch
@@ -7,7 +7,7 @@ Install choreonoid program when build type is RelWithDebInfo.
Forwarded: yes
Author: Thomas Moulard <thomas.moulard at gmail.com>
---
- src/Choreonoid/CMakeLists.txt | 2 +-
+ src/Choreonoid/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Choreonoid/CMakeLists.txt b/src/Choreonoid/CMakeLists.txt
diff --git a/debian/patches/0005-Install-pkg-config-file-in-lib-arch-directory.patch b/debian/patches/0005-Install-pkg-config-file-in-lib-arch-directory.patch
index 2ab382d..335120d 100644
--- a/debian/patches/0005-Install-pkg-config-file-in-lib-arch-directory.patch
+++ b/debian/patches/0005-Install-pkg-config-file-in-lib-arch-directory.patch
@@ -7,7 +7,7 @@ Install pkg-config file in lib/arch directory.
Forwarded: yes
Author: Thomas Moulard <thomas.moulard at gmail.com>
---
- misc/pkgconfig/CMakeLists.txt | 3 ++-
+ misc/pkgconfig/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/misc/pkgconfig/CMakeLists.txt b/misc/pkgconfig/CMakeLists.txt
diff --git a/debian/patches/0006-Port-to-Boost-Filesystem-v3.patch b/debian/patches/0006-Port-to-Boost-Filesystem-v3.patch
index 35a9430..9896e6c 100644
--- a/debian/patches/0006-Port-to-Boost-Filesystem-v3.patch
+++ b/debian/patches/0006-Port-to-Boost-Filesystem-v3.patch
@@ -7,20 +7,20 @@ Port to Boost Filesystem v3.
Forwarded: yes
Author: Thomas Moulard <thomas.moulard at gmail.com>
---
- CMakeLists.txt | 4 ----
- src/Base/App.cpp | 20 ++++++++++----------
- src/Base/AppConfig.cpp | 6 +++---
- src/Base/Archive.cpp | 8 ++++----
- src/Base/ItemManager.cpp | 2 +-
- src/Base/MovieGenerator.cpp | 2 +-
- src/Base/PluginManager.cpp | 2 +-
- src/Base/ProjectManager.cpp | 4 ++--
- src/Base/SceneItem.cpp | 4 ++--
- src/Body/BodyCustomizerInterface.cpp | 8 ++++----
- src/Body/BodyLoader.cpp | 4 ++--
- src/Body/BodyMotionUtil.cpp | 16 ++++++++--------
- src/BodyPlugin/BodyItem.cpp | 2 +-
- src/Util/VrmlParser.cpp | 10 +++++-----
+ CMakeLists.txt | 4 ----
+ src/Base/App.cpp | 20 ++++++++++----------
+ src/Base/AppConfig.cpp | 6 +++---
+ src/Base/Archive.cpp | 8 ++++----
+ src/Base/ItemManager.cpp | 2 +-
+ src/Base/MovieGenerator.cpp | 2 +-
+ src/Base/PluginManager.cpp | 2 +-
+ src/Base/ProjectManager.cpp | 4 ++--
+ src/Base/SceneItem.cpp | 4 ++--
+ src/Body/BodyCustomizerInterface.cpp | 8 ++++----
+ src/Body/BodyLoader.cpp | 4 ++--
+ src/Body/BodyMotionUtil.cpp | 16 ++++++++--------
+ src/BodyPlugin/BodyItem.cpp | 2 +-
+ src/Util/VrmlParser.cpp | 10 +++++-----
14 files changed, 44 insertions(+), 48 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,7 +96,7 @@ index 01ccc6d..104a79d 100644
}
diff --git a/src/Base/AppConfig.cpp b/src/Base/AppConfig.cpp
-index 3dc150a..0e30e00 100644
+index 3dc150a..5eb3a9f 100644
--- a/src/Base/AppConfig.cpp
+++ b/src/Base/AppConfig.cpp
@@ -48,7 +48,7 @@ bool AppConfig::initialize(const std::string& application_, const std::string& o
@@ -104,7 +104,7 @@ index 3dc150a..0e30e00 100644
if(!configDirPath.empty()){
fullPath = configDirPath / filePath;
- std::string fullPathString = fullPath.file_string();
-+ std::string fullPathString = fullPath.native();
++ std::string fullPathString = fullPath.native();
load(fullPathString);
}
@@ -127,7 +127,7 @@ index 3dc150a..0e30e00 100644
diff --git a/src/Base/Archive.cpp b/src/Base/Archive.cpp
-index 529e3fa..4d03202 100644
+index 529e3fa..4cd1364 100644
--- a/src/Base/Archive.cpp
+++ b/src/Base/Archive.cpp
@@ -122,7 +122,7 @@ void Archive::initSharedInfo(const std::string& projectFile)
diff --git a/debian/patches/0007-Fix-cast-from-pointer-to-udword-losing-precision.patch b/debian/patches/0007-Fix-cast-from-pointer-to-udword-losing-precision.patch
index 565bb49..f82e64a 100644
--- a/debian/patches/0007-Fix-cast-from-pointer-to-udword-losing-precision.patch
+++ b/debian/patches/0007-Fix-cast-from-pointer-to-udword-losing-precision.patch
@@ -7,9 +7,9 @@ Fix cast from pointer to udword losing precision.
Forwarded: yes
Author: Thomas Moulard <thomas.moulard at gmail.com>
---
- src/Collision/Opcode/OPC_AABBTree.h | 6 +-----
- src/Collision/Opcode/OPC_OptimizedTree.h | 6 +-----
- src/Collision/Opcode/Opcode.h | 1 +
+ src/Collision/Opcode/OPC_AABBTree.h | 6 +-----
+ src/Collision/Opcode/OPC_OptimizedTree.h | 6 +-----
+ src/Collision/Opcode/Opcode.h | 1 +
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/Collision/Opcode/OPC_AABBTree.h b/src/Collision/Opcode/OPC_AABBTree.h
diff --git a/debian/patches/0008-Fix-OpenSceneGraph-compilation-issues.patch b/debian/patches/0008-Fix-OpenSceneGraph-compilation-issues.patch
new file mode 100644
index 0000000..f7fb955
--- /dev/null
+++ b/debian/patches/0008-Fix-OpenSceneGraph-compilation-issues.patch
@@ -0,0 +1,107 @@
+From: Thomas Moulard <thomas.moulard at gmail.com>
+Date: Wed, 25 Sep 2013 14:45:09 +0900
+Subject: Fix OpenSceneGraph compilation issues
+
+Fix OpenSceneGraph compilation issues
+
+Forwarded: yes
+Author: Thomas Moulard <thomas.moulard at gmail.com>
+---
+ src/Base/OsgNormalVisualizer.cpp | 18 +++++++++---------
+ src/Base/VrmlToOsgConverter.cpp | 12 ++++++------
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/Base/OsgNormalVisualizer.cpp b/src/Base/OsgNormalVisualizer.cpp
+index 2d84167..4d4fe3e 100644
+--- a/src/Base/OsgNormalVisualizer.cpp
++++ b/src/Base/OsgNormalVisualizer.cpp
+@@ -104,12 +104,12 @@ void NormalExtractor::apply(osg::Geode& geode)
+ if(normalIndices){
+ normalIndexIter = normalIndices->begin();
+ }
+-
++
+ osg::Geometry::PrimitiveSetList::iterator it;
+ for(it = primitiveSets.begin(); it != primitiveSets.end(); ++it){
+ osg::PrimitiveSet* primitiveSet = it->get();
+
+- if(binding == osg::Geometry::BIND_PER_PRIMITIVE_SET){
++ if(binding == deprecated_osg::Geometry::BIND_PER_PRIMITIVE_SET){
+ extractPrimitiveSetNormal(primitiveSet);
+ } else {
+ switch(primitiveSet->getMode()){
+@@ -168,27 +168,27 @@ void NormalExtractor::extractPrimitiveNormals
+ (const osg::PrimitiveSet* primitiveSet, osg::Geometry::AttributeBinding binding, int numVertices)
+ {
+ for(size_t i=0; i < primitiveSet->getNumPrimitives(); ++i){
+-
+- if(mode == NormalVisualizer::SURFACE || binding == osg::Geometry::BIND_PER_PRIMITIVE){
++
++ if(mode == NormalVisualizer::SURFACE || binding == deprecated_osg::Geometry::BIND_PER_PRIMITIVE){
+ osg::Vec3 n(0.0, 0.0, 0.0);
+- if(binding == osg::Geometry::BIND_PER_PRIMITIVE){
++ if(binding == deprecated_osg::Geometry::BIND_PER_PRIMITIVE){
+ n = *(normalIter++);
+ } else if(binding == osg::Geometry::BIND_PER_VERTEX){
+ for(int j = 0; j < numVertices; ++j){
+ n += *(normalIter++);
+ }
+- n /= numVertices;
++ n /= numVertices;
+ }
+-
++
+ osg::Vec3 v(0.0, 0.0, 0.0);
+ for(int j = 0; j < numVertices; ++j){
+ v += *(vertexIter++);
+ }
+ v /= numVertices;
+-
++
+ normalLines->push_back(v);
+ normalLines->push_back(v + n * scale);
+-
++
+ } else if(mode == NormalVisualizer::VERTEX){
+ for(int j = 0; j < numVertices; ++j){
+ osg::Vec3& v = *(vertexIter++);
+diff --git a/src/Base/VrmlToOsgConverter.cpp b/src/Base/VrmlToOsgConverter.cpp
+index 8093c1f..bceb26a 100644
+--- a/src/Base/VrmlToOsgConverter.cpp
++++ b/src/Base/VrmlToOsgConverter.cpp
+@@ -399,10 +399,10 @@ osg::Geometry* VrmlToOsgConverterImpl::createGeometryFromIndexedFaceSet(VrmlInde
+ if(vface->normalPerVertex == true){
+ geometry->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
+ } else {
+- geometry->setNormalBinding(osg::Geometry::BIND_PER_PRIMITIVE);
++ geometry->setNormalBinding(deprecated_osg::Geometry::BIND_PER_PRIMITIVE);
+ }
+ }
+-
++
+ if(vface->color){
+ MFColor& c = vface->color->color;
+ if(!c.empty()){
+@@ -430,18 +430,18 @@ osg::Geometry* VrmlToOsgConverterImpl::createGeometryFromIndexedFaceSet(VrmlInde
+ }
+ geometry->setColorIndices(indices);
+ }
+-
++
+ if(vface->colorPerVertex == true){
+ geometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
+ } else {
+- geometry->setColorBinding(osg::Geometry::BIND_PER_PRIMITIVE);
++ geometry->setColorBinding(deprecated_osg::Geometry::BIND_PER_PRIMITIVE);
+ }
+ }
+ }
+-
++
+ if(!vface->normal){
+ osgUtil::SmoothingVisitor::smooth(*geometry);
+ }
+-
++
+ return geometry;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 07821c0..053ebe8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-Install-pkg-config-file-in-lib-arch-directory.patch
0006-Port-to-Boost-Filesystem-v3.patch
0007-Fix-cast-from-pointer-to-udword-losing-precision.patch
+0008-Fix-OpenSceneGraph-compilation-issues.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/choreonoid.git
More information about the debian-science-commits
mailing list