codegen/codegen.py: Don't register interface if it is ignored

Original commit message from CVS:
* codegen/codegen.py:
Don't register interface if it is ignored
* configure.ac:
GST_PB_MINOR_VERSION doesn't appear by magic, you actually have to
parse it from pkg-config !
* gst/gst-pb-0.10.11.ignore:
Ignore GstVideoOrientation type altogether.
* gst/interfaces.override:
Include gstversion.override so that non-existent API is properly ignored.
Should fix #401051 once and for good now.

diff --git a/ChangeLog b/ChangeLog
index 3095efc..ad54638 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2007-01-29  Edward Hervey  <edward@fluendo.com>
 
+       * codegen/codegen.py:
+       Don't register interface if it is ignored
+       * configure.ac:
+       GST_PB_MINOR_VERSION doesn't appear by magic, you actually have to
+       parse it from pkg-config !
+       * gst/gst-pb-0.10.11.ignore:
+       Ignore GstVideoOrientation type altogether.
+       * gst/interfaces.override:
+       Include gstversion.override so that non-existent API is properly ignored.
+       Should fix #401051 once and for good now.
+
+2007-01-29  Edward Hervey  <edward@fluendo.com>
+
+       * configure.ac:
+       0.10.6.2 pre-release
+
+2007-01-29  Edward Hervey  <edward@fluendo.com>
+
        * configure.ac:
        Check for availability of video-orientation interface
        * gst/gst.override:

diff --git a/codegen/codegen.py b/codegen/codegen.py
index 6ab8781..0bb5868 100644 (file)
--- a/codegen/codegen.py
+++ b/codegen/codegen.py
@@ -1403,6 +1403,8 @@ def write_registers(parser, overrides, fp):
                  '", ' + pointer.typecode +
                  ', &Py' + pointer.c_name + '_Type);\n')
     for interface in parser.interfaces:
+        if overrides.is_type_ignored(interface.c_name):
+            continue
         fp.write('    pyg_register_interface(d, "' + interface.name +
                  '", '+ interface.typecode + ', &Py' + interface.c_name +
                  '_Type);\n')

diff --git a/configure.ac b/configure.ac
index 219f739..c73e5dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(GStreamer Python Bindings, 0.10.6.2,
+AC_INIT(GStreamer Python Bindings, 0.10.6.3,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gst-python)
 
@@ -74,6 +74,7 @@ AC_SUBST(GST_LIBS)
 
 dnl get the installed GStreamer core version
 GST_MINOR_VERSION=`$PKG_CONFIG --modversion gstreamer-$GST_MAJORMINOR | cut -f 3 -d.`
+GST_PB_MINOR_VERSION=`$PKG_CONFIG --modversion gstreamer-plugins-base-$GST_MAJORMINOR | cut -f 3 -d.`
 GST_CVS_VERSION=`$PKG_CONFIG --modversion gstreamer-$GST_MAJORMINOR | cut -f 4 -d.`
 
 echo "Building against GStreamer core 0.10.$GST_MINOR_VERSION , ignoring API additions if needed"

diff --git a/gst/gst-pb-0.10.11.ignore b/gst/gst-pb-0.10.11.ignore
index 1e780b3..eb60ff6 100644 (file)
--- a/gst/gst-pb-0.10.11.ignore
+++ b/gst/gst-pb-0.10.11.ignore
@@ -9,3 +9,6 @@ ignore
    gst_video_orientation_set_hcenter
    gst_video_orientation_set_vcenter
 %%
+ignore-type
+   GstVideoOrientation
+%%

diff --git a/gst/interfaces.override b/gst/interfaces.override
index f6c8197..0032829 100644 (file)
--- a/gst/interfaces.override
+++ b/gst/interfaces.override
@@ -48,6 +48,7 @@ import gst.Element as PyGstElement_Type
 %%
 include
   xoverlay.override
+  gstversion.override
 %%
 ignore-glob
  _*