From 9e9240b2a5a11baabf46886d88d18a9a28e44bd5 Mon Sep 17 00:00:00 2001
From: Iain Holmes <iain@openedhand.com>
Date: Thu, 8 Jun 2006 22:19:32 +0000
Subject: [PATCH] 2006-06-08  Iain Holmes  <iain@openedhand.com>

        * configure.ac:
        Add gdk-pixbuf-xlib cflags/libs to clutter libs
        Build the gtk-clutter.pc file.

        * clutter.pc.in:
        Add the gdk-pixbuf-xlib depends.

        * gtk/gtk-clutter.pc.in:
        pkg-config stuff for gtk-clutter

        * gtk/Makefile.am:
        Install gtk-clutter.pc
---
 ChangeLog                 | 15 +++++++++++++++
 clutter.pc.in             |  2 +-
 clutter/clutter-texture.c |  1 +
 configure.ac              |  5 +++--
 gtk/Makefile.am           | 11 +++++++++++
 gtk/gtk-clutter.pc.in     | 11 +++++++++++
 6 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 gtk/gtk-clutter.pc.in

diff --git a/ChangeLog b/ChangeLog
index da917b923..d4778189f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-06-08  Iain Holmes  <iain@openedhand.com>
+
+	* configure.ac:
+	Add gdk-pixbuf-xlib cflags/libs to clutter libs
+	Build the gtk-clutter.pc file.
+
+	* clutter.pc.in:
+	Add the gdk-pixbuf-xlib depends.
+
+	* gtk/gtk-clutter.pc.in:
+	pkg-config stuff for gtk-clutter
+
+	* gtk/Makefile.am:
+	Install gtk-clutter.pc
+
 2006-06-06  Matthew Allum  <mallum@openedhand.com>
 
 	* configure.ac:
diff --git a/clutter.pc.in b/clutter.pc.in
index 8ba3c1b50..fd678e3eb 100644
--- a/clutter.pc.in
+++ b/clutter.pc.in
@@ -8,4 +8,4 @@ Description: Clutter library
 Version: @VERSION@
 Libs: -L${libdir} -lclutter-@CLUTTER_MAJORMINOR@ 
 Cflags: -I${includedir}/clutter-@CLUTTER_MAJORMINOR@
-Requires: pangoft2 glib-2.0 >= 2.8 gthread-2.0 gdk-pixbuf-2.0 gstreamer-0.10 gstreamer-plugins-base-0.10
+Requires: pangoft2 glib-2.0 >= 2.8 gthread-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gstreamer-0.10 gstreamer-plugins-base-0.10
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 0c755e6da..8c6183d06 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -887,6 +887,7 @@ clutter_texture_init (ClutterTexture *self)
   priv->repeat_x     = FALSE;
   priv->repeat_y     = FALSE;
   priv->pixbuf = NULL;
+  priv->pixel_type = PIXEL_TYPE;
 
 
   self->priv  = priv;
diff --git a/configure.ac b/configure.ac
index 0a045d61b..a07a6b29b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,7 @@ GLX_CFLAGS="$X11_CFLAGS"
 
 dnl ========================================================================
 
-pkg_modules="pangoft2 glib-2.0 >= 2.8 gthread-2.0 gdk-pixbuf-2.0"
+pkg_modules="pangoft2 glib-2.0 >= 2.8 gthread-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0"
 PKG_CHECK_MODULES(CLUTTER_DEPS, [$pkg_modules])
 
 dnl ========================================================================
@@ -193,6 +193,7 @@ AC_SUBST(CLUTTER_LIBS)
 AC_OUTPUT([Makefile
 clutter/Makefile
 gtk/Makefile
+gtk/gtk-clutter.pc
 bindings/Makefile
 bindings/python/Makefile
 examples/Makefile
@@ -212,4 +213,4 @@ echo ""
 echo "          Python Bindings:   ${enable_python}"
 echo "              GTK+ Widget:   ${enable_gtk}"
 echo "            Documentation:   ${enable_gtk_doc}"
-echo ""
\ No newline at end of file
+echo ""
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index bb4e0ecf3..2155a4b62 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,3 +1,14 @@
+pcfiles = gtk-clutter-@CLUTTER_MAJORMINOR@.pc
+%-@CLUTTER_MAJORMINOR@.pc: %.pc
+	cp $< $@
+
+pkgconfig_DATA = $(pcfiles)
+pkgconfigdir   = $(libdir)/pkgconfig
+
+EXTRA_DIST = gtk-clutter.pc.in
+
+CLEANFILES = $(pcfiles)
+
 INCLUDES = @GCC_FLAGS@ @CLUTTER_CFLAGS@ $(GST_CFLAGS) $(GTK_CFLAGS)
 
 lib_LTLIBRARIES = libgtkclutter-@CLUTTER_MAJORMINOR@.la
diff --git a/gtk/gtk-clutter.pc.in b/gtk/gtk-clutter.pc.in
new file mode 100644
index 000000000..5134600b6
--- /dev/null
+++ b/gtk/gtk-clutter.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: gtk-clutter-@CLUTTER_MAJORMINOR@
+Description: Gtk widget for Clutter
+Version: @VERSION@
+Libs: -L${libdir} -lgtk-clutter-@CLUTTER_MAJORMINOR@ 
+Cflags: -I${includedir}/gtk-clutter-@CLUTTER_MAJORMINOR@
+Requires: clutter-@CLUTTER_MAJORMINOR@ pangoft2 glib-2.0 >= 2.8 gthread-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gstreamer-0.10 gstreamer-plugins-base-0.10