rpms/OpenSceneGraph/devel OpenSceneGraph-2.2.0.diff,NONE,1.1

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3568

Added Files:
	OpenSceneGraph-2.2.0.diff 
Log Message:
New.

OpenSceneGraph-2.2.0.diff:

--- NEW FILE OpenSceneGraph-2.2.0.diff ---
diff -uNr OpenSceneGraph-2.2.0.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-2.2.0/CMakeModules/OsgMacroUtils.cmake
--- OpenSceneGraph-2.2.0.orig/CMakeModules/OsgMacroUtils.cmake	2007-09-14 13:06:12.000000000 +0200
+++ OpenSceneGraph-2.2.0/CMakeModules/OsgMacroUtils.cmake	2007-11-01 15:31:35.000000000 +0100
@@ -266,7 +266,7 @@
             
         SETUP_EXE(${IS_COMMANDLINE_APP})
         
-    INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin  )            
+    INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin  )            
 
 ENDMACRO(SETUP_EXAMPLE)
 
diff -uNr OpenSceneGraph-2.2.0.orig/doc/Doxyfiles/core_Doxyfile OpenSceneGraph-2.2.0/doc/Doxyfiles/core_Doxyfile
--- OpenSceneGraph-2.2.0.orig/doc/Doxyfiles/core_Doxyfile	2007-05-29 09:25:13.000000000 +0200
+++ OpenSceneGraph-2.2.0/doc/Doxyfiles/core_Doxyfile	2007-11-01 15:31:35.000000000 +0100
@@ -30,7 +30,7 @@
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = $(OSGHOME)/doc/
+OUTPUT_DIRECTORY = doc
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this 
@@ -556,7 +556,7 @@
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = OpenSceneGraphReferenceDocs
+HTML_OUTPUT = html
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
diff -uNr OpenSceneGraph-2.2.0.orig/examples/CMakeLists.txt OpenSceneGraph-2.2.0/examples/CMakeLists.txt
--- OpenSceneGraph-2.2.0.orig/examples/CMakeLists.txt	2007-09-03 14:27:37.000000000 +0200
+++ OpenSceneGraph-2.2.0/examples/CMakeLists.txt	2007-11-01 15:31:35.000000000 +0100
@@ -81,7 +81,7 @@
     ADD_SUBDIRECTORY(osgspotlight)
     ADD_SUBDIRECTORY(osgstereoimage)
     ADD_SUBDIRECTORY(osgteapot)
-    ADD_SUBDIRECTORY(osgtessellate)#)
+    ADD_SUBDIRECTORY(osgtessellate)
     ADD_SUBDIRECTORY(osgtext)
     ADD_SUBDIRECTORY(osgtexture1D)
     ADD_SUBDIRECTORY(osgtexture2D)
diff -uNr OpenSceneGraph-2.2.0.orig/src/osgPlugins/Inventor/ConvertFromInventor.cpp OpenSceneGraph-2.2.0/src/osgPlugins/Inventor/ConvertFromInventor.cpp
--- OpenSceneGraph-2.2.0.orig/src/osgPlugins/Inventor/ConvertFromInventor.cpp	2007-09-03 15:52:19.000000000 +0200
+++ OpenSceneGraph-2.2.0/src/osgPlugins/Inventor/ConvertFromInventor.cpp	2007-11-01 15:31:35.000000000 +0100
@@ -532,13 +532,14 @@
             case SoTexture2::BLEND:
                 texEnv->setMode(osg::TexEnv::BLEND);
                 break;
-
+#ifdef __COIN__
             // SGI's Inventor does not have REPLACE mode, but the Coin 3D library does.
             // Coin supports REPLACE since 2.2 release, TGS Inventor from 4.0.
             // Let's convert to the TexEnv anyway.
             case (SoTexture2::Model)GL_REPLACE: // SoTexture2::REPLACE is the same as GL_REPLACE
                 texEnv->setMode(osg::TexEnv::REPLACE);
                 break;
+#endif
         }
         stateSet->setTextureAttributeAndModes(0,texEnv.get(),osg::StateAttribute::ON);
     }
diff -uNr OpenSceneGraph-2.2.0.orig/src/osgPlugins/Inventor/ConvertToInventor.cpp OpenSceneGraph-2.2.0/src/osgPlugins/Inventor/ConvertToInventor.cpp
--- OpenSceneGraph-2.2.0.orig/src/osgPlugins/Inventor/ConvertToInventor.cpp	2007-09-30 20:33:57.000000000 +0200
+++ OpenSceneGraph-2.2.0/src/osgPlugins/Inventor/ConvertToInventor.cpp	2007-11-01 15:31:35.000000000 +0100
@@ -25,6 +25,7 @@
 //  but you are not forced to do so.
 //
 
+#include <assert.h>
 
 #include <osg/BlendFunc>
 #include <osg/Billboard>
@@ -67,7 +68,9 @@
 #include <Inventor/nodes/SoSphere.h>
 #include <Inventor/nodes/SoTexture2.h>
 #include <Inventor/nodes/SoTextureCoordinate2.h>
+#ifdef __COIN__
 #include <Inventor/nodes/SoTextureCoordinate3.h>
+#endif
 #include <Inventor/nodes/SoTextureCoordinateEnvironment.h>
 #include <Inventor/nodes/SoTransform.h>
 #include <Inventor/nodes/SoTranslation.h>
@@ -1226,6 +1229,7 @@
                                                startIndex, n);
         }
       } else
+#ifdef __COIN__
       if (ivTexCoords->isOfType(SoTextureCoordinate3::getClassTypeId())) {
         nonIndexedTexCoords = new SoTextureCoordinate3;
         if (ok) {
@@ -1237,6 +1241,7 @@
                                                startIndex, n);
         }
       } else
+#endif
         nonIndexedTexCoords = ivTexCoords;
 
     // create alternate normals
@@ -1537,9 +1542,11 @@
       if (g->getTexCoordArray(0)->getDataSize() <= 2) {
         texCoords = new SoTextureCoordinate2;
         osgArray2ivMField(g->getTexCoordArray(0), ((SoTextureCoordinate2*)texCoords)->point);
+#ifdef __COIN__
       } else {
         texCoords = new SoTextureCoordinate3;
         osgArray2ivMField(g->getTexCoordArray(0), ((SoTextureCoordinate3*)texCoords)->point);
+#endif
       }
     }
     if (texCoords)