From 859998d7752cf5922538b93e9f53c9c47f1254a7 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Mon, 26 Mar 2012 12:00:33 +0000
Subject: add upstream changeset #12975 to fix build against xine-lib>=1.2

---
 graphics/osg/Makefile         |  4 ++--
 graphics/osg/distinfo         |  3 ++-
 graphics/osg/patches/patch-af | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 graphics/osg/patches/patch-af

(limited to 'graphics')

diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 727971c1e96..1163a9b69d9 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/03/25 13:47:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/03/26 12:00:33 drochner Exp $
 
 DISTNAME=	OpenSceneGraph-3.0.1
 PKGNAME=	osg-3.0.1
@@ -40,7 +40,7 @@ PLIST.x11=	yes
 .include "../../mk/jpeg.buildlink3.mk"
 .endif
 
-.include "../../geography/gdal-lib/buildlink3.mk"
+#.include "../../geography/gdal-lib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index 7a72e6b5383..b9bd1227faf 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2012/03/07 16:27:35 adam Exp $
+$NetBSD: distinfo,v 1.5 2012/03/26 12:00:33 drochner Exp $
 
 SHA1 (OpenSceneGraph-3.0.1.zip) = 13c7e39f6d62047ad944d8d28a0f0eb60384ce33
 RMD160 (OpenSceneGraph-3.0.1.zip) = 54b315c318b7ade2bcc65703cea5f41377e93a71
@@ -7,6 +7,7 @@ SHA1 (patch-ab) = 70b58b8b42af77018a09d4024afaffb874b74ddf
 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-include_OpenThreads_Atomic) = 663f76cf4ffe5f52f24a1c68701c35bb8763063a
 SHA1 (patch-src_OpenThreads_common_Atomic.cpp) = 34687f53ba01832b7ea3e0b124a951efc0afe343
diff --git a/graphics/osg/patches/patch-af b/graphics/osg/patches/patch-af
new file mode 100644
index 00000000000..bba23f00b29
--- /dev/null
+++ b/graphics/osg/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.1 2012/03/26 12:00:33 drochner Exp $
+
+--- src/osgPlugins/xine/video_out_rgb.c.orig	2009-11-20 11:46:20.000000000 +0000
++++ src/osgPlugins/xine/video_out_rgb.c
+@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual
+ 	clear(rgb_class, sizeof(rgbout_class_t));
+ 
+ 	rgb_class->driver_class.open_plugin     = open_plugin;
++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
+ 	rgb_class->driver_class.get_identifier  = get_identifier;
+ 	rgb_class->driver_class.get_description = get_description;
++#else
++	rgb_class->driver_class.identifier  = get_identifier(NULL);
++	rgb_class->driver_class.description = get_description(NULL);
++#endif
++
+ 	rgb_class->driver_class.dispose         = dispose_class;
+ 
+ 	return(rgb_class);
-- 
cgit v1.2.3