gir-repository r79 - in trunk: . gir

[walters svn gnome org]

Author: walters
Date: Fri Sep  5 19:58:08 2008
New Revision: 79
URL: http://svn.gnome.org/viewvc/gir-repository?rev=79&view=rev

Log:
Add GooCanvas.


Modified:
   trunk/configure.ac
   trunk/gir/Makefile.am
   trunk/gir/cairo.gir

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Sep  5 19:58:08 2008
@@ -71,12 +71,16 @@
                   have_clutter_cairo=true, have_clutter_cairo=false)
 AM_CONDITIONAL(BUILD_CLUTTERCAIRO, $have_clutter_cairo)
 
-
 dnl gstreamer
 PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.0, 
                   have_gstreamer=true, have_gstreamer=false)
 AM_CONDITIONAL(BUILD_GSTREAMER, $have_gstreamer)
 
+dnl goocanvas
+PKG_CHECK_MODULES(GOOCANVAS, goocanvas,
+                  have_goocanvas=true, have_goocanvas=false)
+AM_CONDITIONAL(BUILD_GOOCANVAS, $have_goocanvas)
+
 AC_CONFIG_FILES([Makefile
                  gir/Makefile
                  gir-repository-1.0.pc])

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Fri Sep  5 19:58:08 2008
@@ -293,11 +293,27 @@
              --pkg cairo \
              --pkg clutter-cairo-0.6 \
              --output $@ \
-	     -I$(CLUTTER_INCLUDEDIR) \
-             $(CLUTTER_INCLUDEDIR)/clutter-0.6/clutter-cairo/*.h
+	     -I$(CLUTTERCAIRO_INCLUDEDIR) \
+             $(CLUTTERCAIRO_INCLUDEDIR)/clutter-0.6/clutter-cairo/*.h
 BUILT_GIRSOURCES += ClutterCairo.gir
 endif BUILD_CLUTTERCAIRO
 
+if BUILD_GOOCANVAS
+GOOCANVAS_INCLUDEDIR=`pkg-config --variable=includedir goocanvas`
+GOOCANVAS_LIBDIR=`pkg-config --variable=libdir goocanvas`
+GooCanvas.gir: $(srcdir)/Gtk.gir $(G_IR_SCANNER) 
+	$(G_IR_SCANNER) -v --namespace GooCanvas \
+	     --strip-prefix=Goo \
+             --include=$(srcdir)/Gtk.gir \
+	     --library=goocanvas \
+	     $(NOCLOSURE) \
+             --pkg goocanvas \
+             --output $@ \
+	     -I$(GOOCANVAS_INCLUDEDIR) \
+             $(GOOCANVAS_INCLUDEDIR)/goocanvas-1.0/*.h
+BUILT_GIRSOURCES += GooCanvas.gir
+endif BUILD_GOOCANVAS
+
 # GStreamer
 if BUILD_GSTREAMER
 GST_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-0.10`

Modified: trunk/gir/cairo.gir
==============================================================================
--- trunk/gir/cairo.gir	(original)
+++ trunk/gir/cairo.gir	Fri Sep  5 19:58:08 2008
@@ -4,6 +4,7 @@
   <namespace name="cairo" shared-library="cairo">
     <record name="cairo_t" c:type="cairo_t"/>
     <record name="cairo_surface_t" c:type="cairo_surface_t"/>
+    <record name="cairo_matrix_t" c:type="cairo_matrix_t"/>
     <record name="cairo_pattern_t" c:type="cairo_pattern_t"/>
     <record name="cairo_content_t" c:type="cairo_content_t"/>
     <record name="cairo_font_options_t" c:type="cairo_font_options_t"/>