brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2006-06-08 Iain Holmes <iain@openedhand.com>

Browse Source 
* 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
This commit is contained in:
Iain Holmes 2006-06-08 22:19:32 +00:00
parent 9c572ff45a
commit 9e9240b2a5
6 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -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:

2
clutter.pc.in
View File

@ -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

1
clutter/clutter-texture.c
View File

@ -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;

5
configure.ac
View File

@ -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 ""
echo ""

11
gtk/Makefile.am
View File

@ -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

11
gtk/gtk-clutter.pc.in Normal file
View File

@ -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