From 37576c7dc94a9f67014bed841f57e119beffde7f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@gmail.com>
Date: Wed, 5 Jul 2000 21:32:38 +0000
Subject: [PATCH] Added HW scaling and YUV conversion for XFree 4.0

Original commit message from CVS:
Added HW scaling and YUV conversion for XFree 4.0
Need to cleanup the fallback mechanism in case no suitable XvImage is
found.
---
 config.h.in         |  6 ++++++
 configure.in        | 13 +++++++++++++
 gstplay/Makefile.am |  3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/config.h.in b/config.h.in
index 0417a8e776..53072fdb8f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -6,6 +6,9 @@
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
+/* Define if the X Window System is missing or not being used.  */
+#undef X_DISPLAY_MISSING
+
 #undef PLUGINS_DIR
 #undef PLUGINS_SRCDIR
 #undef PLUGINS_USE_SRCDIR
@@ -20,6 +23,9 @@
 
 #undef DEBUG_ENABLED
 
+/* Define if you have the Xv library (-lXv).  */
+#undef HAVE_LIBXV
+
 /* Name of package */
 #undef PACKAGE
 
diff --git a/configure.in b/configure.in
index 611dea7ad5..d3835c47ee 100644
--- a/configure.in
+++ b/configure.in
@@ -101,6 +101,19 @@ AC_CHECK_LIB(ghttp, ghttp_request_new,
 AC_SUBST(GHTTP_LIBS)
 AC_SUBST(GST_HTTPSRC_GET_TYPE)
 
+dnl Check for X11 extensions
+AC_PATH_XTRA
+if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
+  AC_MSG_ERROR(can not find X11)
+fi
+AC_SUBST(X_CFLAGS)
+AC_SUBST(X_PRE_LIBS)
+AC_SUBST(X_EXTRA_LIBS)
+AC_SUBST(X_LIBS)
+
+AC_CHECK_LIB(Xv, XvQueryExtension,,,
+    $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
+
 dnl Check for atomic.h
 dnl Note: use AC_CHECK_HEADER not AC_CHECK_HEADERS, because the latter
 dnl defines the wrong default symbol as well (HAVE_ASM_ATOMIC_H)
diff --git a/gstplay/Makefile.am b/gstplay/Makefile.am
index f202536c80..8048b72a17 100644
--- a/gstplay/Makefile.am
+++ b/gstplay/Makefile.am
@@ -20,6 +20,7 @@ CFLAGS += -O2 -Wall
 gstplay_CFLAGS = $(shell gnome-config --cflags gnomeui)
 gstplay_LDFLAGS = $(shell gnome-config --libs gnomeui)
 
-LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
+gstplay_LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la \
+          $(top_builddir)/plugins/videosink/gdkxvimage.lo -lXv -lXxf86vm