summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarino <marino>2012-05-20 19:28:19 +0000
committermarino <marino>2012-05-20 19:28:19 +0000
commitee1cf14b937bb4fcce917f79489af0c832d16e91 (patch)
tree429b0254a87b7872f3f8be4a306ae38a530774f8
parent92b56c39e33bf714fb338ed0e424b1765ad2c26a (diff)
downloadpkgsrc-ee1cf14b937bb4fcce917f79489af0c832d16e91.tar.gz
graphics/osg: Update to version 3.0.1 broke DragonFly
-rw-r--r--graphics/osg/distinfo4
-rw-r--r--graphics/osg/patches/patch-applications_present3D_Cluster.cpp14
2 files changed, 12 insertions, 6 deletions
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index b9bd1227faf..d7a7748d73c 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2012/03/26 12:00:33 drochner Exp $
+$NetBSD: distinfo,v 1.6 2012/05/20 19:28:19 marino Exp $
SHA1 (OpenSceneGraph-3.0.1.zip) = 13c7e39f6d62047ad944d8d28a0f0eb60384ce33
RMD160 (OpenSceneGraph-3.0.1.zip) = 54b315c318b7ade2bcc65703cea5f41377e93a71
@@ -8,7 +8,7 @@ SHA1 (patch-ac) = 1f237646034ca837c837e44aff753cd590c47900
SHA1 (patch-ad) = 2a9594128e357b20f7f8146398b7cb4068aca405
SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8
SHA1 (patch-af) = 9e10c217fbd53827b445feb5cbc0d9b586eeb14f
-SHA1 (patch-applications_present3D_Cluster.cpp) = 51d952c863966c851d03cd7f4165abe9db27c9d3
+SHA1 (patch-applications_present3D_Cluster.cpp) = 7b9dd81805322eeb1a4a26a21faa0a12c28d4b75
SHA1 (patch-include_OpenThreads_Atomic) = 663f76cf4ffe5f52f24a1c68701c35bb8763063a
SHA1 (patch-src_OpenThreads_common_Atomic.cpp) = 34687f53ba01832b7ea3e0b124a951efc0afe343
SHA1 (patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp) = 1552f78a0ed17fcdaed9d87fe3d1f8220712f403
diff --git a/graphics/osg/patches/patch-applications_present3D_Cluster.cpp b/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
index 0d5251d65c0..acba820552a 100644
--- a/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
+++ b/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.1 2012/03/07 16:27:35 adam Exp $
+$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.2 2012/05/20 19:28:19 marino 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 @@
+@@ -33,9 +33,12 @@
#if defined(__linux)
#include <unistd.h>
#include <linux/sockios.h>
@@ -12,13 +12,19 @@ Support more platforms.
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include <unistd.h>
#include <sys/sockio.h>
++#elif defined(__DragonFly__)
++ #include <unistd.h>
++ #include <sys/sockio.h>
#elif defined(__sgi)
-@@ -336,7 +336,7 @@ void Receiver::sync( void )
+ #include <unistd.h>
+ #include <net/soioctl.h>
+@@ -336,7 +339,8 @@ void Receiver::sync( void )
return;
}
-#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ )
-+#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) \
++ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
socklen_t
#else
int