#! /bin/sh /usr/share/dpatch/dpatch-run
## 08-xine-1.2.dpatch by Elias Mussi <elias@mussicorp.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad directfb-extra~/interfaces/IDirectFBVideoProvider/video_out_dfb/video_out_dfb.c directfb-extra/interfaces/IDirectFBVideoProvider/video_out_dfb/video_out_dfb.c
--- directfb-extra~/interfaces/IDirectFBVideoProvider/video_out_dfb/video_out_dfb.c	2008-05-21 13:46:04.000000000 -0300
+++ directfb-extra/interfaces/IDirectFBVideoProvider/video_out_dfb/video_out_dfb.c	2008-05-29 16:02:00.000000000 -0300
@@ -695,6 +695,8 @@
      return &this->vo_driver;
 }
 
+#if VIDEO_OUT_DRIVER_IFACE_VERSION < 22
+
 static char*
 get_identifier( video_driver_class_t *vo_class )
 {
@@ -707,6 +709,8 @@
      return "generic DirectFB video output driver";
 }
 
+#endif
+
 static void
 dispose_class( video_driver_class_t *vo_class )
 {
@@ -735,8 +739,13 @@
      }
 
      class->vo_class.open_plugin     = open_plugin;
+#if VIDEO_OUT_DRIVER_IFACE_VERSION >= 22
+     class->vo_class.identifier      = "DFB";
+     class->vo_class.description     = "generic DirectFB video output driver";
+#else
      class->vo_class.get_identifier  = get_identifier;
      class->vo_class.get_description = get_description;
+#endif
      class->vo_class.dispose         = dispose_class;
      class->xine                     = xine;