CVS commit: pkgsrc/graphics/osg

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Aug  6 11:12:27 UTC 2018

Modified Files:
        pkgsrc/graphics/osg: distinfo
        pkgsrc/graphics/osg/patches: patch-applications_present3D_Cluster.cpp
            patch-src_osgPlugins_osc_osc_OscHostEndianness.h
Added Files:
        pkgsrc/graphics/osg/patches:
            patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp
Removed Files:
        pkgsrc/graphics/osg/patches: patch-ac patch-af
            patch-include_OpenThreads_Atomic
            patch-src_OpenThreads_common_Atomic.cpp
            patch-src_osgPlugins_gif_ReaderWriterGIF.cpp
            patch-src_osgViewer_DarwinUtils.mm

Log Message:
osg: SunOS fixes and remove obsolete patches.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/osg/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/osg/patches/patch-ac \
    pkgsrc/graphics/osg/patches/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/osg/patches/patch-af \
    pkgsrc/graphics/osg/patches/patch-include_OpenThreads_Atomic \
    pkgsrc/graphics/osg/patches/patch-src_OpenThreads_common_Atomic.cpp \
    pkgsrc/graphics/osg/patches/patch-src_osgViewer_DarwinUtils.mm
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/osg/distinfo
diff -u pkgsrc/graphics/osg/distinfo:1.11 pkgsrc/graphics/osg/distinfo:1.12
--- pkgsrc/graphics/osg/distinfo:1.11   Sat Aug  4 01:05:10 2018
+++ pkgsrc/graphics/osg/distinfo        Mon Aug  6 11:12:27 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2018/08/04 01:05:10 nia Exp $
+$NetBSD: distinfo,v 1.12 2018/08/06 11:12:27 jperkin Exp $
 
 SHA1 (osg-3.4.1.tar.gz) = 6fc56846f5790d85dd8139aecb958701f4f4e630
 RMD160 (osg-3.4.1.tar.gz) = 299ab7131433e7f36f0da10eb102014bce26ec83
@@ -8,7 +8,8 @@ SHA1 (patch-CMakeModules_FindFFmpeg.cmak
 SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b
 SHA1 (patch-ad) = 909075cabe15541b182794b4fdf5baa038f07ed3
 SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8
-SHA1 (patch-applications_present3D_Cluster.cpp) = 1b05be4da6632356200192d8f5aa5f08270f68d8
+SHA1 (patch-applications_present3D_Cluster.cpp) = 017b1d9b42760cad8deb77d7330b04f75aa0e814
 SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102
-SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = d8e9efa88898e240775ead76c5c9df4c86cd562c
+SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = 4202df06c8ab49fa5f3787cc1c59e9f247d1a21b
+SHA1 (patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp) = b9bc38773bfdc78056a4575f772abd7a1fbf09f3
 SHA1 (patch-src_osg_GLExtensions.cpp) = 5fc04fa162c5cf8aa34ddfb0152092b02e8eec08

Index: pkgsrc/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
diff -u pkgsrc/graphics/osg/patches/patch-applications_present3D_Cluster.cpp:1.3 pkgsrc/graphics/osg/patches/patch-applications_present3D_Cluster.cpp:1.4
--- pkgsrc/graphics/osg/patches/patch-applications_present3D_Cluster.cpp:1.3    Sat Aug  4 01:05:10 2018
+++ pkgsrc/graphics/osg/patches/patch-applications_present3D_Cluster.cpp        Mon Aug  6 11:12:27 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.3 2018/08/04 01:05:10 nia Exp $
+$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.4 2018/08/06 11:12:27 jperkin Exp $
 
 Support more platforms.
 
@@ -20,7 +20,7 @@ Support more platforms.
  #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__)
++    defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
      socklen_t
  #else
      int

Index: pkgsrc/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h
diff -u pkgsrc/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h:1.1 pkgsrc/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h:1.2
--- pkgsrc/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h:1.1    Sat Aug  4 01:05:10 2018
+++ pkgsrc/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h        Mon Aug  6 11:12:27 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_osgPlugins_osc_osc_OscHostEndianness.h,v 1.1 2018/08/04 01:05:10 nia Exp $
+$NetBSD: patch-src_osgPlugins_osc_osc_OscHostEndianness.h,v 1.2 2018/08/06 11:12:27 jperkin 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.orig    2017-08-28 16:50:49.000000000 +0000
 +++ src/osgPlugins/osc/osc/OscHostEndianness.h
 @@ -64,7 +64,7 @@
          #else
@@ -13,3 +13,21 @@ Configure endianness for osc plug-in.
          #include <sys/endian.h>
          #if (_BYTE_ORDER == _LITTLE_ENDIAN)
              #ifndef __LITTLE_ENDIAN__
+@@ -77,6 +77,17 @@
+         #else
+             #error Unknown machine endianness detected.
+         #endif
++    #elif defined(__sun)
++        #include <sys/byteorder.h>
++        #if defined(_BIG_ENDIAN)
++            #ifndef __BIG_ENDIAN__
++                #define __BIG_ENDIAN__
++            #endif
++        #else
++            #ifndef __LITTLE_ENDIAN__
++                #define __LITTLE_ENDIAN__
++            #endif
++        #endif
+     #endif
+ 
+     #if   defined(__LITTLE_ENDIAN__)

Added files:

Index: pkgsrc/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp
diff -u /dev/null pkgsrc/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp:1.1
--- /dev/null   Mon Aug  6 11:12:27 2018
+++ pkgsrc/graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp        Mon Aug  6 11:12:27 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp,v 1.1 2018/08/06 11:12:27 jperkin Exp $
+
+SunOS needs alloca.h
+
+--- src/osgPlugins/osc/osc/OscOutboundPacketStream.cpp.orig    2017-08-28 16:50:49.000000000 +0000
++++ src/osgPlugins/osc/osc/OscOutboundPacketStream.cpp
+@@ -35,6 +35,8 @@
+ 
+ #if defined(__WIN32__) || defined(WIN32)
+ #include <malloc.h> // for alloca
++#elif defined(__sun)
++#include <alloca.h>
+ #endif
+ 
+ #include "OscHostEndianness.h"