rpms/OpenSceneGraph/devel OpenSceneGraph-2.2.0.diff,1.1,1.2
Ralf Corsépius (corsepiu)
fedora-extras-commits at redhat.com
Mon Feb 11 06:04:02 UTC 2008
Author: corsepiu
Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28841
Modified Files:
OpenSceneGraph-2.2.0.diff
Log Message:
Add gcc43 hacks.
OpenSceneGraph-2.2.0.diff:
Index: OpenSceneGraph-2.2.0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.2.0.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenSceneGraph-2.2.0.diff 2 Nov 2007 09:42:05 -0000 1.1
+++ OpenSceneGraph-2.2.0.diff 11 Feb 2008 06:03:50 -0000 1.2
@@ -1,6 +1,6 @@
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
++++ OpenSceneGraph-2.2.0/CMakeModules/OsgMacroUtils.cmake 2008-02-10 08:29:03.000000000 +0100
@@ -266,7 +266,7 @@
SETUP_EXE(${IS_COMMANDLINE_APP})
@@ -12,7 +12,7 @@
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
++++ OpenSceneGraph-2.2.0/doc/Doxyfiles/core_Doxyfile 2008-02-10 08:29:03.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.
@@ -33,7 +33,7 @@
# 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
++++ OpenSceneGraph-2.2.0/examples/CMakeLists.txt 2008-02-10 08:29:03.000000000 +0100
@@ -81,7 +81,7 @@
ADD_SUBDIRECTORY(osgspotlight)
ADD_SUBDIRECTORY(osgstereoimage)
@@ -43,9 +43,109 @@
ADD_SUBDIRECTORY(osgtext)
ADD_SUBDIRECTORY(osgtexture1D)
ADD_SUBDIRECTORY(osgtexture2D)
+diff -uNr OpenSceneGraph-2.2.0.orig/examples/osgdepthpartition/DistanceAccumulator.cpp OpenSceneGraph-2.2.0/examples/osgdepthpartition/DistanceAccumulator.cpp
+--- OpenSceneGraph-2.2.0.orig/examples/osgdepthpartition/DistanceAccumulator.cpp 2007-06-12 16:20:16.000000000 +0200
++++ OpenSceneGraph-2.2.0/examples/osgdepthpartition/DistanceAccumulator.cpp 2008-02-11 06:08:18.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include <osg/Projection>
+ #include <algorithm>
+ #include <math.h>
++#include <limits.h>
+
+ /** Function that sees whether one DistancePair should come before another in
+ an sorted list. Used to sort the vector of DistancePairs. */
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osg/DisplaySettings.cpp OpenSceneGraph-2.2.0/src/osg/DisplaySettings.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osg/DisplaySettings.cpp 2007-08-23 16:31:23.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osg/DisplaySettings.cpp 2008-02-10 08:29:29.000000000 +0100
+@@ -17,6 +17,7 @@
+ #include <osg/ref_ptr>
+
+ #include <algorithm>
++#include <string.h>
+
+ using namespace osg;
+ using namespace std;
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osg/Image.cpp OpenSceneGraph-2.2.0/src/osg/Image.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osg/Image.cpp 2007-10-01 10:50:58.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osg/Image.cpp 2008-02-10 08:43:16.000000000 +0100
+@@ -23,6 +23,9 @@
+ #include <osg/Texture3D>
+ #include <osg/Texture2DArray>
+
++#include <string.h>
++#include <stdlib.h>
++
+ #include "dxtctool.h"
+
+ using namespace osg;
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osg/Notify.cpp OpenSceneGraph-2.2.0/src/osg/Notify.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osg/Notify.cpp 2006-07-18 17:21:48.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osg/Notify.cpp 2008-02-10 08:58:15.000000000 +0100
+@@ -12,6 +12,7 @@
+ */
+ #include <osg/Notify>
+ #include <string>
++#include <stdlib.h>
+ #include <iostream>
+ #include <fstream>
+
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgDB/Field.cpp OpenSceneGraph-2.2.0/src/osgDB/Field.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgDB/Field.cpp 2006-07-18 17:21:48.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgDB/Field.cpp 2008-02-10 09:11:35.000000000 +0100
+@@ -10,6 +10,7 @@
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * OpenSceneGraph Public License for more details.
+ */
++#include <string.h>
+ #include <osgDB/Field>
+
+ using namespace osgDB;
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgDB/FileNameUtils.cpp OpenSceneGraph-2.2.0/src/osgDB/FileNameUtils.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgDB/FileNameUtils.cpp 2007-07-23 22:10:13.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgDB/FileNameUtils.cpp 2008-02-10 09:33:54.000000000 +0100
+@@ -11,6 +11,7 @@
+ * OpenSceneGraph Public License for more details.
+ */
+ #include <stdlib.h>
++#include <string.h>
+ #include <limits.h>
+
+ #include <osgDB/FileNameUtils>
+@@ -24,7 +25,7 @@
+ #elif defined(__GNUC__) || !defined(WIN32) || defined(__MWERKS__)
+ #include <cctype>
+ using std::tolower;
+- using std::strlen;
++// using std::strlen;
+ #endif
+
+ using namespace std;
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgDB/Registry.cpp OpenSceneGraph-2.2.0/src/osgDB/Registry.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgDB/Registry.cpp 2007-10-03 21:54:30.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgDB/Registry.cpp 2008-02-10 09:44:58.000000000 +0100
+@@ -35,7 +35,7 @@
+ #elif defined(__GNUC__) || !defined(WIN32) || defined(__MWERKS__)
+ #include <cctype>
+ using std::tolower;
+- using std::strlen;
++// using std::strlen;
+ #endif
+
+
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgPlugins/hdr/hdrwriter.cpp OpenSceneGraph-2.2.0/src/osgPlugins/hdr/hdrwriter.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgPlugins/hdr/hdrwriter.cpp 2007-10-01 17:11:54.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgPlugins/hdr/hdrwriter.cpp 2008-02-10 14:54:12.000000000 +0100
+@@ -25,6 +25,7 @@
+
+ */
+
++#include <stdlib.h>
+
+ #include "hdrwriter.h"
+
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
++++ OpenSceneGraph-2.2.0/src/osgPlugins/Inventor/ConvertFromInventor.cpp 2008-02-10 08:29:03.000000000 +0100
@@ -532,13 +532,14 @@
case SoTexture2::BLEND:
texEnv->setMode(osg::TexEnv::BLEND);
@@ -64,7 +164,7 @@
}
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
++++ OpenSceneGraph-2.2.0/src/osgPlugins/Inventor/ConvertToInventor.cpp 2008-02-10 17:47:54.000000000 +0100
@@ -25,6 +25,7 @@
// but you are not forced to do so.
//
@@ -83,6 +183,96 @@
#include <Inventor/nodes/SoTextureCoordinateEnvironment.h>
#include <Inventor/nodes/SoTransform.h>
#include <Inventor/nodes/SoTranslation.h>
+@@ -208,7 +211,7 @@
+
+
+ template<typename fieldClass, typename ivType, typename osgType>
+-static void osgArray2ivMField_template(const osg::Array *array, fieldClass &field, int startIndex = 0, int stopIndex = 0, int numItemsUntilMinusOne = 0)
++void osgArray2ivMField_template(const osg::Array *array, fieldClass &field, int startIndex = 0, int stopIndex = 0, int numItemsUntilMinusOne = 0)
+ {
+ int i,num = array->getNumElements();
+ if (startIndex!=0 || stopIndex!=0) {
+@@ -248,7 +251,7 @@
+
+
+ template<typename ivType, typename osgType, int shift>
+-static void osgArray2ivMField_composite_template_worker(ivType *dest, osgType *src, int num, int numItemsUntilMinusOne = 0)
++void osgArray2ivMField_composite_template_worker(ivType *dest, osgType *src, int num, int numItemsUntilMinusOne = 0)
+ {
+ for (int i=0; i<num; i++, src+=shift)
+ dest[i] = ivType(src);
+@@ -256,7 +259,7 @@
+
+
+ template<>
+-static void osgArray2ivMField_composite_template_worker<SbColor, GLubyte, 4>(SbColor *dest, GLubyte *src, int num, int numItemsUntilMinusOne)
++void osgArray2ivMField_composite_template_worker<SbColor, GLubyte, 4>(SbColor *dest, GLubyte *src, int num, int numItemsUntilMinusOne)
+ {
+ for (int i=0; i<num; i++, src+=4)
+ dest[i].setValue(src[0]/255.f, src[1]/255.f, src[2]/255.f);
+@@ -264,7 +267,7 @@
+
+
+ template<>
+-static void osgArray2ivMField_composite_template_worker<SbVec3f, float, 2>(SbVec3f *dest, float *src, int num, int numItemsUntilMinusOne)
++void osgArray2ivMField_composite_template_worker<SbVec3f, float, 2>(SbVec3f *dest, float *src, int num, int numItemsUntilMinusOne)
+ {
+ for (int i=0; i<num; i++, src+=2)
+ dest[i].setValue(src[0], src[1], 0.f);
+@@ -272,7 +275,7 @@
+
+
+ template<typename fieldClass, typename ivType, typename osgType, int shift>
+-static void osgArray2ivMField_composite_template(const osg::Array *array, fieldClass &field, int startIndex = 0, int stopIndex = 0, int numItemsUntilMinusOne = 0)
++void osgArray2ivMField_composite_template(const osg::Array *array, fieldClass &field, int startIndex = 0, int stopIndex = 0, int numItemsUntilMinusOne = 0)
+ {
+ int num = array->getNumElements();
+ if (startIndex!=0 || stopIndex!=0) {
+@@ -293,7 +296,7 @@
+
+
+ template<typename fieldClass, typename ivType, typename osgType, int numComponents>
+-static void osgArray2ivMField_pack_template(const osg::Array *array, fieldClass &field,
++void osgArray2ivMField_pack_template(const osg::Array *array, fieldClass &field,
+ osgType mul, osgType max, osgType min,
+ int startIndex = 0, int stopIndex = 0, int numItemsUntilMinusOne = 0)
+ {
+@@ -324,7 +327,7 @@
+
+
+ template<typename fieldClass, typename fieldItemType>
+-static bool applicateIntType(const osg::Array *array, fieldClass &field, int startIndex, int stopIndex, int numItemsUntilMinusOne)
++bool applicateIntType(const osg::Array *array, fieldClass &field, int startIndex, int stopIndex, int numItemsUntilMinusOne)
+ {
+ if (field.isOfType(fieldClass::getClassTypeId()))
+ {
+@@ -413,7 +416,7 @@
+
+
+ template<typename variableType, typename indexType>
+-static bool deindex(variableType *dest, const variableType *src, const int srcNum,
++bool deindex(variableType *dest, const variableType *src, const int srcNum,
+ const indexType *indices, const int numToProcess)
+ {
+ for (int i=0; i<numToProcess; i++) {
+@@ -426,7 +429,7 @@
+
+
+ template<typename variableType>
+-static bool deindex(variableType *dest, const variableType *src, const int srcNum,
++bool deindex(variableType *dest, const variableType *src, const int srcNum,
+ const osg::Array *indices, const int numToProcess)
+ {
+ if (int(indices->getNumElements()) < numToProcess) {
+@@ -458,7 +461,7 @@
+
+
+ template<typename variableType, typename fieldType>
+-static bool processArray(const osg::Array *indices, const osg::Array *drawElemIndices,
++bool processArray(const osg::Array *indices, const osg::Array *drawElemIndices,
+ fieldType *destField, const fieldType *srcField,
+ int startIndex, int numToProcess)
+ {
@@ -1226,6 +1229,7 @@
startIndex, n);
}
@@ -111,3 +301,94 @@
}
}
if (texCoords)
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgPlugins/Inventor/ConvertToInventor.h OpenSceneGraph-2.2.0/src/osgPlugins/Inventor/ConvertToInventor.h
+--- OpenSceneGraph-2.2.0.orig/src/osgPlugins/Inventor/ConvertToInventor.h 2007-09-30 20:33:57.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgPlugins/Inventor/ConvertToInventor.h 2008-02-10 16:40:34.000000000 +0100
+@@ -85,7 +85,7 @@
+ bool useIvExtensions;
+ SoSeparator *ivRoot;
+
+- typedef struct InventorState {
++ struct InventorState {
+ class SoGroup *ivHead;
+ class SoTexture2 *ivTexture;
+ class SoMaterial *ivMaterial;
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgPlugins/lwo/ReaderWriterLWO.cpp OpenSceneGraph-2.2.0/src/osgPlugins/lwo/ReaderWriterLWO.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgPlugins/lwo/ReaderWriterLWO.cpp 2007-07-06 15:54:26.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgPlugins/lwo/ReaderWriterLWO.cpp 2008-02-10 15:09:45.000000000 +0100
+@@ -16,6 +16,7 @@
+ #endif
+
+ #include <string>
++#include <memory>
+ #include <sstream>
+ #include <algorithm>
+
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgPlugins/x/directx.cpp OpenSceneGraph-2.2.0/src/osgPlugins/x/directx.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgPlugins/x/directx.cpp 2006-07-04 11:13:15.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgPlugins/x/directx.cpp 2008-02-10 18:17:10.000000000 +0100
+@@ -30,6 +30,7 @@
+
+ #include <iostream>
+ #include <sstream>
++#include <string.h>
+
+ #include <math.h>
+
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgPlugins/x/mesh.cpp OpenSceneGraph-2.2.0/src/osgPlugins/x/mesh.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgPlugins/x/mesh.cpp 2007-03-01 14:41:28.000000000 +0100
++++ OpenSceneGraph-2.2.0/src/osgPlugins/x/mesh.cpp 2008-02-11 05:12:01.000000000 +0100
+@@ -29,6 +29,8 @@
+ #include "directx.h"
+
+ #include <iostream>
++#include <string.h>
++#include <stdlib.h>
+
+ #include <osg/Notify>
+
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgPlugins/x/types.cpp OpenSceneGraph-2.2.0/src/osgPlugins/x/types.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgPlugins/x/types.cpp 2007-04-06 17:36:13.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgPlugins/x/types.cpp 2008-02-11 05:17:40.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include "types.h"
+
+ #include <iostream>
++#include <stdlib.h>
+
+ using namespace std;
+
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgText/DefaultFont.cpp OpenSceneGraph-2.2.0/src/osgText/DefaultFont.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgText/DefaultFont.cpp 2007-09-04 14:38:42.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgText/DefaultFont.cpp 2008-02-10 09:51:18.000000000 +0100
+@@ -14,6 +14,7 @@
+ * OpenSceneGraph Public License for more details.
+ */
+
++#include <stdlib.h>
+ #include "DefaultFont.h"
+
+ #include <osg/Notify>
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgViewer/ViewerBase.cpp OpenSceneGraph-2.2.0/src/osgViewer/ViewerBase.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgViewer/ViewerBase.cpp 2007-10-03 10:34:51.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgViewer/ViewerBase.cpp 2008-02-10 10:39:32.000000000 +0100
+@@ -11,6 +11,8 @@
+ * OpenSceneGraph Public License for more details.
+ */
+
++#include <string.h>
++
+ #include <osgViewer/ViewerBase>
+ #include <osgViewer/Renderer>
+
+diff -uNr OpenSceneGraph-2.2.0.orig/src/osgViewer/ViewerEventHandlers.cpp OpenSceneGraph-2.2.0/src/osgViewer/ViewerEventHandlers.cpp
+--- OpenSceneGraph-2.2.0.orig/src/osgViewer/ViewerEventHandlers.cpp 2007-09-30 21:27:31.000000000 +0200
++++ OpenSceneGraph-2.2.0/src/osgViewer/ViewerEventHandlers.cpp 2008-02-10 10:46:20.000000000 +0100
+@@ -12,6 +12,7 @@
+ */
+
+ #include <stdlib.h>
++#include <limits.h>
+
+ #include <fstream>
+ #include <osgViewer/Viewer>
More information about the fedora-extras-commits
mailing list