From 638fbcc93c675844c1c337518eb00db65d65d563 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 14 Apr 2007 00:33:12 +0100
Subject: Remove #ifdef wrappers from the Xv & XcbXv plugins. Allows XcbXv to
 be built.

---
 ChangeLog                       | 2 ++
 src/video_out/video_out_xcbxv.c | 4 ----
 src/video_out/video_out_xv.c    | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e65698e3a..2b142dc4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 xine-lib (1.1.6) [UNRELEASED]
   * Split the DirectFB plugin into X11 and non-X versions.
   * Improve the Mac OS X video output plugin. Thanks to Matt Messier.
+  * Fixed the XcbXv plugin - an empty plugin would be built if "old" Xv
+    isn't detected.
 
 xine-lib (1.1.5)
   * Security fixes:
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index db4be14fa..432d93416 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -37,8 +37,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_XV
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1618,5 +1616,3 @@ const plugin_info_t xine_plugin_info[] EXPORTED = {
   { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
-
-#endif
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 55340a9e7..2cba3c2b6 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -36,8 +36,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_XV
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1676,5 +1674,3 @@ const plugin_info_t xine_plugin_info[] EXPORTED = {
   { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv_2, init_class_2 },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
-
-#endif
-- 
cgit v1.2.3