[gentoo-commits] gentoo-x86 commit in dev-games/openscenegraph/files: openscenegraph-3.0.1-xinelib12x.patch

[Samuli Suominen (ssuominen)]

ssuominen    12/01/09 06:06:19

  Added:                openscenegraph-3.0.1-xinelib12x.patch
  Log:
  Fix compability with xine-lib >= 1.2.x wrt #397643 by Martin von Gagern
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch?rev=1.1&content-type=text/plain

Index: openscenegraph-3.0.1-xinelib12x.patch
===================================================================
http://bugs.gentoo.org/397643

--- src/osgPlugins/xine/video_out_rgb.c
+++ 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);