alessandro gst-plugins-base: gst-plugins-base/ gst-plugins-base/tests/examples/seek/ gst-plugins-base/tests/icles/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-base
Changes by:     alessandro
Date:           Fri Jan 02 2009  15:04:27 UTC

Log message:
	* configure.ac:
	* tests/examples/seek/Makefile.am:
	* tests/icles/Makefile.am:
	Make the seek and colorkey examples depend on gtk+-x11 as they use
	GDK_WINDOW_XID.
	Fixes the build with gtk+-quartz.

Modified files:
    .               : ChangeLog configure.ac
    tests/examples/seek: Makefile.am
    tests/icles     : Makefile.am

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4267&r2=1.4268
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/configure.ac.diff?r1=1.755&r2=1.756
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/tests/examples/seek/Makefile.am.diff?r1=1.19&r2=1.20
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/tests/icles/Makefile.am.diff?r1=1.12&r2=1.13

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4267
retrieving revision 1.4268
diff -u -d -r1.4267 -r1.4268
--- ChangeLog	31 Dec 2008 16:04:24 -0000	1.4267
+++ ChangeLog	2 Jan 2009 15:04:11 -0000	1.4268
@@ -1,3 +1,12 @@
+2009-01-02  Alessandro Decina  <[email protected]>
+
+	* configure.ac:
+	* tests/examples/seek/Makefile.am:
+	* tests/icles/Makefile.am:
+	Make the seek and colorkey examples depend on gtk+-x11 as they use
+	GDK_WINDOW_XID.
+	Fixes the build with gtk+-quartz.
 2008-12-31  Jan Schmidt  <[email protected]>
 
 	* win32/common/libgstaudio.def:
Index: configure.ac
RCS file: /cvs/gstreamer/gst-plugins-base/configure.ac,v
retrieving revision 1.755
retrieving revision 1.756
diff -u -d -r1.755 -r1.756
--- configure.ac	8 Dec 2008 18:12:18 -0000	1.755
+++ configure.ac	2 Jan 2009 15:04:13 -0000	1.756
@@ -266,6 +266,11 @@
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0, HAVE_GTK=yes, HAVE_GTK=no)
 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
+dnl some examples need gtk+-x11
+PKG_CHECK_MODULES(GTK_X11, gtk+-x11-2.0 >= 2.12.0,
+    HAVE_GTK_X11=yes, HAVE_GTK_X11=no)
+AM_CONDITIONAL(HAVE_GTK_X11, test "x$HAVE_GTK_X11" = "xyes")
 dnl *** set variables based on configure arguments ***
 dnl set license and copyright notice
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-plugins-base/tests/examples/seek/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile.am	7 Jul 2008 17:25:41 -0000	1.19
+++ Makefile.am	2 Jan 2009 15:04:13 -0000	1.20
@@ -1,4 +1,4 @@
-if HAVE_GTK
+if HAVE_GTK_X11
 GTK_EXAMPLES=seek scrubby
 endif
RCS file: /cvs/gstreamer/gst-plugins-base/tests/icles/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	22 Oct 2008 12:25:01 -0000	1.12
+++ Makefile.am	2 Jan 2009 15:04:13 -0000	1.13
@@ -6,7 +6,7 @@
 stress_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
 X_TESTS += test-colorkey
 test_colorkey_SOURCES = test-colorkey.c

------------------------------------------------------------------------------