configure: make gdk-pixbuf plugin depend only on gdk-pixbuf, not gtk+

diff --git a/configure.ac b/configure.ac
index 7b49e2e..1685293 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -715,7 +715,7 @@ AG_GST_CHECK_FEATURE(GCONF, [GConf libraries], gconfelements, [
 dnl *** GDK pixbuf ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true)
 AG_GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbuf, [
-  if test $HAVE_GTK_22 = "yes"; then HAVE_GDK_PIXBUF=yes; fi;
+  AG_GST_PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 2.8.0)
 ])
 
 dnl *** HAL ***

diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am
index 8b08817..cf5265c 100644 (file)
--- a/ext/gdk_pixbuf/Makefile.am
+++ b/ext/gdk_pixbuf/Makefile.am
@@ -4,11 +4,11 @@ libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c gstgdkpixbufsink.c pixbufscale.c
 libgstgdkpixbuf_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) \
-       $(GST_CFLAGS) $(GTK_CFLAGS)
+       $(GST_CFLAGS) $(GDK_PIXBUF_CFLAGS)
 libgstgdkpixbuf_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
        $(GST_BASE_LIBS) \
-       $(GST_LIBS) $(GTK_LIBS)
+       $(GST_LIBS) $(GDK_PIXBUF_LIBS)
 libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstgdkpixbuf_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/ext/gdk_pixbuf/pixbufscale.h b/ext/gdk_pixbuf/pixbufscale.h
index 588665c..686bf4d 100644 (file)
--- a/ext/gdk_pixbuf/pixbufscale.h
+++ b/ext/gdk_pixbuf/pixbufscale.h
@@ -23,9 +23,9 @@
 #ifndef __GST_PIXBUFSCALE_H__
 #define __GST_PIXBUFSCALE_H__
 
-#include <gtk/gtk.h>
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS