mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-28 20:05:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

autotools: remove gstreamer-1.0 support

Browse source 
This patch only removes the support of gstreamer-1.0 in the autotools
scripts. No other files are touched.

In the automake file all the converters were deprecated.

https://bugzilla.gnome.org/show_bug.cgi?id=745728

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
This commit is contained in:
Víctor Manuel Jáquez Leal 2015-04-03 17:05:45 +03:00 committed by Sreerenj Balachandran
parent 5deae3bcfb
commit 1256ce613a
2 changed files with 4 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure.ac
View file

@ -27,9 +27,6 @@ m4_define([glib_version], [2.28])
# gstreamer version number
m4_define([gst_api_version], [autodetect])
m4_define([gst1_version], [1.0.0])
m4_define([gst1_plugins_base_version], [1.0.0])
m4_define([gst1_plugins_bad_version], [1.0.0])
m4_define([gst12_version], [1.1.90])
m4_define([gst12_plugins_base_version], [1.1.0])
m4_define([gst12_plugins_bad_version], [1.1.0])
@ -200,11 +197,6 @@ AC_DEFINE_UNQUOTED([GST_API_VERSION_S], ["$GST_API_VERSION"],
dnl Versions for GStreamer and plugins-base
case $GST_API_VERSION in
1.0)
GST_VERSION_REQUIRED=gst1_version
GST_PLUGINS_BASE_VERSION_REQUIRED=gst1_plugins_base_version
GST_PLUGINS_BAD_VERSION_REQUIRED=gst1_plugins_bad_version
;;
1.2)
GST_VERSION_REQUIRED=gst12_version
GST_PLUGINS_BASE_VERSION_REQUIRED=gst12_plugins_base_version
@ -229,16 +221,12 @@ AC_SUBST(GST_VERSION_REQUIRED)
AC_SUBST(GST_PLUGINS_BASE_VERSION_REQUIRED)
AC_SUBST(GST_PLUGINS_BAD_VERSION_REQUIRED)
USE_GST_API_1_0p="no"
USE_GST_API_1_2p="no"
USE_GST_API_1_4p="no"
AS_VERSION_COMPARE([$GST_API_VERSION], [1.0],
[], [USE_GST_API_1_0p="yes"], [USE_GST_API_1_0p="yes"])
AS_VERSION_COMPARE([$GST_API_VERSION], [1.2],
[], [USE_GST_API_1_2p="yes"], [USE_GST_API_1_2p="yes"])
AS_VERSION_COMPARE([$GST_API_VERSION], [1.4],
[], [USE_GST_API_1_4p="yes"], [USE_GST_API_1_4p="yes"])
AM_CONDITIONAL([USE_GST_API_1_0p], [test "$USE_GST_API_1_0p" = "yes"])
AM_CONDITIONAL([USE_GST_API_1_2p], [test "$USE_GST_API_1_2p" = "yes"])
AM_CONDITIONAL([USE_GST_API_1_4p], [test "$USE_GST_API_1_4p" = "yes"])
@ -247,11 +235,6 @@ AC_SUBST([GST_PKG_VERSION])
AC_DEFINE_UNQUOTED([GST_PKG_VERSION_S], ["$GST_PKG_VERSION"],
[Defined to the string representation of GStreamer API version])
dnl Validate certain features
if test "$GST_API_VERSION" = "1.0"; then
AC_MSG_WARN([support for GStreamer 1.0 is obsolete, and will be removed])
fi
dnl GStreamer Core
PKG_CHECK_MODULES([GST],
[gstreamer-$GST_PKG_VERSION >= $GST_VERSION_REQUIRED])

45
gst/vaapi/Makefile.am
View file

@ -57,6 +57,8 @@ libgstvaapi_source_c = \
gstvaapivideocontext.c \
gstvaapivideometa.c \
gstvaapidecodebin.c \
gstvaapivideobufferpool.c \
gstvaapivideomemory.c \
$(NULL)
libgstvaapi_source_h = \
@ -70,6 +72,8 @@ libgstvaapi_source_h = \
gstvaapivideocontext.h \
gstvaapivideometa.h \
gstvaapidecodebin.h \
gstvaapivideobufferpool.h \
gstvaapivideomemory.h \
$(NULL)
libgstvaapi_enc_source_c = \
@ -103,26 +107,6 @@ libgstvaapi_source_c += $(libgstvaapi_vp8enc_source_c)
libgstvaapi_source_h += $(libgstvaapi_vp8enc_source_h)
endif
libgstvaapi_x11_source_c = gstvaapivideoconverter_x11.c
libgstvaapi_x11_source_h = gstvaapivideoconverter_x11.h
if USE_X11
if !USE_GST_API_1_2p
libgstvaapi_source_c += $(libgstvaapi_x11_source_c)
libgstvaapi_source_h += $(libgstvaapi_x11_source_h)
endif
endif
libgstvaapi_glx_source_c = gstvaapivideoconverter_glx.c
libgstvaapi_glx_source_h = gstvaapivideoconverter_glx.h
if USE_GLX
if !USE_GST_API_1_2p
libgstvaapi_source_c += $(libgstvaapi_glx_source_c)
libgstvaapi_source_h += $(libgstvaapi_glx_source_h)
endif
endif
libgstvaapi_egl_source_c =
libgstvaapi_egl_source_h =
@ -144,21 +128,6 @@ libgstvaapi_source_c += $(libgstvaapi_1_2p_source_c)
libgstvaapi_source_h += $(libgstvaapi_1_2p_source_h)
endif
libgstvaapi_1_0p_source_c = \
gstvaapivideobufferpool.c \
gstvaapivideomemory.c \
$(NULL)
libgstvaapi_1_0p_source_h = \
gstvaapivideobufferpool.h \
gstvaapivideomemory.h \
$(NULL)
if USE_GST_API_1_0p
libgstvaapi_source_c += $(libgstvaapi_1_0p_source_c)
libgstvaapi_source_h += $(libgstvaapi_1_0p_source_h)
endif
libgstvaapi_la_SOURCES = $(libgstvaapi_source_c)
noinst_HEADERS = $(libgstvaapi_source_h)
@ -259,16 +228,10 @@ EXTRA_DIST = \
$(libgstvaapi_jpegenc_source_h) \
$(libgstvaapi_vp8enc_source_c) \
$(libgstvaapi_vp8enc_source_h) \
$(libgstvaapi_x11_source_c) \
$(libgstvaapi_x11_source_h) \
$(libgstvaapi_glx_source_c) \
$(libgstvaapi_glx_source_h) \
$(libgstvaapi_egl_source_c) \
$(libgstvaapi_egl_source_h) \
$(libgstvaapi_1_2p_source_c) \
$(libgstvaapi_1_2p_source_h) \
$(libgstvaapi_1_0p_source_c) \
$(libgstvaapi_1_0p_source_h) \
$(libgstvaapi_parse_source_c) \
$(libgstvaapi_parse_source_h) \
$(NULL)