[gir-repository] Remove Clutter 0.8 introspection support
- From: Owen Taylor <otaylor src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gir-repository] Remove Clutter 0.8 introspection support
- Date: Fri, 11 Dec 2009 19:47:42 +0000 (UTC)
commit 32d8082b9012849b86c4bb9a56b618ac295bdf5e
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Tue Dec 8 14:59:35 2009 -0500
Remove Clutter 0.8 introspection support
Remove the checks and code to build introspection support for
Clutter 0.8; introspection is built into 0.9/1.0/1.2 and 0.8 hasn't
been supported by the Clutter project for quite a while.
https://bugzilla.gnome.org/show_bug.cgi?id=604113
configure.ac | 35 -----
gir/Clutter-custom.c | 222 ---------------------------------
gir/Clutter-custom.h | 50 --------
gir/GtkClutter-custom.c | 9 --
gir/Makefile.am | 90 -------------
gir/clutter-0.8.c | 318 -----------------------------------------------
6 files changed, 0 insertions(+), 724 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b0343c0..8506f25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,41 +101,6 @@ PKG_CHECK_MODULES(GNIO, gnio,
have_gnio=true, have_gnio=false)
AM_CONDITIONAL(BUILD_GNIO, $have_gnio)
-dnl clutter
-PKG_CHECK_MODULES(CLUTTER, clutter-0.8 >= 0.8,
- have_clutter=true, have_clutter=false)
-AM_CONDITIONAL(BUILD_CLUTTER, $have_clutter)
-CLUTTER_BACKEND=
-CLUTTER_BACKEND_GIRS=
-if $have_clutter; then
- CLUTTER_BACKEND="$($PKG_CONFIG --variable=backend clutter-0.8)"
- if test "$CLUTTER_BACKEND" = glx; then
- CLUTTER_BACKEND_GIRS=xlib-2.0
- fi
- # check if depending on clutter also brings usable gdk-pixbuf, clutter
- # doesn't necessarily use (win32,osx) or export (Requires.private) it
- save_CFLAGS="$CFLAGS"; CFLAGS="$CLUTTER_CFLAGS"
- save_LDFLAGS="$LDFLAGS"; LDFLAGS="$CLUTTER_LIBS"
- AC_TRY_LINK([#include <gdk-pixbuf/gdk-pixbuf.h>],
- [GType gtype = GDK_TYPE_PIXBUF;],
- AC_DEFINE(HAVE_CLUTTER_GDKPIXBUF, 1,
- [Clutter is exporting gdk-pixbuf]))
- CFLAGS="$save_CFLAGS"
- LDFLAGS="$save_LDFLAGS"
-fi
-AC_SUBST(CLUTTER_BACKEND)
-AC_SUBST(CLUTTER_BACKEND_GIRS)
-
-dnl clutter-gtk
-PKG_CHECK_MODULES(CLUTTERGTK, clutter-gtk-0.8 >= 0.8,
- have_clutter_gtk=true, have_clutter_gtk=false)
-AM_CONDITIONAL(BUILD_CLUTTERGTK, $have_clutter_gtk)
-
-dnl clutter-cairo
-PKG_CHECK_MODULES(CLUTTERCAIRO, clutter-cairo-0.8 >= 0.8,
- have_clutter_cairo=true, have_clutter_cairo=false)
-AM_CONDITIONAL(BUILD_CLUTTERCAIRO, $have_clutter_cairo)
-
dnl gstreamer supports introspection starting from 0.10.25
PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10 >= 0.10.0 gstreamer-0.10 < 0.10.25],
have_gstreamer=true, have_gstreamer=false)
diff --git a/gir/Makefile.am b/gir/Makefile.am
index bc87989..2389927 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -407,96 +407,6 @@ Vte-1.0.gir: $(INTROSPECTION_SCANNER) Gtk-2.0.gir
BUILT_GIRSOURCES += Vte-1.0.gir
endif
-# clutter
-libgirepo_Clutter_custom_la_CPPFLAGS = $(CLUTTER_CFLAGS)
-libgirepo_Clutter_custom_la_LIBADD = $(CLUTTER_LIBS)
-libgirepo_Clutter_custom_la_LDFLAGS = $(COMMON_CUSTOM_LDFLAGS)
-libgirepo_Clutter_custom_la_SOURCES = \
- $(srcdir)/Clutter-custom.c \
- $(srcdir)/Clutter-custom.h
-
-if BUILD_CLUTTER
-lib_LTLIBRARIES += libgirepo-Clutter-custom.la
-
-CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-$(CLUTTER_BACKEND)-0.8`
-ClutterJson-0.8.gir: $(INTROSPECTION_SCANNER)
- $(INTROSPECTION_SCANNER) -v --namespace ClutterJson --nsversion=0.8 \
- --add-include-path=$(srcdir) --add-include-path=. \
- --include=GObject-2.0 \
- --library=clutter-$(CLUTTER_BACKEND)-0.8 \
- --libtool="$(LIBTOOL)" \
- --pkg gobject-2.0 \
- --pkg clutter-$(CLUTTER_BACKEND)-0.8 \
- --output $@ \
- $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/json/*.h
-
-Clutter-0.8.gir: libgirepo-Clutter-custom.la ClutterJson-0.8.gir GdkPixbuf-2.0.gir Pango-1.0.gir PangoCairo-1.0.gir $(INTROSPECTION_SCANNER) clutter-0.8.c
- $(INTROSPECTION_SCANNER) -v --namespace Clutter --nsversion=0.8 \
- --add-include-path=$(srcdir) --add-include-path=. \
- --include=GL-1.0 \
- --include=GObject-2.0 \
- $(CLUTTER_BACKEND_GIRS:%=--include=%) \
- --include=Pango-1.0 \
- --include=PangoCairo-1.0 \
- --include=GdkPixbuf-2.0 \
- --include=ClutterJson-0.8 \
- --library=clutter-$(CLUTTER_BACKEND)-0.8 \
- --library=libgirepo-Clutter-custom.la \
- --libtool="$(LIBTOOL)" \
- --pkg gobject-2.0 \
- --pkg clutter-$(CLUTTER_BACKEND)-0.8 \
- --output $@ \
- $(srcdir)/clutter-0.8.c \
- $(srcdir)/Clutter-custom.c \
- $(srcdir)/Clutter-custom.h \
- $(CLUTTER_INCLUDEDIR)/clutter-0.8/cogl/*.h \
- $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/*.h
-BUILT_GIRSOURCES += Clutter-0.8.gir ClutterJson-0.8.gir
-XPATH_TESTS += Clutter-0.8.xpath
-endif BUILD_CLUTTER
-EXTRA_DIST += clutter-0.8.c
-EXTRA_DIST += Clutter-0.8.xpath
-
-if BUILD_CLUTTERGTK
-CLUTTERGTK_INCLUDEDIR=`pkg-config --variable=includedir clutter-gtk-0.8`
-# This one is called GtkClutter because it matches the C naming
-GtkClutter-0.8.gir: Clutter-0.8.gir Gtk-2.0.gir GtkClutter-custom.c $(INTROSPECTION_SCANNER)
- $(INTROSPECTION_SCANNER) -v --namespace GtkClutter --nsversion=0.8 \
- --add-include-path=$(srcdir) --add-include-path=. \
- --include=GL-1.0 \
- --include=GObject-2.0 \
- --include=Gtk-2.0 \
- --include=Clutter-0.8 \
- --library=clutter-gtk-0.8 \
- --libtool="$(LIBTOOL)" \
- --pkg gobject-2.0 \
- --pkg gtk+-2.0 \
- --pkg clutter-0.8 \
- --pkg clutter-$(CLUTTER_BACKEND)-0.8 \
- --output $@ \
- $(srcdir)/GtkClutter-custom.c \
- $(CLUTTERGTK_INCLUDEDIR)/clutter-0.8/clutter-gtk/*.h
-BUILT_GIRSOURCES += GtkClutter-0.8.gir
-endif BUILD_CLUTTERGTK
-EXTRA_DIST += GtkClutter-custom.c
-
-if BUILD_CLUTTERCAIRO
-CLUTTERCAIRO_INCLUDEDIR=`pkg-config --variable=includedir clutter-cairo-0.8`
-ClutterCairo-0.8.gir: Clutter-0.8.gir $(INTROSPECTION_SCANNER)
- $(INTROSPECTION_SCANNER) -v --namespace ClutterCairo --nsversion=0.8 \
- --add-include-path=$(srcdir) --add-include-path=. \
- --include=cairo-1.0 \
- --include=Clutter-0.8 \
- --library=clutter-cairo-0.8 \
- --libtool="$(LIBTOOL)" \
- --pkg gobject-2.0 \
- --pkg cairo \
- --pkg clutter-cairo-0.8 \
- --output $@ \
- $(CLUTTERCAIRO_INCLUDEDIR)/clutter-0.8/clutter-cairo/*.h
-BUILT_GIRSOURCES += ClutterCairo-0.8.gir
-endif BUILD_CLUTTERCAIRO
-
if BUILD_GOOCANVAS
GOOCANVAS_INCLUDEDIR=`pkg-config --variable=includedir goocanvas`
GooCanvas-0.10.gir: Gtk-2.0.gir $(INTROSPECTION_SCANNER)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]