summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2010-01-15 17:49:03 +0100
committerEdward Hervey <bilboed@bilboed.com>2010-01-18 15:03:22 +0100
commit75b08daff261bd921daf4637c5b90d02fc802259 (patch)
tree1ff878df4eb4195e0d3ad374f9a58c95c594f54b
parent1ec21f61cedab95b787ff96b85b064cf1412da84 (diff)
bump minimum requirement to 0.10.18 and remove cruft
-rw-r--r--configure.ac80
-rw-r--r--gst/Makefile.am8
-rw-r--r--gst/gst-0.10.13.ignore23
-rw-r--r--gst/gst-0.10.14.ignore17
-rw-r--r--gst/gst-0.10.15.ignore26
-rw-r--r--gst/gst-0.10.16.ignore8
-rw-r--r--gst/gst-0.10.18.ignore7
-rw-r--r--gst/gst-pb-0.10.14.ignore13
-rw-r--r--gst/gst-pb-0.10.16.ignore13
-rw-r--r--gst/gst-pb-0.10.18.ignore8
-rw-r--r--gst/gstversion.override.in8
-rw-r--r--gst/interfaces.override2
-rw-r--r--gst/pbutils.override2
13 files changed, 2 insertions, 213 deletions
diff --git a/configure.ac b/configure.ac
index e1d39ec..a8a80de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,8 +44,8 @@ AC_SUBST(PYGTK_REQ, 2.6.3)
AC_SUBST(PYGOBJECT_REQ, 2.11.2)
AC_SUBST(GLIB_REQ, 2.8.0)
AC_SUBST(GTK_REQ, 2.6.0)
-AC_SUBST(GST_REQ, 0.10.12)
-AC_SUBST(GSTPB_REQ, 0.10.12)
+AC_SUBST(GST_REQ, 0.10.18)
+AC_SUBST(GSTPB_REQ, 0.10.18)
AC_DISABLE_STATIC
@@ -104,41 +104,6 @@ dnl _ new core/base is released (add lines + gst-0.10.MINOR.ignore)
if test "x$GST_CVS_VERSION" = "x"
then
- if test $GST_MINOR_VERSION -lt "13"
- then
- IGNORE_GST_0_10_13="gst-0.10.13.ignore"
- else
- 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
-
- if test $GST_MINOR_VERSION -lt "15"
- then
- IGNORE_GST_0_10_15="gst-0.10.15.ignore"
- else
- IGNORE_GST_0_10_15=""
- fi
-
- if test $GST_MINOR_VERSION -lt "16"
- then
- IGNORE_GST_0_10_16="gst-0.10.16.ignore"
- else
- IGNORE_GST_0_10_16=""
- fi
-
- if test $GST_MINOR_VERSION -lt "18"
- then
- IGNORE_GST_0_10_18="gst-0.10.18.ignore"
- else
- IGNORE_GST_0_10_18=""
- fi
-
if test $GST_MINOR_VERSION -lt "20"
then
IGNORE_GST_0_10_20="gst-0.10.20.ignore"
@@ -189,28 +154,6 @@ then
fi
dnl plugins base
- 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
-
- if test $GST_PB_MINOR_VERSION -lt "16"
- then
- IGNORE_GST_PB_0_10_16="gst-pb-0.10.16.ignore"
- else
- IGNORE_GST_PB_0_10_16=""
- AC_DEFINE_UNQUOTED(HAVE_PLUGINS_INSTALL, 1, [We can use the plugins-install methods])
- fi
-
- if test $GST_PB_MINOR_VERSION -lt "18"
- then
- IGNORE_GST_PB_0_10_18="gst-pb-0.10.18.ignore"
- else
- IGNORE_GST_PB_0_10_18=""
- fi
-
if test $GST_PB_MINOR_VERSION -ge "22"
then
AC_DEFINE_UNQUOTED(HAVE_GST_AUDIO, 1, [We can use the gst-audio library])
@@ -240,10 +183,6 @@ then
IGNORE_GST_PB_0_10_26=""
fi
else
- IGNORE_GST_0_10_13=""
- IGNORE_GST_0_10_14=""
- IGNORE_GST_0_10_15=""
- IGNORE_GST_0_10_16=""
IGNORE_GST_0_10_18=""
IGNORE_GST_0_10_20=""
IGNORE_GST_0_10_21=""
@@ -252,24 +191,14 @@ else
IGNORE_GST_0_10_24=""
IGNORE_GST_0_10_25=""
IGNORE_GST_0_10_26=""
- IGNORE_GST_PB_0_10_14=""
- IGNORE_GST_PB_0_10_16=""
- IGNORE_GST_PB_0_10_18=""
IGNORE_GST_PB_0_10_23=""
IGNORE_GST_PB_0_10_25=""
IGNORE_GST_PB_0_10_26=""
- AC_DEFINE_UNQUOTED(HAVE_PLUGINS_INSTALL, 1, [We can use the plugins-install methods])
AC_DEFINE_UNQUOTED(HAVE_GST_AUDIO, 1, [We can use the gst-audio library])
AC_DEFINE_UNQUOTED(HAVE_GST_VIDEO, 1, [We can use the gst-video library])
AC_DEFINE_UNQUOTED(HAVE_GST_TAG, 1, [We can use the gst-tag library])
fi
-AC_DEFINE_UNQUOTED(HAVE_VIDEO_ORIENTATION_INTERFACE, 1, [We can use the videoorientation interface])
AC_DEFINE_UNQUOTED(HAVE_STREAM_VOLUME_INTERFACE, 1, [We can use the streamvolume interface])
-AC_SUBST(IGNORE_GST_0_10_13)
-AC_SUBST(IGNORE_GST_0_10_14)
-AC_SUBST(IGNORE_GST_0_10_15)
-AC_SUBST(IGNORE_GST_0_10_16)
-AC_SUBST(IGNORE_GST_0_10_18)
AC_SUBST(IGNORE_GST_0_10_20)
AC_SUBST(IGNORE_GST_0_10_21)
AC_SUBST(IGNORE_GST_0_10_22)
@@ -277,14 +206,9 @@ AC_SUBST(IGNORE_GST_0_10_23)
AC_SUBST(IGNORE_GST_0_10_24)
AC_SUBST(IGNORE_GST_0_10_25)
AC_SUBST(IGNORE_GST_0_10_26)
-AC_SUBST(IGNORE_GST_PB_0_10_14)
-AC_SUBST(IGNORE_GST_PB_0_10_16)
-AC_SUBST(IGNORE_GST_PB_0_10_18)
AC_SUBST(IGNORE_GST_PB_0_10_23)
AC_SUBST(IGNORE_GST_PB_0_10_25)
AC_SUBST(IGNORE_GST_PB_0_10_26)
-AC_SUBST(HAVE_VIDEO_ORIENTATION)
-AC_SUBST(HAVE_PLUGINS_INSTALL)
AM_CONDITIONAL(HAVE_GST_AUDIO, $HAVE_GST_AUDIO)
AM_CONDITIONAL(HAVE_GST_VIDEO, $HAVE_GST_VIDEO)
AM_CONDITIONAL(HAVE_GST_TAG, $HAVE_GST_TAG)
diff --git a/gst/Makefile.am b/gst/Makefile.am
index d9aabf8..97cbe87 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -25,11 +25,6 @@ defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs
noinst_HEADERS = common.h pygstvalue.h pygstminiobject.h pygstexception.h
versioned_overrides = \
- gst-0.10.13.ignore \
- gst-0.10.14.ignore \
- gst-0.10.15.ignore \
- gst-0.10.16.ignore \
- gst-0.10.18.ignore \
gst-0.10.20.ignore \
gst-0.10.21.ignore \
gst-0.10.22.ignore \
@@ -37,9 +32,6 @@ versioned_overrides = \
gst-0.10.24.ignore \
gst-0.10.25.ignore \
gst-0.10.26.ignore \
- gst-pb-0.10.14.ignore \
- gst-pb-0.10.16.ignore \
- gst-pb-0.10.18.ignore \
gst-pb-0.10.23.ignore \
gst-pb-0.10.25.ignore \
gst-pb-0.10.26.ignore \
diff --git a/gst/gst-0.10.13.ignore b/gst/gst-0.10.13.ignore
deleted file mode 100644
index 122be09..0000000
--- a/gst/gst-0.10.13.ignore
+++ /dev/null
@@ -1,23 +0,0 @@
-%%
-ignore
- gst_element_change_state
- gst_clock_unadjust_unlocked
- GstBaseSrc__do_prepare_seek_segment
- GstBaseSrc__proxy_do_prepare_seek_segment
- gst_buffer_try_new_and_alloc
- gst_buffer_copy_metadata
- gst_uri_protocol_is_supported
- gst_base_src_query_latency
- gst_controller_suggest_next_sync
- gst_object_suggest_next_sync
- GstBaseSrc__do_unlock_stop
- GstBaseSrc__proxy_do_unlock_stop
- GstBaseSink__do_unlock_stop
- GstBaseSink__proxy_do_unlock_stop
- gst_message_new_async_start
- gst_message_parse_async_start
- gst_message_new_async_done
-%%
-ignore-type
- GstBufferCopyFlags
-%%
diff --git a/gst/gst-0.10.14.ignore b/gst/gst-0.10.14.ignore
deleted file mode 100644
index 7d25b26..0000000
--- a/gst/gst-0.10.14.ignore
+++ /dev/null
@@ -1,17 +0,0 @@
-%%
-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
- gst_data_queue_get_level
- gst_data_queue_limits_changed
-%%
-ignore-type
- GstControlSource
- GstInterpolationControlSource
-%% \ No newline at end of file
diff --git a/gst/gst-0.10.15.ignore b/gst/gst-0.10.15.ignore
deleted file mode 100644
index b554552..0000000
--- a/gst/gst-0.10.15.ignore
+++ /dev/null
@@ -1,26 +0,0 @@
-%%
-ignore
- gst_pad_peer_query
- gst_registry_add_path
- gst_structure_get_uint
- gst_bus_pop_filtered
- gst_bus_timed_pop_filtered
- gst_base_sink_get_last_buffer
- gst_base_sink_set_async_enabled
- gst_base_sink_is_async_enabled
- gst_base_sink_set_ts_offset
- gst_base_sink_get_ts_offset
- gst_base_src_set_do_timestamp
- gst_base_src_get_do_timestamp
- GstURIHandler__do_get_protocols_full
- GstURIHandler__proxy_do_get_protocols_full
- GstURIHandler__do_get_type_full
- GstURIHandler__proxy_do_get_type_full
- GST_DEBUG_BIN_TO_DOT_FILE
- GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS
-%%
-ignore-type
- GstLFOControlSource
- GstLFOWaveform
- GstDebugGraphDetails
-%%
diff --git a/gst/gst-0.10.16.ignore b/gst/gst-0.10.16.ignore
deleted file mode 100644
index 5c4d0fb..0000000
--- a/gst/gst-0.10.16.ignore
+++ /dev/null
@@ -1,8 +0,0 @@
-%%
-ignore
- gst_plugin_register_static
- gst_util_get_timestamp
- gst_base_transform_set_gap_aware
-%%
-ignore-type
-%%
diff --git a/gst/gst-0.10.18.ignore b/gst/gst-0.10.18.ignore
deleted file mode 100644
index 1f4e35b..0000000
--- a/gst/gst-0.10.18.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-%%
-ignore
- gst_index_set_resolver_full
-%%
-ignore-type
- GstPoll
-%% \ No newline at end of file
diff --git a/gst/gst-pb-0.10.14.ignore b/gst/gst-pb-0.10.14.ignore
deleted file mode 100644
index 85506ce..0000000
--- a/gst/gst-pb-0.10.14.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-%%
-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/gst-pb-0.10.16.ignore b/gst/gst-pb-0.10.16.ignore
deleted file mode 100644
index f9b5855..0000000
--- a/gst/gst-pb-0.10.16.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-%%
-ignore
- gst_install_plugins_context_new
- gst_install_plugins_context_free
- gst_install_plugins_context_set_xid
- gst_install_plugins_async
- gst_install_plugins_sync
- gst_install_plugins_return_get_name
-%%
-ignore-type
- GstInstallPluginsContext
- GstInstallPluginsReturn
-%%
diff --git a/gst/gst-pb-0.10.18.ignore b/gst/gst-pb-0.10.18.ignore
deleted file mode 100644
index 853c7c5..0000000
--- a/gst/gst-pb-0.10.18.ignore
+++ /dev/null
@@ -1,8 +0,0 @@
-%%
-ignore
- gst_collect_pads_read_buffer
- gst_collect_pads_take_buffer
- gst_mixer_message_parse_options_list_changed
-%%
-ignore-type
-%%
diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in
index 74975c0..851f37f 100644
--- a/gst/gstversion.override.in
+++ b/gst/gstversion.override.in
@@ -1,13 +1,5 @@
%%
include
-@IGNORE_GST_0_10_13@
-@IGNORE_GST_0_10_14@
-@IGNORE_GST_PB_0_10_14@
-@IGNORE_GST_0_10_15@
-@IGNORE_GST_0_10_16@
-@IGNORE_GST_PB_0_10_16@
-@IGNORE_GST_0_10_18@
-@IGNORE_GST_PB_0_10_18@
@IGNORE_GST_0_10_20@
@IGNORE_GST_0_10_21@
@IGNORE_GST_0_10_22@
diff --git a/gst/interfaces.override b/gst/interfaces.override
index e996db2..e89180e 100644
--- a/gst/interfaces.override
+++ b/gst/interfaces.override
@@ -36,9 +36,7 @@ headers
#include <gst/interfaces/propertyprobe.h>
#include <gst/interfaces/tuner.h>
#include <gst/interfaces/mixer.h>
-#ifdef HAVE_VIDEO_ORIENTATION_INTERFACE
#include <gst/interfaces/videoorientation.h>
-#endif
#ifdef HAVE_STREAM_VOLUME_INTERFACE
#include <gst/interfaces/streamvolume.h>
#endif
diff --git a/gst/pbutils.override b/gst/pbutils.override
index b20153e..c5c0f0d 100644
--- a/gst/pbutils.override
+++ b/gst/pbutils.override
@@ -39,7 +39,6 @@ GST_DEBUG_CATEGORY_EXTERN (pygst_debug);
#define Py_ssize_t int
#endif
-#ifdef HAVE_PLUGINS_INSTALL
static void
install_plugins_result_handler(GstInstallPluginsReturn result, gpointer user_data)
{
@@ -77,7 +76,6 @@ install_plugins_result_handler(GstInstallPluginsReturn result, gpointer user_dat
pyg_gil_state_release(state);
}
-#endif
%%
modulename gst.pbutils
%%