From ad54bcf903e323209a290c99001a4320c62e4486 Mon Sep 17 00:00:00 2001
From: gb <gb@5584edef-b1fe-4b99-b61b-dd2bab72e969>
Date: Tue, 16 Mar 2010 09:39:07 +0000
Subject: [PATCH] Split X11 support to libgstvaapi-x11-*.so.*

---
 configure.ac                   |  5 ++++
 gst-libs/gst/vaapi/Makefile.am | 52 ++++++++++++++++++++++++++--------
 sys/vaapisink/Makefile.am      |  2 +-
 tests/Makefile.am              |  2 +-
 4 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 35f39f9de3..e6a300d799 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,11 @@ dnl Check for tools
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
+dnl Check for GLib
+PKG_CHECK_MODULES([GLIB], [glib-2.0])
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
 dnl Check for GStreamer
 PKG_CHECK_MODULES([GST],
     [gstreamer-$GST_MAJORMINOR >= $GST_VERSION_REQUIRED]
diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 656ba43975..25386c6fcd 100644
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -1,4 +1,10 @@
-lib_LTLIBRARIES = libgstvaapi-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = 				\
+	libgstvaapi-@GST_MAJORMINOR@.la		\
+	libgstvaapi-x11-@GST_MAJORMINOR@.la	\
+	$(NULL)
+
+libgstvaapi_includedir =			\
+	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/vaapi
 
 libgstvaapi_source_c =				\
 	gstvaapidisplay.c			\
@@ -34,6 +40,23 @@ libgstvaapi_source_priv_h =			\
 	gstvaapiutils.h				\
 	$(NULL)
 
+libgstvaapi_x11_source_c =			\
+	gstvaapidisplay_x11.c			\
+	gstvaapiutils.c				\
+	gstvaapiutils_x11.c			\
+	gstvaapiwindow_x11.c			\
+	$(NULL)
+
+libgstvaapi_x11_source_h =			\
+	gstvaapidisplay_x11.h			\
+	gstvaapiwindow_x11.h			\
+	$(NULL)
+
+libgstvaapi_x11_source_priv_h =			\
+	gstvaapiutils.h				\
+	gstvaapiutils_x11.h			\
+	$(NULL)
+
 libgstvaapi_@GST_MAJORMINOR@_la_SOURCES =	\
 	$(libgstvaapi_source_c)			\
 	$(libgstvaapi_source_priv_h)		\
@@ -44,7 +67,7 @@ libgstvaapi_@GST_MAJORMINOR@include_HEADERS =	\
 	$(NULL)
 
 libgstvaapi_@GST_MAJORMINOR@includedir =	\
-	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/vaapi
+	$(libgstvaapi_includedir)
 
 libgstvaapi_@GST_MAJORMINOR@_la_CFLAGS =	\
 	-I$(top_srcdir)/gst-libs		\
@@ -59,24 +82,29 @@ libgstvaapi_@GST_MAJORMINOR@_la_LIBADD =	\
 	$(LIBVA_LIBS)				\
 	$(NULL)
 
-libgstvaapi_@GST_MAJORMINOR@_la_SOURCES +=	\
-	gstvaapidisplay_x11.c			\
-	gstvaapiutils_x11.c			\
-	gstvaapiwindow_x11.c			\
+libgstvaapi_x11_@GST_MAJORMINOR@_la_SOURCES =	\
+	$(libgstvaapi_x11_source_c)		\
+	$(libgstvaapi_x11_source_priv_h)	\
 	$(NULL)
 
-libgstvaapi_@GST_MAJORMINOR@include_HEADERS +=	\
-	gstvaapidisplay_x11.h			\
-	gstvaapiutils_x11.h			\
-	gstvaapiwindow_x11.h			\
+libgstvaapi_x11_@GST_MAJORMINOR@include_HEADERS = \
+	$(libgstvaapi_x11_source_h)		\
 	$(NULL)
 
-libgstvaapi_@GST_MAJORMINOR@_la_CFLAGS +=	\
+libgstvaapi_x11_@GST_MAJORMINOR@includedir =	\
+	$(libgstvaapi_includedir)
+
+libgstvaapi_x11_@GST_MAJORMINOR@_la_CFLAGS =	\
+	-I$(top_srcdir)/gst-libs		\
+	$(GLIB_CFLAGS)				\
+	$(GST_BASE_CFLAGS)			\
 	$(LIBVA_X11_CFLAGS)			\
 	$(NULL)
 
-libgstvaapi_@GST_MAJORMINOR@_la_LIBADD +=	\
+libgstvaapi_x11_@GST_MAJORMINOR@_la_LIBADD =	\
+	$(GLIB_LIBS)				\
 	$(LIBVA_X11_LIBS)			\
+	libgstvaapi-@GST_MAJORMINOR@.la		\
 	$(NULL)
 
 # Extra clean files so that maintainer-clean removes *everything*
diff --git a/sys/vaapisink/Makefile.am b/sys/vaapisink/Makefile.am
index 7ef17afd86..9fdb92140d 100644
--- a/sys/vaapisink/Makefile.am
+++ b/sys/vaapisink/Makefile.am
@@ -4,7 +4,7 @@ libgstvaapi_CFLAGS = \
 	-I$(top_srcdir)/gst-libs
 
 libgstvaapi_LIBS = \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la
 
 libgstvaapisink_la_SOURCES =	\
 	gstvaapisink.c		\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cc7cdcf6a2..de69c18db9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,7 @@ TEST_CFLAGS = \
 	$(X11_CFLAGS)
 
 TEST_LIBS = \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-@GST_MAJORMINOR@.la \
 	$(X11_LIBS)
 
 test_display_SOURCES	= test-display.c