From: Edward Hervey Date: Fri, 26 Jan 2007 11:58:55 +0000 (+0000) Subject: Add ignore file for 0.10.12 API additions X-Git-Tag: 1.19.3~485^2~714 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5741e1c64f17f7ed837043cf35b855d3f534b48;p=platform%2Fupstream%2Fgstreamer.git Add ignore file for 0.10.12 API additions Original commit message from CVS: * configure.ac: * gst/Makefile.am: * gst/gstversion.override.in: * gst/gst-0.10.12.ignore: Add ignore file for 0.10.12 API additions * gst/gst.defs: * gst/base.defs: * gst/gst-types.defs: Add new API definitions * gst/gst-0.10.10.ignore: * gst/gst-0.10.11.ignore: Fixup ignore files. * testsuite/test_segment.py: The update return value is uncertain and will soon be deprecated, don't check against it anymore. --- diff --git a/ChangeLog b/ChangeLog index 759cd19..8296081 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2007-01-26 Edward Hervey + + * configure.ac: + * gst/Makefile.am: + * gst/gstversion.override.in: + * gst/gst-0.10.12.ignore: + Add ignore file for 0.10.12 API additions + * gst/gst.defs: + * gst/base.defs: + * gst/gst-types.defs: + Add new API definitions + * gst/gst-0.10.10.ignore: + * gst/gst-0.10.11.ignore: + Fixup ignore files. + * testsuite/test_segment.py: + The update return value is uncertain and will soon be deprecated, don't + check against it anymore. + 2007-01-17 Thomas Vander Stichele * examples/mixer.py: diff --git a/configure.ac b/configure.ac index 0fd345a..926bb3c 100644 --- a/configure.ac +++ b/configure.ac @@ -141,6 +141,14 @@ then IGNORE_GST_0_10_11="" fi + if test $GST_MINOR_VERSION -lt "12" + then + IGNORE_GST_0_10_12="gst-0.10.12.ignore" + else + IGNORE_GST_0_10_12="" + fi + + dnl plugins base if test $GST_PB_MINOR_VERSION -lt "11" then IGNORE_GST_PB_0_10_11="gst-pb-0.10.11.ignore" @@ -157,6 +165,7 @@ else IGNORE_GST_0_10_7="" IGNORE_GST_0_10_10="" IGNORE_GST_0_10_11="" + IGNORE_GST_0_10_12="" IGNORE_GST_PB_0_10_11="" fi AC_SUBST(IGNORE_GST_0_10_3) @@ -166,6 +175,7 @@ AC_SUBST(IGNORE_GST_0_10_6) AC_SUBST(IGNORE_GST_0_10_7) AC_SUBST(IGNORE_GST_0_10_10) AC_SUBST(IGNORE_GST_0_10_11) +AC_SUBST(IGNORE_GST_0_10_12) AC_SUBST(IGNORE_GST_PB_0_10_11) dnl check for gstreamer-base; uninstalled is selected preferentially diff --git a/gst/Makefile.am b/gst/Makefile.am index d774b65..4fd4675 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -30,6 +30,7 @@ versioned_overrides = \ gst-0.10.7.ignore \ gst-0.10.10.ignore \ gst-0.10.11.ignore \ + gst-0.10.12.ignore \ gst-pb-0.10.11.ignore INCLUDES = $(PYTHON_INCLUDES) diff --git a/gst/base.defs b/gst/base.defs index bf0c9d9..8ee7a38 100644 --- a/gst/base.defs +++ b/gst/base.defs @@ -87,6 +87,17 @@ ) ) +(define-method copy + (of-object "GstAdapter") + (c-name "gst_adapter_copy") + (return-type "none") + (parameters + '("guint8*" "dest") + '("guint" "offset") + '("guint" "size") + ) +) + (define-method flush (of-object "GstAdapter") (c-name "gst_adapter_flush") diff --git a/gst/gst-0.10.10.ignore b/gst/gst-0.10.10.ignore index 2c90f6f..ac5a23a 100644 --- a/gst/gst-0.10.10.ignore +++ b/gst/gst-0.10.10.ignore @@ -2,6 +2,8 @@ ignore gst_segtrap_is_enabled gst_segtrap_set_enabled + gst_registry_fork_is_enabled + gst_registry_fork_set_enabled gst_ghost_pad_new_from_template gst_ghost_pad_new_no_target_from_template gst_object_set_control_rate diff --git a/gst/gst-0.10.11.ignore b/gst/gst-0.10.11.ignore index b431297..5d3faf3 100644 --- a/gst/gst-0.10.11.ignore +++ b/gst/gst-0.10.11.ignore @@ -5,4 +5,5 @@ ignore gst_base_sink_wait_preroll gst_base_src_wait_playing gst_tag_list_is_empty + gst_element_state_change_return_get_name %% diff --git a/gst/gst-0.10.12.ignore b/gst/gst-0.10.12.ignore new file mode 100644 index 0000000..d767843 --- /dev/null +++ b/gst/gst-0.10.12.ignore @@ -0,0 +1,5 @@ +%% +ignore + gst_update_registry + gst_adapter_copy +%% diff --git a/gst/gst-types.defs b/gst/gst-types.defs index 3d51f2e3..16f238f 100644 --- a/gst/gst-types.defs +++ b/gst/gst-types.defs @@ -534,6 +534,7 @@ '("qos" "GST_EVENT_QOS") '("seek" "GST_EVENT_SEEK") '("navigation" "GST_EVENT_NAVIGATION") + '("set-latency" "GST_EVENT_SET_LATENCY") '("custom-upstream" "GST_EVENT_CUSTOM_UPSTREAM") '("custom-downstream" "GST_EVENT_CUSTOM_DOWNSTREAM") '("custom-downstream-oob" "GST_EVENT_CUSTOM_DOWNSTREAM_OOB") diff --git a/gst/gst.defs b/gst/gst.defs index b9d9dc6..c4f6636 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -64,6 +64,25 @@ '("gboolean" "enabled") ) ) + +(define-function registry_fork_is_enabled + (c-name "gst_registry_fork_is_enabled") + (return-type "gboolean") +) + +(define-function registry_fork_set_enabled + (c-name "gst_registry_fork_set_enabled") + (return-type "none") + (parameters + '("gboolean" "enabled") + ) +) + +(define-function update_registry + (c-name "gst_update_registry") + (return-type "gboolean") +) + (define-function get_gst_version (c-name "gst_get_gst_version") (return-type "none") diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in index c71dd901..6ad44fa 100644 --- a/gst/gstversion.override.in +++ b/gst/gstversion.override.in @@ -7,4 +7,6 @@ include @IGNORE_GST_0_10_7@ @IGNORE_GST_0_10_10@ @IGNORE_GST_0_10_11@ +@IGNORE_GST_PB_0_10_11@ +@IGNORE_GST_0_10_12@ %% diff --git a/testsuite/test_segment.py b/testsuite/test_segment.py index 96417cf0..c96dded 100644 --- a/testsuite/test_segment.py +++ b/testsuite/test_segment.py @@ -39,7 +39,8 @@ class SegmentTest(TestCase): gst.SEEK_TYPE_NONE, 200, gst.SEEK_TYPE_CUR, -100) - self.assertEquals(update, False) + # the update flag is deprecated, we cannot check for proper behaviour. + #self.assertEquals(update, False) self.assertEquals(segment.start, 100) self.assertEquals(segment.stop, -1)