tags 454854 + patch
thanks
Hi,
Attached is the diff for my openscenegraph 2.2.0-2.1 NMU.
diff -u openscenegraph-2.2.0/debian/rules openscenegraph-2.2.0/debian/rules
--- openscenegraph-2.2.0/debian/rules
+++ openscenegraph-2.2.0/debian/rules
@@ -16,10 +16,13 @@
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+# Default to g++
+CXX ?= g++
ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
CCACHE = /usr/lib/ccache/g++
else
- CCACHE = /usr/bin/g++
+ # Full path to make ccache happy
+ CCACHE = $(shell which $(CXX))
endif
ifeq (smp,$(findstring smp,$(DEB_BUILD_OPTIONS)))
SMP = -j2
diff -u openscenegraph-2.2.0/debian/changelog openscenegraph-2.2.0/debian/changelog
--- openscenegraph-2.2.0/debian/changelog
+++ openscenegraph-2.2.0/debian/changelog
@@ -1,3 +1,11 @@
+openscenegraph (2.2.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove Cyril Brulebois from Uploaders on his request.
+ * Fix FTBFS with GCC 4.3 (Closes: #454854).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sun, 16 Mar 2008 16:13:52 +0000
+
openscenegraph (2.2.0-2) unstable; urgency=low
* Add optimization flags to compilation (closes: 446017).
diff -u openscenegraph-2.2.0/debian/control openscenegraph-2.2.0/debian/control
--- openscenegraph-2.2.0/debian/control
+++ openscenegraph-2.2.0/debian/control
@@ -4,7 +4,6 @@
Maintainer: Loic Dachary (OuoU) <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4.0.0), dpatch, cmake, g++ (>= 3.3.0), libungif4-dev | giflib-dev, libjpeg-dev, libtiff-dev, lib3ds-dev, libfreetype6-dev, libpng12-dev, libcoin40-dev, libjasper-dev, libgdal1-dev, libx11-dev, libxmu-dev, libglut-dev, ccache, libgl1-mesa-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, doxygen
Standards-Version: 3.7.2
-Uploaders: Cyril Brulebois <[EMAIL PROTECTED]>
Package: libopenthreads-dev
Section: devel
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgViewer/ViewerEventHandlers.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgViewer/ViewerEventHandlers.cpp
@@ -12,7 +12,7 @@
*/
#include <stdlib.h>
-
+#include <limits.h>
#include <fstream>
#include <osgViewer/Viewer>
#include <osgViewer/ViewerEventHandlers>
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgViewer/ViewerBase.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgViewer/ViewerBase.cpp
@@ -24,6 +24,8 @@
#include <osgUtil/IntersectionVisitor>
#include <osgUtil/GLObjectsVisitor>
+#include <cstring>
+
static osg::ApplicationUsageProxy ViewerBase_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_CONFIG_FILE <filename>","Specify a viewer configuration file to load by default.");
static osg::ApplicationUsageProxy ViewerBase_e1(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_THREADING <value>","Set the threading model using by Viewer, <value> can be SingleThreaded, CullDrawThreadPerContext, DrawThreadPerContext or CullThreadPerCameraDrawThreadPerContext.");
static osg::ApplicationUsageProxy ViewerBase_e2(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_SCREEN <value>","Set the default screen that windows should open up on.");
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgDB/Registry.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgDB/Registry.cpp
@@ -26,7 +26,7 @@
#include <osgDB/Archive>
#include <stdio.h>
-
+#include <cstring>
#include <algorithm>
#include <set>
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgDB/Field.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgDB/Field.cpp
@@ -12,6 +12,8 @@
*/
#include <osgDB/Field>
+#include <cstring>
+
using namespace osgDB;
using namespace std;
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgDB/FileNameUtils.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgDB/FileNameUtils.cpp
@@ -12,6 +12,7 @@
*/
#include <stdlib.h>
#include <limits.h>
+#include <cstring>
#include <osgDB/FileNameUtils>
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osg/DisplaySettings.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osg/DisplaySettings.cpp
@@ -17,6 +17,7 @@
#include <osg/ref_ptr>
#include <algorithm>
+#include <cstring>
using namespace osg;
using namespace std;
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osg/Notify.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osg/Notify.cpp
@@ -14,6 +14,7 @@
#include <string>
#include <iostream>
#include <fstream>
+#include <cstdlib>
using namespace std;
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osg/Image.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osg/Image.cpp
@@ -25,6 +25,9 @@
#include "dxtctool.h"
+#include <cstring>
+#include <cstdlib>
+
using namespace osg;
using namespace std;
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgText/DefaultFont.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgText/DefaultFont.cpp
@@ -18,6 +18,8 @@
#include <osg/Notify>
+#include <cstdlib>
+
using namespace osgText;
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgPlugins/lwo/ReaderWriterLWO.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgPlugins/lwo/ReaderWriterLWO.cpp
@@ -18,6 +18,7 @@
#include <string>
#include <sstream>
#include <algorithm>
+#include <memory>
#include <osg/Notify>
#include <osg/Node>
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgPlugins/x/directx.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgPlugins/x/directx.cpp
@@ -30,7 +30,7 @@
#include <iostream>
#include <sstream>
-
+#include <cstring>
#include <math.h>
#include <osg/Notify>
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgPlugins/x/types.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgPlugins/x/types.cpp
@@ -29,6 +29,7 @@
#include "types.h"
#include <iostream>
+#include <cstdlib>
using namespace std;
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgPlugins/x/mesh.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgPlugins/x/mesh.cpp
@@ -29,6 +29,8 @@
#include "directx.h"
#include <iostream>
+#include <cstdlib>
+#include <cstring>
#include <osg/Notify>
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgPlugins/ive/DataTypeSize.h
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgPlugins/ive/DataTypeSize.h
@@ -12,7 +12,7 @@
//Don't know where else to put this
namespace ive{
-typedef enum IncludeImageMode { IMAGE_REFERENCE_FILE=0,IMAGE_INCLUDE_DATA,IMAGE_INCLUDE_FILE,IMAGE_COMPRESS_DATA };
+enum IncludeImageMode { IMAGE_REFERENCE_FILE=0,IMAGE_INCLUDE_DATA,IMAGE_INCLUDE_FILE,IMAGE_COMPRESS_DATA };
}
#endif
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgPlugins/gdal/ReaderWriterGDAL.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgPlugins/gdal/ReaderWriterGDAL.cpp
@@ -15,6 +15,8 @@
#include "DataSetLayer.h"
+#include <memory>
+
#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)
// From easyrgb.com
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgPlugins/Inventor/ConvertToInventor.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgPlugins/Inventor/ConvertToInventor.cpp
@@ -256,7 +256,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 +264,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);
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/src/osgPlugins/hdr/hdrwriter.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/src/osgPlugins/hdr/hdrwriter.cpp
@@ -32,7 +32,7 @@
#include <string>
#include <math.h>
#include <ctype.h>
-
+#include <cstdlib>
bool HDRWriter::writeRLE(const osg::Image *img, std::ostream& fout)
{
only in patch2:
unchanged:
--- openscenegraph-2.2.0.orig/OpenSceneGraph/examples/osgdepthpartition/DistanceAccumulator.cpp
+++ openscenegraph-2.2.0/OpenSceneGraph/examples/osgdepthpartition/DistanceAccumulator.cpp
@@ -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. */
