From a73bf408b1a8c69e48a8b528d3c5a997944c8d04 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sat, 28 Jul 2007 14:22:49 +0000 Subject: [PATCH] Adding version overrides for new core/base releases. Original commit message from CVS: * configure.ac: * gst/Makefile.am: * gst/gst-0.10.14.ignore: * gst/gst-pb-0.10.14.ignore: * gst/gstversion.override.in: Adding version overrides for new core/base releases. --- ChangeLog | 9 +++++++++ configure.ac | 18 ++++++++++++++++++ gst/Makefile.am | 2 ++ gst/gst-0.10.14.ignore | 15 +++++++++++++++ gst/gst-pb-0.10.14.ignore | 13 +++++++++++++ gst/gstversion.override.in | 2 ++ 6 files changed, 59 insertions(+) create mode 100644 gst/gst-0.10.14.ignore create mode 100644 gst/gst-pb-0.10.14.ignore diff --git a/ChangeLog b/ChangeLog index 6f439bcad7..e8f310fe0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-07-28 Edward Hervey + + * configure.ac: + * gst/Makefile.am: + * gst/gst-0.10.14.ignore: + * gst/gst-pb-0.10.14.ignore: + * gst/gstversion.override.in: + Adding version overrides for new core/base releases. + 2007-07-28 Edward Hervey * gst/interfaces.override: diff --git a/configure.ac b/configure.ac index 1e5f7effb2..534b7fafd2 100644 --- a/configure.ac +++ b/configure.ac @@ -158,6 +158,13 @@ then IGNORE_GST_0_10_13="" fi + if test $GST_MINOR_VERSION -lt "14" + then + IGNORE_GST_0_10_14="gst-0.10.14.ignore" + else + IGNORE_GST_0_10_14="" + fi + dnl plugins base if test $GST_PB_MINOR_VERSION -lt "11" then @@ -167,6 +174,13 @@ then AC_DEFINE_UNQUOTED(HAVE_VIDEO_ORIENTATION_INTERFACE, 1, [We can use the videoorientation interface]) fi + if test $GST_PB_MINOR_VERSION -lt "14" + then + IGNORE_GST_PB_0_10_14="gst-pb-0.10.14.ignore" + else + IGNORE_GST_PB_0_10_14="" + fi + else IGNORE_GST_0_10_3="" @@ -178,7 +192,9 @@ else IGNORE_GST_0_10_11="" IGNORE_GST_0_10_12="" IGNORE_GST_0_10_13="" + IGNORE_GST_0_10_14="" IGNORE_GST_PB_0_10_11="" + IGNORE_GST_PB_0_10_14="" AC_DEFINE_UNQUOTED(HAVE_VIDEO_ORIENTATION_INTERFACE, 1, [We can use the videoorientation interface]) fi AC_SUBST(IGNORE_GST_0_10_3) @@ -190,7 +206,9 @@ 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_0_10_13) +AC_SUBST(IGNORE_GST_0_10_14) AC_SUBST(IGNORE_GST_PB_0_10_11) +AC_SUBST(IGNORE_GST_PB_0_10_14) AC_SUBST(HAVE_VIDEO_ORIENTATION) dnl check for gstreamer-base; uninstalled is selected preferentially diff --git a/gst/Makefile.am b/gst/Makefile.am index ee3c2a9a55..5f61770c13 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -32,7 +32,9 @@ versioned_overrides = \ gst-0.10.11.ignore \ gst-0.10.12.ignore \ gst-0.10.13.ignore \ + gst-0.10.14.ignore \ gst-pb-0.10.11.ignore \ + gst-pb-0.10.14.ignore \ gst-disable-loadsave.ignore INCLUDES = $(PYTHON_INCLUDES) diff --git a/gst/gst-0.10.14.ignore b/gst/gst-0.10.14.ignore new file mode 100644 index 0000000000..e240264aae --- /dev/null +++ b/gst/gst-0.10.14.ignore @@ -0,0 +1,15 @@ +%% +ignore + gst_element_class_set_details_simple + gst_element_factory_has_interface + gst_controller_set_disabled + gst_controller_set_property_disabled + gst_controller_set_control_source + gst_controller_get_control_source + gst_object_set_control_source + gst_object_get_control_source +%% +ignore-type + GstControlSource + GstInterpolationControlSource +%% \ No newline at end of file diff --git a/gst/gst-pb-0.10.14.ignore b/gst/gst-pb-0.10.14.ignore new file mode 100644 index 0000000000..85506ce388 --- /dev/null +++ b/gst/gst-pb-0.10.14.ignore @@ -0,0 +1,13 @@ +%% +ignore + gst_mixer_get_mixer_flags + gst_mixer_message_get_type + gst_mixer_message_parse_mute_toggled + gst_mixer_message_parse_record_toggled + gst_mixer_message_parse_volume_changed + gst_mixer_message_parse_option_changed +%% +ignore-type + GstMixerFlags + GstMixerMessageType +%% diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in index bab9747819..cb2a9d5578 100644 --- a/gst/gstversion.override.in +++ b/gst/gstversion.override.in @@ -10,5 +10,7 @@ include @IGNORE_GST_PB_0_10_11@ @IGNORE_GST_0_10_12@ @IGNORE_GST_0_10_13@ +@IGNORE_GST_0_10_14@ +@IGNORE_GST_PB_0_10_14@ @IGNORE_GST_LOADSAVE@ %%