gir-repository r54 - in trunk: . gir

[johan svn gnome org]

Author: johan
Date: Thu Aug 21 21:16:58 2008
New Revision: 54
URL: http://svn.gnome.org/viewvc/gir-repository?rev=54&view=rev

Log:
2008-08-21  Johan Dahlin  <johan gnome org>

    * configure.ac:
    * gir/GL.gir:
    * gir/Makefile.am:
    * gir/xlib.gir:
    Add Clutter & ClutterGtk.
    Add GL/ClutterJson as dependencies.



Added:
   trunk/gir/GL.gir
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gir/Makefile.am
   trunk/gir/xlib.gir

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Aug 21 21:16:58 2008
@@ -28,25 +28,35 @@
 m4_define(pygobject_required_version,  2.14.0)
 
 dnl atk
-PKG_CHECK_MODULES(ATK, atk >= 1.12.0, have_atk=true, have_atk=false)
-AC_SUBST(ATK_CFLAGS)
+PKG_CHECK_MODULES(ATK, atk >= 1.12.0,
+                  have_atk=true, have_atk=false)
 AM_CONDITIONAL(BUILD_ATK, $have_atk)
 
 dnl pango
-PKG_CHECK_MODULES(PANGO, pango >= 1.16.0, have_pango=true, have_pango=false)
-AC_SUBST(PANGO_CFLAGS)
+PKG_CHECK_MODULES(PANGO, pango >= 1.16.0,
+                  have_pango=true, have_pango=false)
 AM_CONDITIONAL(BUILD_PANGO, $have_pango)
 
 dnl gtk+
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.12.0, have_gtk=true, have_gtk=false)
-AC_SUBST(GTK_CFLAGS)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.12.0,
+                  have_gtk=true, have_gtk=false)
 AM_CONDITIONAL(BUILD_GTK, $have_gtk)
 
 dnl webkit
-PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= 1.0, have_webkit=true, have_webkit=false)
-AC_SUBST(WEBKIT_CFLAGS)
+PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= 1.0,
+                  have_webkit=true, have_webkit=false)
 AM_CONDITIONAL(BUILD_WEBKIT, $have_webkit)
 
+dnl clutter
+PKG_CHECK_MODULES(CLUTTER, clutter-0.6 >= 0.6,
+                  have_clutter=true, have_clutter=false)
+AM_CONDITIONAL(BUILD_CLUTTER, $have_clutter)
+
+dnl clutter-gtk
+PKG_CHECK_MODULES(CLUTTERGTK, clutter-gtk-0.6 >= 0.6, 
+                  have_clutter_gtk=true, have_clutter_gtk=false)
+AM_CONDITIONAL(BUILD_CLUTTERGTK, $have_clutter_gtk)
+
 AC_CONFIG_FILES([Makefile
                  gir/Makefile
                  gir-repository-1.0.pc])

Added: trunk/gir/GL.gir
==============================================================================
--- (empty file)
+++ trunk/gir/GL.gir	Thu Aug 21 21:16:58 2008
@@ -0,0 +1,19 @@
+<repository version="1.0"
+            xmlns="http://www.gtk.org/introspection/core/1.0";
+            xmlns:c="http://www.gtk.org/introspection/c/1.0";>
+  <namespace name="GL" shared-library="GL">
+    <record name="enum" c:type="GLenum"/>
+    <record name="int" c:type="GLint"/>
+    <record name="uint" c:type="GLuint"/>
+    <record name="handleARB" c:type="GLhandleARB"/>
+
+    <function name="InitNames" c:identifier="glInitNames">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+      </parameters>
+    </function>
+
+  </namespace>
+</repository>

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Aug 21 21:16:58 2008
@@ -1,6 +1,6 @@
 CLEANFILES = 
 
-CUSTOM_GIRSOURCES = cairo.gir fontconfig.gir freetype2.gir xft.gir xlib.gir
+CUSTOM_GIRSOURCES = cairo.gir fontconfig.gir freetype2.gir xft.gir xlib.gir GL.gir
 BUILT_GIRSOURCES =
 
 # pango
@@ -212,6 +212,68 @@
 CUSTOM_GIRSOURCES += JSCore.gir
 endif BUILD_WEBKIT
 
+# clutter
+if BUILD_CLUTTER
+CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-0.6`
+CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-0.6`
+ClutterJson.gir: $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace ClutterJson \
+             --include=$(GIRDIR)/GLib.gir \
+             --include=$(GIRDIR)/GObject.gir \
+	     --library=clutter-glx-0.6 \
+	     $(NOCLOSURE) \
+             --pkg gobject-2.0 \
+             --pkg clutter-0.6 \
+             --output $@ \
+	     -I$(CLUTTER_INCLUDEDIR) \
+             $(CLUTTER_INCLUDEDIR)/clutter-0.6/clutter/json/*.h
+
+Clutter.gir: $(srcdir)/Pango.gir $(srcdir)/PangoFT2.gir $(G_IR_SCANNER)
+Clutter.gir: $(srcdir)/ClutterJson.gir $(srcdir)/GdkPixbuf.gir
+	$(G_IR_SCANNER) -v --namespace Clutter \
+             --include=$(srcdir)/fontconfig.gir \
+             --include=$(srcdir)/xlib.gir \
+             --include=$(srcdir)/GL.gir \
+             --include=$(GIRDIR)/GLib.gir \
+             --include=$(GIRDIR)/GObject.gir \
+             --include=$(srcdir)/Pango.gir \
+             --include=$(srcdir)/PangoFT2.gir \
+             --include=$(srcdir)/GdkPixbuf.gir \
+             --include=$(srcdir)/ClutterJson.gir \
+	     --library=clutter-glx-0.6 \
+	     $(NOCLOSURE) \
+             --pkg gobject-2.0 \
+             --pkg clutter-0.6 \
+             --output $@ \
+	     -I$(CLUTTER_INCLUDEDIR) \
+             $(CLUTTER_INCLUDEDIR)/clutter-0.6/clutter/*.h
+BUILT_GIRSOURCES += Clutter.gir
+endif BUILD_CLUTTER
+
+if BUILD_CLUTTERGTK
+CLUTTERGTK_INCLUDEDIR=`pkg-config --variable=includedir clutter-gtk-0.6`
+CLUTTERGTK_LIBDIR=`pkg-config --variable=libdir clutter-gtk-0.6`
+ClutterGtk.gir: $(srcdir)/Clutter.gir $(G_IR_SCANNER)
+ClutterGtk.gir: $(srcdir)/Gtk.gir
+	$(G_IR_SCANNER) -v --namespace ClutterGtk \
+             --include=$(srcdir)/fontconfig.gir \
+             --include=$(srcdir)/xlib.gir \
+             --include=$(srcdir)/GL.gir \
+             --include=$(GIRDIR)/GLib.gir \
+             --include=$(GIRDIR)/GObject.gir \
+             --include=$(srcdir)/Gtk.gir \
+             --include=$(srcdir)/Clutter.gir \
+	     --library=clutter-gtk-0.6 \
+	     $(NOCLOSURE) \
+             --pkg gobject-2.0 \
+             --pkg gtk+-2.0 \
+             --pkg clutter-0.6 \
+             --output $@ \
+	     -I$(CLUTTER_INCLUDEDIR) \
+             $(CLUTTER_INCLUDEDIR)/clutter-0.6/clutter-gtk/*.h
+BUILT_GIRSOURCES += Clutter.gir
+endif BUILD_CLUTTERGTK
+
 girdir = $(datadir)/gir
 dist_gir_DATA = $(CUSTOM_GIRSOURCES) $(BUILT_GIRSOURCES)
 

Modified: trunk/gir/xlib.gir
==============================================================================
--- trunk/gir/xlib.gir	(original)
+++ trunk/gir/xlib.gir	Thu Aug 21 21:16:58 2008
@@ -8,9 +8,12 @@
     <record name="GC" c:type="GC"/>
     <record name="Picture" c:type="Picture"/>
     <record name="VisualID" c:type="VisualID"/>
+    <record name="Window" c:type="Window"/>
+    <record name="XEvent" c:type="XEvent"/>
     <record name="XID" c:type="XID"/>
     <record name="XImage" c:type="XImage"/>
     <record name="XFontStruct" c:type="XFontStruct"/>
+    <record name="XVisualInfo" c:type="XVisualInfo"/>
 
     <function name="open_display" c:identifier="XOpenDisplay">
       <return-value>