Changes 3.0.1:

* OpenGL ES 1.1, and OpenGL ES 2.0 support
* OpenGL 3.x and 4.x support along with associated OpenGL extensions
* Supoort for Android on tablets and phones
* Support for IOS on tablets and phones (end users applications have already
  been accepted on the App Store)
* Introduction of Present3D application for immersive 3D presentations
* New extensible serializers that provide new .osgb binary, .osgt ascii and
  .osgx xml file native formats
* New generalized serializable metadata architecture
* New osgQt library that makes it straight forward to integrate !OpenSceneGraph
  with Qt, including web browsing via QWebKit.
* New FBX plugin based on the Audodesk FBX DSK that enables reading of the the
  .fbx 3D authoring and interchange format
* New directshow plugin for handling movies under Windows
* New pov plugin for exporting a scene to POV-Ray format, enabling use of
  POV-Ray to do photo-realistic ray tracing
* New ply plugin for reading ply files
* Improvements to osgText that enable bevelling of 3D text and highter quality
  2D fonts
* Improvements to osgVolume enabling high quality ray traced volume rendering
* Improvements to osgManipulator making it more flexible
* Improvements to osgParticle to support shader based particle effects
* Revamped 3ds plugin for reading and writing of .3ds files
* Revamped dxf plugin for reading and writing of .dxf files
* Support for Cocoa and 64bit OSX build
* Improved thread safety and efficiency of database paging
* New Texture and buffer object pools for efficiently managing GL object
  resources

10 files changed, 120 insertions, 47 deletions

diff --git a/graphics/osg/patches/patch-ab b/graphics/osg/patches/patch-ab
index 90f00ea98ca..5605b300d79 100644
--- a/graphics/osg/patches/patch-ab
+++ b/graphics/osg/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2011/12/11 11:59:06 marino Exp $
+$NetBSD: patch-ab,v 1.3 2012/03/07 16:27:35 adam Exp $
 
 --- src/osgDB/FileUtils.cpp.orig	2009-01-12 17:28:37.000000000 +0200
 +++ src/osgDB/FileUtils.cpp	2009-01-12 17:30:14.000000000 +0200
-@@ -47,7 +47,7 @@
+@@ -76,7 +76,7 @@
      #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
          #define stat64 stat
      #endif
diff --git a/graphics/osg/patches/patch-ac b/graphics/osg/patches/patch-ac
index cfddf4ab225..e637ece6326 100644
--- a/graphics/osg/patches/patch-ac
+++ b/graphics/osg/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
+$NetBSD: patch-ac,v 1.2 2012/03/07 16:27:35 adam Exp $
 
---- ./include/osg/Math.orig	2008-11-23 13:35:43.000000000 +0200
-+++ ./include/osg/Math	2009-01-14 09:49:00.000000000 +0200
+--- include/osg/Math.orig	2008-11-23 13:35:43.000000000 +0200
++++ include/osg/Math	2009-01-14 09:49:00.000000000 +0200
 @@ -14,7 +14,7 @@
  #ifndef __OSG_MATH
  #define __OSG_MATH
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
  
  #include <osg/Export>
  
-@@ -200,14 +200,14 @@
+@@ -207,14 +207,14 @@
      inline bool isNaN(float v) { return _isnan(v)!=0; }
      inline bool isNaN(double v) { return _isnan(v)!=0; }
  #else
diff --git a/graphics/osg/patches/patch-ad b/graphics/osg/patches/patch-ad
index 3601630f675..90fe5595ecd 100644
--- a/graphics/osg/patches/patch-ad
+++ b/graphics/osg/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
+$NetBSD: patch-ad,v 1.2 2012/03/07 16:27:35 adam Exp $
 
---- ./src/OpenThreads/pthreads/PThread.c++.orig	2009-06-22 12:51:46.000000000 +0200
-+++ ./src/OpenThreads/pthreads/PThread.c++	2009-06-22 16:55:54.000000000 +0200
-@@ -124,6 +124,15 @@
+--- src/OpenThreads/pthreads/PThread.cpp.orig	2011-06-23 20:09:26.000000000 +0000
++++ src/OpenThreads/pthreads/PThread.cpp
+@@ -135,6 +135,15 @@ private:
          {
  #if defined(__sgi)
              pthread_setrunon_np( pd->cpunum );
@@ -18,7 +18,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
  #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
              cpu_set_t cpumask;
              CPU_ZERO( &cpumask );
-@@ -537,6 +546,18 @@
+@@ -565,6 +574,18 @@ int Thread::setProcessorAffinity(unsigne
      status = pthread_attr_setscope( &thread_attr, PTHREAD_SCOPE_BOUND_NP );
      return status;
  
@@ -37,7 +37,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
  #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
  
      if (pd->isRunning && Thread::CurrentThread()==this)
-@@ -974,7 +995,16 @@
+@@ -1030,7 +1051,16 @@ int OpenThreads::SetProcessorAffinityOfC
      }
      else
      {
diff --git a/graphics/osg/patches/patch-ae b/graphics/osg/patches/patch-ae
index a611399696c..7c887353c15 100644
--- a/graphics/osg/patches/patch-ae
+++ b/graphics/osg/patches/patch-ae
@@ -1,24 +1,19 @@
-$NetBSD: patch-ae,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
+$NetBSD: patch-ae,v 1.2 2012/03/07 16:27:35 adam Exp $
 
---- ./CMakeLists.txt.orig	2009-06-22 19:23:08.000000000 +0200
-+++ ./CMakeLists.txt	2009-06-22 19:23:54.000000000 +0200
-@@ -457,12 +457,13 @@
-   ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
- ENDIF(CYGWIN)
+PkgSrc does not use lib64.
+
+--- CMakeLists.txt.orig	2011-07-31 07:50:34.000000000 +0000
++++ CMakeLists.txt
+@@ -586,12 +586,6 @@ IF(CYGWIN)
+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+ ENDIF()
  
 -IF(UNIX AND NOT WIN32 AND NOT APPLE)
 -  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
 -      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
 -      MARK_AS_ADVANCED(LIB_POSTFIX)
--  ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
--ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
-+# pkgsrc does not use lib64
-+#IF(UNIX AND NOT WIN32 AND NOT APPLE)
-+#  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-+#      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
-+#      MARK_AS_ADVANCED(LIB_POSTFIX)
-+#  ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-+#ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
+-  ENDIF()
+-ENDIF()
  IF(NOT DEFINED LIB_POSTFIX)
      SET(LIB_POSTFIX "")
- ENDIF(NOT DEFINED LIB_POSTFIX)
+ ENDIF()
diff --git a/graphics/osg/patches/patch-applications_present3D_Cluster.cpp b/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
new file mode 100644
index 00000000000..0d5251d65c0
--- /dev/null
+++ b/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.1 2012/03/07 16:27:35 adam Exp $
+
+Support more platforms.
+
+--- applications/present3D/Cluster.cpp.orig	2012-03-05 16:33:33.000000000 +0000
++++ applications/present3D/Cluster.cpp
+@@ -33,7 +33,7 @@
+ #if defined(__linux)
+     #include <unistd.h>
+     #include <linux/sockios.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+     #include <unistd.h>
+     #include <sys/sockio.h>
+ #elif defined(__sgi)
+@@ -336,7 +336,7 @@ void Receiver::sync( void )
+         return;
+     }
+ 
+-#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ )
++#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || defined(__NetBSD__) || defined(__OpenBSD__)
+     socklen_t 
+ #else
+     int
diff --git a/graphics/osg/patches/patch-include_OpenThreads_Atomic b/graphics/osg/patches/patch-include_OpenThreads_Atomic
new file mode 100644
index 00000000000..9f0a9a7a2f7
--- /dev/null
+++ b/graphics/osg/patches/patch-include_OpenThreads_Atomic
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_OpenThreads_Atomic,v 1.1 2012/03/07 16:27:35 adam Exp $
+
+Fix C error.
+
+--- include/OpenThreads/Atomic.orig	2012-03-06 16:27:45.000000000 +0000
++++ include/OpenThreads/Atomic
+@@ -241,7 +241,7 @@ _OPENTHREADS_ATOMIC_INLINE bool
+ AtomicPtr::assign(void* ptrNew, const void* const ptrOld)
+ {
+ #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
+-    return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew);
++    return __sync_bool_compare_and_swap(&_ptr, (void *)ptrOld, ptrNew);
+ #elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
+     return __compare_and_swap((unsigned long*)&_ptr, (unsigned long)ptrOld, (unsigned long)ptrNew);
+ #elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
diff --git a/graphics/osg/patches/patch-src-osgPlugins-curl-ReaderWriterCURL.cpp b/graphics/osg/patches/patch-src-osgPlugins-curl-ReaderWriterCURL.cpp
deleted file mode 100644
index e36ec92b778..00000000000
--- a/graphics/osg/patches/patch-src-osgPlugins-curl-ReaderWriterCURL.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src-osgPlugins-curl-ReaderWriterCURL.cpp,v 1.1 2011/09/24 12:58:11 joerg Exp $
-
---- src/osgPlugins/curl/ReaderWriterCURL.cpp.orig	2011-09-22 15:21:48.000000000 +0000
-+++ src/osgPlugins/curl/ReaderWriterCURL.cpp
-@@ -21,7 +21,6 @@
- #include <fstream>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- 
- #include "ReaderWriterCURL.h"
- 
diff --git a/graphics/osg/patches/patch-src_OpenThreads_common_Atomic.cpp b/graphics/osg/patches/patch-src_OpenThreads_common_Atomic.cpp
new file mode 100644
index 00000000000..bc6e5c15942
--- /dev/null
+++ b/graphics/osg/patches/patch-src_OpenThreads_common_Atomic.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_OpenThreads_common_Atomic.cpp,v 1.1 2012/03/07 16:27:35 adam Exp $
+
+Fix C error.
+
+--- src/OpenThreads/common/Atomic.cpp.orig	2012-03-05 21:26:31.000000000 +0000
++++ src/OpenThreads/common/Atomic.cpp
+@@ -143,7 +143,7 @@ bool
+ AtomicPtr::assign(void* ptrNew, const void* const ptrOld)
+ {
+ #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
+-    return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew);
++    return __sync_bool_compare_and_swap(&_ptr, (void *)ptrOld, ptrNew);
+ #elif defined(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
+     return ptrOld == InterlockedCompareExchangePointer((PVOID volatile*)&_ptr, (PVOID)ptrNew, (PVOID)ptrOld);
+ #elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
diff --git a/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp b/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp
index d454266de26..58894936cee 100644
--- a/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp
+++ b/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp
@@ -1,12 +1,11 @@
-$NetBSD: patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp,v 1.1 2011/12/11 11:59:06 marino Exp $
+$NetBSD: patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp,v 1.2 2012/03/07 16:27:35 adam Exp $
 
---- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp.orig	2010-03-19 08:03:02.000000000 +0000
+Point to correct header files.
+
+--- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp.orig	2012-03-05 21:20:14.000000000 +0000
 +++ src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
-@@ -6,11 +6,12 @@
- extern "C"
- {
- #define __STDC_CONSTANT_MACROS
-+#define FF_API_OLD_SAMPLE_FMT 0
+@@ -9,9 +9,9 @@ extern "C"
+ #define FF_API_OLD_SAMPLE_FMT 0
  #include <errno.h>    // for error codes defined in avformat.h
  #include <stdint.h>
 -#include <avcodec.h>
diff --git a/graphics/osg/patches/patch-src_osgViewer_DarwinUtils.mm b/graphics/osg/patches/patch-src_osgViewer_DarwinUtils.mm
new file mode 100644
index 00000000000..14b0faf0331
--- /dev/null
+++ b/graphics/osg/patches/patch-src_osgViewer_DarwinUtils.mm
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_osgViewer_DarwinUtils.mm,v 1.1 2012/03/07 16:27:35 adam Exp $
+
+Work around depreciated API.
+
+--- src/osgViewer/DarwinUtils.mm.orig	2012-03-06 14:49:28.000000000 +0000
++++ src/osgViewer/DarwinUtils.mm
+@@ -313,7 +313,11 @@ void DarwinWindowingSystemInterface::get
+     CGDirectDisplayID id = getDisplayID(si);
+     resolution.width = CGDisplayPixelsWide(id);
+     resolution.height = CGDisplayPixelsHigh(id);
+-    resolution.colorDepth = CGDisplayBitsPerPixel(id);
++    CGDisplayModeRef displayMode = CGDisplayCopyDisplayMode(id);
++    CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(displayMode);
++    CGDisplayModeRelease(displayMode);
++    resolution.colorDepth = CFStringGetLength(pixelEncoding);
++    CFRelease(pixelEncoding);
+     resolution.refreshRate = getDictDouble (CGDisplayCurrentMode(id), kCGDisplayRefreshRate);        // Not tested
+     if (resolution.refreshRate<0) resolution.refreshRate = 0;
+ }
+@@ -402,7 +406,7 @@ bool DarwinWindowingSystemInterface::set
+     CFDictionaryRef display_mode_values =
+         CGDisplayBestModeForParametersAndRefreshRate(
+                         displayid, 
+-                        CGDisplayBitsPerPixel(displayid), 
++                        32, 
+                         width, height,  
+                         refresh,  
+                         NULL);
+@@ -432,7 +436,7 @@ bool DarwinWindowingSystemInterface::set
+     CFDictionaryRef display_mode_values =
+         CGDisplayBestModeForParametersAndRefreshRate(
+                         displayid, 
+-                        CGDisplayBitsPerPixel(displayid), 
++                        32, 
+                         width, height,  
+                         refreshRate,  
+                         &success);