gir-repository r70 - in trunk: . gir



Author: johan
Date: Sun Aug 31 15:56:15 2008
New Revision: 70
URL: http://svn.gnome.org/viewvc/gir-repository?rev=70&view=rev

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

    * configure.ac:
    * gir/Makefile.am:
    * gir/libxml2.gir:
    Add manually written stubs for libxml2 and
    bindings for gstreamer.



Added:
   trunk/gir/libxml2.gir
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gir/   (props changed)
   trunk/gir/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Aug 31 15:56:15 2008
@@ -61,6 +61,11 @@
                   have_clutter_gtk=true, have_clutter_gtk=false)
 AM_CONDITIONAL(BUILD_CLUTTERGTK, $have_clutter_gtk)
 
+dnl gstreamer
+PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.0, 
+                  have_gstreamer=true, have_gstreamer=false)
+AM_CONDITIONAL(BUILD_GSTREAMER, $have_gstreamer)
+
 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	Sun Aug 31 15:56:15 2008
@@ -1,7 +1,14 @@
 CLEANFILES = 
 EXTRA_DIST = 
 
-CUSTOM_GIRSOURCES = cairo.gir fontconfig.gir freetype2.gir xft.gir xlib.gir GL.gir
+CUSTOM_GIRSOURCES = 	\
+	cairo.gir 	\
+	fontconfig.gir	\
+	freetype2.gir	\
+	libxml2.gir	\
+	xft.gir		\
+	xlib.gir	\
+	GL.gir
 BUILT_GIRSOURCES =
 
 # pango
@@ -9,7 +16,7 @@
 if BUILD_PANGO
 PANGO_INCLUDEDIR=`pkg-config --variable=includedir pango`/pango-1.0
 PANGO_LIBDIR=`pkg-config --variable=libdir pango`
-Pango.gir: $(G_IR_SCANNER) Makefile
+Pango.gir: $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace Pango \
             --include=GObject.gir \
             --library=pango-1.0 \
@@ -24,7 +31,7 @@
 BUILT_GIRSOURCES += Pango.gir
 
 PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
-PangoFT2.gir: fontconfig.gir freetype2.gir Pango.gir $(G_IR_SCANNER) Makefile
+PangoFT2.gir: fontconfig.gir freetype2.gir Pango.gir $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace PangoFT2 \
             --include=GObject.gir \
             --include=$(srcdir)/Pango.gir \
@@ -42,7 +49,7 @@
 BUILT_GIRSOURCES += PangoFT2.gir
 
 PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
-PangoCairo.gir: cairo.gir Pango.gir $(G_IR_SCANNER) Makefile
+PangoCairo.gir: cairo.gir Pango.gir $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace PangoCairo \
             --include=GObject.gir \
             --include=$(srcdir)/Pango.gir \
@@ -58,7 +65,7 @@
 BUILT_GIRSOURCES += PangoCairo.gir
 
 PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
-PangoXft.gir: fontconfig.gir xft.gir xlib.gir Pango.gir PangoFT2.gir $(G_IR_SCANNER) Makefile
+PangoXft.gir: fontconfig.gir xft.gir xlib.gir Pango.gir PangoFT2.gir $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace PangoXft \
             --include=GObject.gir \
             --include=$(srcdir)/xft.gir \
@@ -76,7 +83,7 @@
 BUILT_GIRSOURCES += PangoXft.gir
 
 PANGOX_LIBDIR=`pkg-config --variable=libdir pangox`
-PangoX.gir: xlib.gir Pango.gir $(G_IR_SCANNER) Makefile
+PangoX.gir: xlib.gir Pango.gir $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace PangoX \
             --include=GObject.gir \
             --include=$(srcdir)/xlib.gir \
@@ -96,7 +103,7 @@
 if BUILD_ATK
 ATK_INCLUDEDIR=`pkg-config --variable=includedir atk`/atk-1.0
 ATK_LIBDIR=`pkg-config --variable=libdir atk`
-Atk.gir: $(G_IR_SCANNER) Makefile
+Atk.gir: $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace Atk \
              --include=GObject.gir \
 	     --library=atk-1.0 \
@@ -112,7 +119,7 @@
 if BUILD_GTK
 GDKPIXBUF_INCLUDEDIR=`pkg-config --variable=includedir gdk-pixbuf-2.0`/gtk-2.0
 GDKPIXBUF_LIBDIR=`pkg-config --variable=libdir gdk-pixbuf-2.0`
-GdkPixbuf.gir: $(G_IR_SCANNER) Makefile
+GdkPixbuf.gir: $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace GdkPixbuf --strip-prefix=Gdk \
              --include=Gio.gir \
 	     --library=gdk_pixbuf-2.0 \
@@ -126,7 +133,7 @@
 
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-2.0`/gtk-2.0
 GDK_LIBDIR=`pkg-config --variable=libdir gdk-2.0`
-Gdk.gir: cairo.gir Pango.gir xlib.gir GdkPixbuf.gir $(G_IR_SCANNER) Makefile
+Gdk.gir: cairo.gir Pango.gir xlib.gir GdkPixbuf.gir $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace Gdk \
              --include=Gio.gir \
              --include=$(srcdir)/cairo.gir \
@@ -150,7 +157,7 @@
 # gtk
 GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-2.0`/gtk-2.0
 GTK_LIBDIR=`pkg-config --variable=libdir gtk+-2.0`
-Gtk.gir: cairo.gir Pango.gir Atk.gir xlib.gir GdkPixbuf.gir Gdk.gir $(G_IR_SCANNER) Makefile
+Gtk.gir: cairo.gir Pango.gir Atk.gir xlib.gir GdkPixbuf.gir Gdk.gir $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace Gtk \
              --include=Gio.gir \
              --include=$(srcdir)/cairo.gir \
@@ -181,7 +188,7 @@
 if BUILD_WEBKIT
 WEBKIT_INCLUDEDIR=`pkg-config --variable=includedir webkit-1.0`
 WEBKIT_LIBDIR=`pkg-config --variable=libdir webkit-1.0`
-WebKit.gir: JSCore.gir Gtk.gir $(G_IR_SCANNER) Makefile
+WebKit.gir: JSCore.gir Gtk.gir $(G_IR_SCANNER) 
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace WebKit \
              --include=GObject.gir \
              --include=$(srcdir)/Gtk.gir \
@@ -202,7 +209,7 @@
 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) Makefile
+ClutterJson.gir: $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace ClutterJson \
              --include=GObject.gir \
 	     --library=clutter-glx-0.6 \
@@ -213,7 +220,7 @@
 	     -I$(CLUTTER_INCLUDEDIR) \
              $(CLUTTER_INCLUDEDIR)/clutter-0.6/clutter/json/*.h
 
-Clutter.gir: $(srcdir)/Pango.gir $(srcdir)/PangoFT2.gir $(G_IR_SCANNER) Makefile
+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)/GL.gir \
@@ -236,7 +243,7 @@
 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) Makefile
+ClutterGtk.gir: $(srcdir)/Clutter.gir $(G_IR_SCANNER) 
 ClutterGtk.gir: $(srcdir)/Gtk.gir
 	$(G_IR_SCANNER) -v --namespace ClutterGtk \
              --include=$(srcdir)/GL.gir \
@@ -254,6 +261,77 @@
 BUILT_GIRSOURCES += ClutterGtk.gir
 endif BUILD_CLUTTERGTK
 
+# GStreamer
+if BUILD_GSTREAMER
+GST_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-0.10`
+GST_LIBDIR=`pkg-config --variable=libdir gstreamer-0.10`
+Gst.gir: libxml2.gir $(G_IR_SCANNER) 
+	$(DEBUG) $(G_IR_SCANNER) -v --namespace Gst \
+             --include=GObject.gir \
+             --include=GModule.gir \
+             --include=libxml2.gir \
+	     --library=gstreamer-0.10 \
+	     $(NOCLOSURE) \
+             --pkg gobject-2.0 \
+             --pkg gstreamer-0.10 \
+             --output $@ \
+	     -I$(GST_INCLUDEDIR) \
+	     $(GST_INCLUDEDIR)/gst/gstbin.h \
+	     $(GST_INCLUDEDIR)/gst/gstbuffer.h \
+	     $(GST_INCLUDEDIR)/gst/gstbus.h \
+	     $(GST_INCLUDEDIR)/gst/gstcaps.h \
+	     $(GST_INCLUDEDIR)/gst/gstchildproxy.h \
+	     $(GST_INCLUDEDIR)/gst/gstclock.h \
+	     $(GST_INCLUDEDIR)/gst/gstcompat.h \
+	     $(GST_INCLUDEDIR)/gst/gstconfig.h \
+	     $(GST_INCLUDEDIR)/gst/gstdebugutils.h \
+	     $(GST_INCLUDEDIR)/gst/gstelementfactory.h \
+	     $(GST_INCLUDEDIR)/gst/gstelement.h \
+	     $(GST_INCLUDEDIR)/gst/gstenumtypes.h \
+	     $(GST_INCLUDEDIR)/gst/gsterror.h \
+	     $(GST_INCLUDEDIR)/gst/gstevent.h \
+	     $(GST_INCLUDEDIR)/gst/gstfilter.h \
+	     $(GST_INCLUDEDIR)/gst/gstformat.h \
+	     $(GST_INCLUDEDIR)/gst/gstghostpad.h \
+	     $(GST_INCLUDEDIR)/gst/gst.h \
+	     $(GST_INCLUDEDIR)/gst/gstindexfactory.h \
+	     $(GST_INCLUDEDIR)/gst/gstindex.h \
+	     $(GST_INCLUDEDIR)/gst/gstinfo.h \
+	     $(GST_INCLUDEDIR)/gst/gstinterface.h \
+	     $(GST_INCLUDEDIR)/gst/gstiterator.h \
+	     $(GST_INCLUDEDIR)/gst/gstmacros.h \
+	     $(GST_INCLUDEDIR)/gst/gstmarshal.h \
+	     $(GST_INCLUDEDIR)/gst/gstmessage.h \
+	     $(GST_INCLUDEDIR)/gst/gstminiobject.h \
+	     $(GST_INCLUDEDIR)/gst/gstobject.h \
+	     $(GST_INCLUDEDIR)/gst/gstpad.h \
+	     $(GST_INCLUDEDIR)/gst/gstpadtemplate.h \
+	     $(GST_INCLUDEDIR)/gst/gstparamspecs.h \
+	     $(GST_INCLUDEDIR)/gst/gstparse.h \
+	     $(GST_INCLUDEDIR)/gst/gstpipeline.h \
+	     $(GST_INCLUDEDIR)/gst/gstpluginfeature.h \
+	     $(GST_INCLUDEDIR)/gst/gstplugin.h \
+	     $(GST_INCLUDEDIR)/gst/gstpoll.h \
+	     $(GST_INCLUDEDIR)/gst/gstquery.h \
+	     $(GST_INCLUDEDIR)/gst/gstregistry.h \
+	     $(GST_INCLUDEDIR)/gst/gstsegment.h \
+	     $(GST_INCLUDEDIR)/gst/gststructure.h \
+	     $(GST_INCLUDEDIR)/gst/gstsystemclock.h \
+	     $(GST_INCLUDEDIR)/gst/gsttaglist.h \
+	     $(GST_INCLUDEDIR)/gst/gsttagsetter.h \
+	     $(GST_INCLUDEDIR)/gst/gsttask.h \
+	     $(GST_INCLUDEDIR)/gst/gsttrace.h \
+	     $(GST_INCLUDEDIR)/gst/gsttypefindfactory.h \
+	     $(GST_INCLUDEDIR)/gst/gsttypefind.h \
+	     $(GST_INCLUDEDIR)/gst/gsturi.h \
+	     $(GST_INCLUDEDIR)/gst/gstutils.h \
+	     $(GST_INCLUDEDIR)/gst/gstvalue.h \
+	     $(GST_INCLUDEDIR)/gst/gstversion.h \
+	     $(GST_INCLUDEDIR)/gst/gstxml.h
+
+BUILT_GIRSOURCES += Gst.gir
+endif BUILD_GSTREAMER
+
 girdir = $(datadir)/gir
 dist_gir_DATA = $(CUSTOM_GIRSOURCES) $(BUILT_GIRSOURCES)
 
@@ -267,10 +345,10 @@
 clean-gir:
 	@rm -fr $(BUILT_GIRSOURCES)
 
-%.typelib: %.gir Makefile
+%.typelib: %.gir 
 	$(DEBUG) $(G_IR_COMPILER) $(G_IR_COMPILER_OPTS) $< -o $@
 
-%.typelib.gdb: %.gir Makefile
+%.typelib.gdb: %.gir 
 	libtool --mode=execute gdb --args $(G_IR_COMPILER) $< -o $@
 
 TESTS = tests.py

Added: trunk/gir/libxml2.gir
==============================================================================
--- (empty file)
+++ trunk/gir/libxml2.gir	Sun Aug 31 15:56:15 2008
@@ -0,0 +1,14 @@
+<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="libxml" shared-library="libxml2">
+    <record name="NodePtr" c:type="xmlNodePtr"/>
+    <function name="dummy" c:identifier="dummy">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+      </parameters>
+    </function>
+  </namespace>
+</repository>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]