From: <bi...@ke...> - 2007-01-29 12:28:13
|
CVS Root: /cvs/gstreamer Module: gst-python Changes by: bilboed Date: Mon Jan 29 2007 12:27:58 UTC Log message: * 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. Modified files: . : ChangeLog configure.ac codegen : codegen.py gst : gst-pb-0.10.11.ignore interfaces.override Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/ChangeLog.diff?r1=1.555&r2=1.556 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/configure.ac.diff?r1=1.134&r2=1.135 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/codegen/codegen.py.diff?r1=1.17&r2=1.18 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/gst/gst-pb-0.10.11.ignore.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/gst/interfaces.override.diff?r1=1.17&r2=1.18 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-python/ChangeLog,v retrieving revision 1.555 retrieving revision 1.556 diff -u -d -r1.555 -r1.556 --- ChangeLog 29 Jan 2007 11:17:45 -0000 1.555 +++ ChangeLog 29 Jan 2007 12:27:46 -0000 1.556 @@ -1,5 +1,23 @@ 2007-01-29 Edward Hervey <ed...@fl...> + * 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 <ed...@fl...> + 0.10.6.2 pre-release * configure.ac: Check for availability of video-orientation interface * gst/gst.override: Index: configure.ac RCS file: /cvs/gstreamer/gst-python/configure.ac,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- configure.ac 29 Jan 2007 11:16:34 -0000 1.134 +++ configure.ac 29 Jan 2007 12:27:46 -0000 1.135 @@ -3,7 +3,7 @@ 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 @@ 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" Index: codegen.py RCS file: /cvs/gstreamer/gst-python/codegen/codegen.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- codegen.py 10 Jan 2007 16:13:29 -0000 1.17 +++ codegen.py 29 Jan 2007 12:27:46 -0000 1.18 @@ -1403,6 +1403,8 @@ '", ' + 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') Index: gst-pb-0.10.11.ignore RCS file: /cvs/gstreamer/gst-python/gst/gst-pb-0.10.11.ignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gst-pb-0.10.11.ignore 17 Jan 2007 06:27:12 -0000 1.1 +++ gst-pb-0.10.11.ignore 29 Jan 2007 12:27:46 -0000 1.2 @@ -9,3 +9,6 @@ gst_video_orientation_set_hcenter gst_video_orientation_set_vcenter %% +ignore-type + GstVideoOrientation +%% Index: interfaces.override RCS file: /cvs/gstreamer/gst-python/gst/interfaces.override,v --- interfaces.override 29 Jan 2007 11:16:35 -0000 1.17 +++ interfaces.override 29 Jan 2007 12:27:46 -0000 1.18 @@ -48,6 +48,7 @@ include xoverlay.override + gstversion.override ignore-glob _* |