osg: SunOS fixes and remove obsolete patches.diff -r1.11 -r1.12 pkgsrc/graphics/osg/distinfo
(jperkin)
| @@ -1,14 +1,15 @@ | @@ -1,14 +1,15 @@ | |||
| 1 | $NetBSD: distinfo,v 1.11 2018/08/04 01:05:10 nia Exp $ | 1 | $NetBSD: distinfo,v 1.12 2018/08/06 11:12:27 jperkin Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (osg-3.4.1.tar.gz) = 6fc56846f5790d85dd8139aecb958701f4f4e630 | 3 | SHA1 (osg-3.4.1.tar.gz) = 6fc56846f5790d85dd8139aecb958701f4f4e630 | |
| 4 | RMD160 (osg-3.4.1.tar.gz) = 299ab7131433e7f36f0da10eb102014bce26ec83 | 4 | RMD160 (osg-3.4.1.tar.gz) = 299ab7131433e7f36f0da10eb102014bce26ec83 | |
| 5 | SHA512 (osg-3.4.1.tar.gz) = 4a65625e208d24256b5564bbe9d6f557758b51fae0acf85d1f71968a237fec299088536830fc862d25e02039de9ea13176b298a68aaa644eac958acbe1f4e143 | 5 | SHA512 (osg-3.4.1.tar.gz) = 4a65625e208d24256b5564bbe9d6f557758b51fae0acf85d1f71968a237fec299088536830fc862d25e02039de9ea13176b298a68aaa644eac958acbe1f4e143 | |
| 6 | Size (osg-3.4.1.tar.gz) = 5686385 bytes | 6 | Size (osg-3.4.1.tar.gz) = 5686385 bytes | |
| 7 | SHA1 (patch-CMakeModules_FindFFmpeg.cmake) = cb533fdfa7cc569b6e226e1ab422ef36d5d31c3a | 7 | SHA1 (patch-CMakeModules_FindFFmpeg.cmake) = cb533fdfa7cc569b6e226e1ab422ef36d5d31c3a | |
| 8 | SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b | 8 | SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b | |
| 9 | SHA1 (patch-ad) = 909075cabe15541b182794b4fdf5baa038f07ed3 | 9 | SHA1 (patch-ad) = 909075cabe15541b182794b4fdf5baa038f07ed3 | |
| 10 | SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8 | 10 | SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8 | |
| 11 | SHA1 (patch-applications_present3D_Cluster.cpp) = 1b05be4da6632356200192d8f5aa5f08270f68d8 | 11 | SHA1 (patch-applications_present3D_Cluster.cpp) = 017b1d9b42760cad8deb77d7330b04f75aa0e814 | |
| 12 | SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102 | 12 | SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102 | |
| 13 | SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = d8e9efa88898e240775ead76c5c9df4c86cd562c | 13 | SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = 4202df06c8ab49fa5f3787cc1c59e9f247d1a21b | |
| 14 | SHA1 (patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp) = b9bc38773bfdc78056a4575f772abd7a1fbf09f3 | |||
| 14 | SHA1 (patch-src_osg_GLExtensions.cpp) = 5fc04fa162c5cf8aa34ddfb0152092b02e8eec08 | 15 | SHA1 (patch-src_osg_GLExtensions.cpp) = 5fc04fa162c5cf8aa34ddfb0152092b02e8eec08 |
| @@ -1,26 +1,26 @@ | @@ -1,26 +1,26 @@ | |||
| 1 | $NetBSD: patch-applications_present3D_Cluster.cpp,v 1.3 2018/08/04 01:05:10 nia Exp $ | 1 | $NetBSD: patch-applications_present3D_Cluster.cpp,v 1.4 2018/08/06 11:12:27 jperkin Exp $ | |
| 2 | 2 | |||
| 3 | Support more platforms. | 3 | Support more platforms. | |
| 4 | 4 | |||
| 5 | --- applications/present3D/Cluster.cpp.orig 2017-08-28 16:50:49.000000000 +0000 | 5 | --- applications/present3D/Cluster.cpp.orig 2017-08-28 16:50:49.000000000 +0000 | |
| 6 | +++ applications/present3D/Cluster.cpp | 6 | +++ applications/present3D/Cluster.cpp | |
| 7 | @@ -33,7 +33,8 @@ | 7 | @@ -33,7 +33,8 @@ | |
| 8 | #if defined(__linux) | 8 | #if defined(__linux) | |
| 9 | #include <unistd.h> | 9 | #include <unistd.h> | |
| 10 | #include <linux/sockios.h> | 10 | #include <linux/sockios.h> | |
| 11 | -#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) | 11 | -#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) | |
| 12 | +#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || \ | 12 | +#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || \ | |
| 13 | + defined(__NetBSD__) || defined(__OpenBSD__) | 13 | + defined(__NetBSD__) || defined(__OpenBSD__) | |
| 14 | #include <unistd.h> | 14 | #include <unistd.h> | |
| 15 | #include <sys/sockio.h> | 15 | #include <sys/sockio.h> | |
| 16 | #elif defined(__sgi) | 16 | #elif defined(__sgi) | |
| 17 | @@ -340,7 +341,8 @@ void Receiver::sync( void ) | 17 | @@ -340,7 +341,8 @@ void Receiver::sync( void ) | |
| 18 | } | 18 | } | |
| 19 | 19 | |||
| 20 | #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \ | 20 | #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \ | |
| 21 | - defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) | 21 | - defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) | |
| 22 | + defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \ | 22 | + defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \ | |
| 23 | + defined(__NetBSD__) || defined(__OpenBSD__) | 23 | + defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun) | |
| 24 | socklen_t | 24 | socklen_t | |
| 25 | #else | 25 | #else | |
| 26 | int | 26 | int |
| @@ -1,15 +1,33 @@ | @@ -1,15 +1,33 @@ | |||
| 1 | $NetBSD: patch-src_osgPlugins_osc_osc_OscHostEndianness.h,v 1.1 2018/08/04 01:05:10 nia Exp $ | 1 | $NetBSD: patch-src_osgPlugins_osc_osc_OscHostEndianness.h,v 1.2 2018/08/06 11:12:27 jperkin Exp $ | |
| 2 | 2 | |||
| 3 | Configure endianness for osc plug-in. | 3 | Configure endianness for osc plug-in. | |
| 4 | 4 | |||
| 5 | --- src/osgPlugins/osc/osc/OscHostEndianness.h.orig 2015-07-23 11:14:00.000000000 +0000 | 5 | --- src/osgPlugins/osc/osc/OscHostEndianness.h.orig 2017-08-28 16:50:49.000000000 +0000 | |
| 6 | +++ src/osgPlugins/osc/osc/OscHostEndianness.h | 6 | +++ src/osgPlugins/osc/osc/OscHostEndianness.h | |
| 7 | @@ -64,7 +64,7 @@ | 7 | @@ -64,7 +64,7 @@ | |
| 8 | #else | 8 | #else | |
| 9 | #error Unknown machine endianness detected. | 9 | #error Unknown machine endianness detected. | |
| 10 | #endif | 10 | #endif | |
| 11 | - #elif defined(__FreeBSD__) | 11 | - #elif defined(__FreeBSD__) | |
| 12 | + #elif defined(__FreeBSD__) || defined(__NetBSD__) | 12 | + #elif defined(__FreeBSD__) || defined(__NetBSD__) | |
| 13 | #include <sys/endian.h> | 13 | #include <sys/endian.h> | |
| 14 | #if (_BYTE_ORDER == _LITTLE_ENDIAN) | 14 | #if (_BYTE_ORDER == _LITTLE_ENDIAN) | |
| 15 | #ifndef __LITTLE_ENDIAN__ | 15 | #ifndef __LITTLE_ENDIAN__ | |
| 16 | @@ -77,6 +77,17 @@ | |||
| 17 | #else | |||
| 18 | #error Unknown machine endianness detected. | |||
| 19 | #endif | |||
| 20 | + #elif defined(__sun) | |||
| 21 | + #include <sys/byteorder.h> | |||
| 22 | + #if defined(_BIG_ENDIAN) | |||
| 23 | + #ifndef __BIG_ENDIAN__ | |||
| 24 | + #define __BIG_ENDIAN__ | |||
| 25 | + #endif | |||
| 26 | + #else | |||
| 27 | + #ifndef __LITTLE_ENDIAN__ | |||
| 28 | + #define __LITTLE_ENDIAN__ | |||
| 29 | + #endif | |||
| 30 | + #endif | |||
| 31 | #endif | |||
| 32 | ||||
| 33 | #if defined(__LITTLE_ENDIAN__) |
$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"