graphics/osg: Update to 3.4.1.

Add various options for optional dependencies.

7 files changed, 119 insertions, 29 deletions

diff --git a/graphics/osg/patches/patch-CMakeModules_FindFFmpeg.cmake b/graphics/osg/patches/patch-CMakeModules_FindFFmpeg.cmake
new file mode 100644
index 00000000000..32d7dd36be9
--- /dev/null
+++ b/graphics/osg/patches/patch-CMakeModules_FindFFmpeg.cmake
@@ -0,0 +1,44 @@
+$NetBSD: patch-CMakeModules_FindFFmpeg.cmake,v 1.1 2018/08/04 01:05:10 nia Exp $
+
+Find ffmpeg from pkgsrc
+
+--- CMakeModules/FindFFmpeg.cmake.orig	2017-08-28 16:50:49.000000000 +0000
++++ CMakeModules/FindFFmpeg.cmake
+@@ -30,7 +30,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ 
+     FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
+         PATHS
+-        ${FFMPEG_ROOT}/include
++        ${FFMPEG_ROOT}/include/ffmpeg4
+         $ENV{FFMPEG_DIR}/include
+         ${FFMPEG_ROOT}
+         $ENV{FFMPEG_DIR}
+@@ -43,7 +43,7 @@ MACRO(FFMPEG_FIND varname shortname head
+         /opt/csw/include # Blastwave
+         /opt/include
+         /usr/freeware/include
+-        PATH_SUFFIXES ffmpeg
++        PATH_SUFFIXES ffmpeg4
+         DOC "Location of FFMPEG Headers"
+     )
+ 
+@@ -69,9 +69,9 @@ MACRO(FFMPEG_FIND varname shortname head
+     FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES
+         NAMES ${shortname}
+         PATHS
+-        ${FFMPEG_ROOT}/lib
++        ${FFMPEG_ROOT}/lib/ffmpeg4
+         $ENV{FFMPEG_DIR}/lib
+-        ${FFMPEG_ROOT}/lib${shortname}
++        ${FFMPEG_ROOT}/lib/ffmpeg4${shortname}
+         $ENV{FFMPEG_DIR}/lib${shortname}
+         ~/Library/Frameworks
+         /Library/Frameworks
+@@ -84,6 +84,7 @@ MACRO(FFMPEG_FIND varname shortname head
+         /opt/csw/lib
+         /opt/lib
+         /usr/freeware/lib64
++        PATH_SUFFIXES ffmpeg4
+         DOC "Location of FFMPEG Libraries"
+     )
+ 
diff --git a/graphics/osg/patches/patch-ab b/graphics/osg/patches/patch-ab
index 5605b300d79..13853424d6d 100644
--- a/graphics/osg/patches/patch-ab
+++ b/graphics/osg/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2012/03/07 16:27:35 adam Exp $
+$NetBSD: patch-ab,v 1.4 2018/08/04 01:05:10 nia 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
-@@ -76,7 +76,7 @@
-     #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
+Support NetBSD.
+
+--- src/osgDB/FileUtils.cpp.orig	2015-06-01 13:40:20.000000000 +0000
++++ src/osgDB/FileUtils.cpp
+@@ -78,7 +78,7 @@ typedef char TCHAR;
          #define stat64 stat
      #endif
--#elif defined(__CYGWIN__) || defined(__FreeBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE))
-+#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined (__NetBSD__) || (defined(__hpux) || defined(__DragonFly__) && !defined(_LARGEFILE64_SOURCE))
+ #elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \
+-      (defined(__hpux) && !defined(_LARGEFILE64_SOURCE))
++      (defined(__hpux) || defined(__NetBSD__) && !defined(_LARGEFILE64_SOURCE))
      #define stat64 stat
  #endif
  
diff --git a/graphics/osg/patches/patch-ad b/graphics/osg/patches/patch-ad
index 90fe5595ecd..f49c225765d 100644
--- a/graphics/osg/patches/patch-ad
+++ b/graphics/osg/patches/patch-ad
@@ -1,6 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2012/03/07 16:27:35 adam Exp $
+$NetBSD: patch-ad,v 1.3 2018/08/04 01:05:10 nia Exp $
 
---- src/OpenThreads/pthreads/PThread.cpp.orig	2011-06-23 20:09:26.000000000 +0000
+Support NetBSD.
+
+--- src/OpenThreads/pthreads/PThread.cpp.orig	2015-04-07 18:01:12.000000000 +0000
 +++ src/OpenThreads/pthreads/PThread.cpp
 @@ -135,6 +135,15 @@ private:
          {
@@ -18,12 +20,12 @@ $NetBSD: patch-ad,v 1.2 2012/03/07 16:27:35 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 );
-@@ -565,6 +574,18 @@ int Thread::setProcessorAffinity(unsigne
+@@ -592,6 +601,18 @@ int Thread::setProcessorAffinity(unsigne
      status = pthread_attr_setscope( &thread_attr, PTHREAD_SCOPE_BOUND_NP );
      return status;
  
 +#elif defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP)
-+    if (pd->isRunning && Thread::CurrentThread()==this)
++    if (pd->isRunning() && Thread::CurrentThread()==this)
 +    {
 +            cpuset_t *cset;
 +            cset = cpuset_create();
@@ -36,8 +38,8 @@ $NetBSD: patch-ad,v 1.2 2012/03/07 16:27:35 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)
-@@ -1030,7 +1051,16 @@ int OpenThreads::SetProcessorAffinityOfC
+     if (pd->isRunning() && Thread::CurrentThread()==this)
+@@ -1057,7 +1078,16 @@ int OpenThreads::SetProcessorAffinityOfC
      }
      else
      {
diff --git a/graphics/osg/patches/patch-applications_present3D_Cluster.cpp b/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
index acba820552a..bb7e6dcbf1c 100644
--- a/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
+++ b/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
@@ -1,30 +1,26 @@
-$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.2 2012/05/20 19:28:19 marino Exp $
+$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.3 2018/08/04 01:05:10 nia Exp $
 
 Support more platforms.
 
---- applications/present3D/Cluster.cpp.orig	2012-03-05 16:33:33.000000000 +0000
+--- applications/present3D/Cluster.cpp.orig	2017-08-28 16:50:49.000000000 +0000
 +++ applications/present3D/Cluster.cpp
-@@ -33,9 +33,12 @@
+@@ -33,7 +33,8 @@
  #if defined(__linux)
      #include <unistd.h>
      #include <linux/sockios.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || \
++    defined(__NetBSD__) || defined(__OpenBSD__)
      #include <unistd.h>
      #include <sys/sockio.h>
-+#elif defined(__DragonFly__)
-+    #include <unistd.h>
-+    #include <sys/sockio.h>
  #elif defined(__sgi)
-     #include <unistd.h>
-     #include <net/soioctl.h>
-@@ -336,7 +339,8 @@ void Receiver::sync( void )
-         return;
+@@ -340,7 +341,8 @@ void Receiver::sync( void )
      }
  
--#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ )
-+#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-     socklen_t 
+ #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \
+-    defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
++    defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \
++    defined(__NetBSD__) || defined(__OpenBSD__)
+     socklen_t
  #else
      int
diff --git a/graphics/osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp b/graphics/osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp
new file mode 100644
index 00000000000..0b81d2f2f98
--- /dev/null
+++ b/graphics/osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp,v 1.1 2018/08/04 01:05:10 nia Exp $
+
+ntohl(3) is defined in arpa/inet.h, not in netinet/in.h.
+
+--- src/osgPlugins/osc/ip/posix/NetworkingUtils.cpp.orig	2013-02-04 12:50:51.000000000 +0000
++++ src/osgPlugins/osc/ip/posix/NetworkingUtils.cpp
+@@ -29,8 +29,8 @@
+ */
+ #include "ip/NetworkingUtils.h"
+ 
++#include <arpa/inet.h>
+ #include <netdb.h>
+-#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <string.h>
+ #include <stdio.h>
diff --git a/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h b/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h
new file mode 100644
index 00000000000..ead00500265
--- /dev/null
+++ b/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_osgPlugins_osc_osc_OscHostEndianness.h,v 1.1 2018/08/04 01:05:10 nia Exp $
+
+Configure endianness for osc plug-in.
+
+--- src/osgPlugins/osc/osc/OscHostEndianness.h.orig	2015-07-23 11:14:00.000000000 +0000
++++ src/osgPlugins/osc/osc/OscHostEndianness.h
+@@ -64,7 +64,7 @@
+         #else
+             #error Unknown machine endianness detected.
+         #endif
+-    #elif defined(__FreeBSD__)
++    #elif defined(__FreeBSD__) || defined(__NetBSD__)
+         #include <sys/endian.h>
+         #if (_BYTE_ORDER == _LITTLE_ENDIAN)
+             #ifndef __LITTLE_ENDIAN__
diff --git a/graphics/osg/patches/patch-src_osg_GLExtensions.cpp b/graphics/osg/patches/patch-src_osg_GLExtensions.cpp
new file mode 100644
index 00000000000..60ca6617f74
--- /dev/null
+++ b/graphics/osg/patches/patch-src_osg_GLExtensions.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_osg_GLExtensions.cpp,v 1.1 2018/08/04 01:05:10 nia Exp $
+
+Support NetBSD.
+
+--- src/osg/GLExtensions.cpp.orig	2017-04-03 10:44:31.000000000 +0000
++++ src/osg/GLExtensions.cpp
+@@ -378,7 +378,7 @@ OSG_INIT_SINGLETON_PROXY(GLExtensionDisa
+         static void *handle = dlopen((const char *)0L, RTLD_LAZY);
+         return dlsym(handle, funcName);
+ 
+-    #elif defined (__FreeBSD__)
++    #elif defined (__FreeBSD__) || defined (__NetBSD__)
+ 
+         return dlsym( RTLD_DEFAULT, funcName );
+