mirror of
https://github.com/brl/mutter.git
synced 2024-11-26 01:50:42 -05:00
Update Clutter to use G-I 0.6.4
Following bug #1762, the syntax of g-ir-scanner was changed in gobject-introspection, so Clutter does not build anymore with 0.6.4. See the bugzilla bug: http://bugzilla.gnome.org/show_bug.cgi?id=591669 GObject-Introspection now uses a different mechanism to extract the SONAME when building the gir file and it needs the libtool archive as option. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
parent
53cb86d94b
commit
366e0f9cd7
2
README
2
README
@ -20,7 +20,7 @@ If you are building the API reference you will also need:
|
||||
|
||||
If you are building the Introspection data you will also need:
|
||||
|
||||
* GObject-Introspection >= 0.6.3
|
||||
* GObject-Introspection >= 0.6.4
|
||||
|
||||
|
||||
The official website is:
|
||||
|
@ -266,7 +266,7 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_
|
||||
--include=PangoCairo-1.0 \
|
||||
--include=Cogl-@CLUTTER_API_VERSION@ \
|
||||
$(json_gir_include) \
|
||||
--library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
|
||||
--library=libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la \
|
||||
--libtool="$(top_builddir)/libtool" \
|
||||
--pkg gobject-2.0 \
|
||||
--pkg pango \
|
||||
|
@ -75,7 +75,7 @@ Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la
|
||||
--c-include='cogl/cogl.h' \
|
||||
--include=GL-1.0 \
|
||||
--include=GObject-2.0 \
|
||||
--library=clutter-cogl \
|
||||
--library=libclutter-cogl.la \
|
||||
--libtool="$(top_builddir)/libtool" \
|
||||
--pkg gobject-2.0 \
|
||||
--output $@ \
|
||||
|
@ -44,7 +44,7 @@ ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json.
|
||||
$(INCLUDES) \
|
||||
--add-include-path=$(srcdir) --add-include-path=. \
|
||||
--include=GObject-2.0 \
|
||||
--library=clutter-json \
|
||||
--library=libclutter-json.la \
|
||||
--libtool="$(top_builddir)/libtool" \
|
||||
--pkg gobject-2.0 \
|
||||
--output $@ \
|
||||
|
@ -697,7 +697,7 @@ AC_SUBST(MAINTAINER_CFLAGS)
|
||||
|
||||
dnl === GObject-Introspection check ===========================================
|
||||
|
||||
GOBJECT_INTROSPECTION_CHECK([0.6.3])
|
||||
GOBJECT_INTROSPECTION_CHECK([0.6.4])
|
||||
|
||||
dnl === GTK Doc check =========================================================
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user