From 3476c7d287a876f70a276f986f78404eb8120af1 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Wed, 13 Feb 2013 17:24:40 +0000 Subject: [PATCH] [GTK] Remove support for compiling with GStreamer 0.10 https://bugs.webkit.org/show_bug.cgi?id=109593 Patch by Martin Robinson on 2013-02-13 Reviewed by Philippe Normand. Remove support for building WebKitGTK+ with GStreamer 0.10. We can simplify things greatly because we don't have to worry any longer about selecting one GStreamer API set. * Source/autotools/FindDependencies.m4: * Source/autotools/ReadCommandLineArguments.m4: * Source/autotools/SetupAutoconfHeader.m4: * Source/autotools/Versions.m4: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142756 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 16 +++++++ Source/autotools/FindDependencies.m4 | 46 ++++---------------- Source/autotools/ReadCommandLineArguments.m4 | 12 ----- Source/autotools/SetupAutoconfHeader.m4 | 4 +- Source/autotools/Versions.m4 | 6 +-- 5 files changed, 28 insertions(+), 56 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd35bb164096..1bd33ddf802b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2013-02-13 Martin Robinson + + [GTK] Remove support for compiling with GStreamer 0.10 + https://bugs.webkit.org/show_bug.cgi?id=109593 + + Reviewed by Philippe Normand. + + Remove support for building WebKitGTK+ with GStreamer 0.10. We + can simplify things greatly because we don't have to worry any + longer about selecting one GStreamer API set. + + * Source/autotools/FindDependencies.m4: + * Source/autotools/ReadCommandLineArguments.m4: + * Source/autotools/SetupAutoconfHeader.m4: + * Source/autotools/Versions.m4: + 2013-02-12 Martin Robinson [GTK] Remove the GLib unicode backend diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4 index 10e635d87fa4..0dcb4626337b 100644 --- a/Source/autotools/FindDependencies.m4 +++ b/Source/autotools/FindDependencies.m4 @@ -313,34 +313,6 @@ if test "$enable_svg_fonts" = "yes" && test "$enable_svg" = "no"; then enable_svg=yes fi -if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then - if test "$with_gstreamer" = "auto"; then - gstreamer_modules="gstreamer-1.0 >= gstreamer_1_0_required_version gstreamer-app-1.0 gstreamer-audio-1.0 - gstreamer-fft-1.0 gstreamer-base-1.0 gstreamer-pbutils-1.0 - gstreamer-plugins-base-1.0 >= gstreamer_1_0_plugins_base_required_version gstreamer-video-1.0"; - PKG_CHECK_MODULES([GSTREAMER_1_0], [$gstreamer_modules], [with_gstreamer=1.0], [with_gstreamer=0.10]) - AC_MSG_NOTICE([Selected GStreamer $with_gstreamer]) - fi -else - if test "$with_gstreamer" != "auto"; then - AC_MSG_WARN([You have specified GStreamer $with_gstreamer version but it will not be used - because neither HTML5 Video nor Web Audio are enabled]) - fi -fi - -case "$with_gstreamer" in - 0.10) GSTREAMER_REQUIRED_VERSION=gstreamer_0_10_required_version - GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=gstreamer_0_10_plugins_base_required_version - GST_API_VERSION=0.10 - ;; - 1.0) GSTREAMER_REQUIRED_VERSION=gstreamer_1_0_required_version - GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=gstreamer_1_0_plugins_base_required_version - GST_API_VERSION=1.0 - ;; -esac - -AC_SUBST([GST_API_VERSION]) - if test "$enable_opcode_stats" = "yes"; then if test "$enable_jit" = "yes"; then AC_MSG_ERROR([JIT must be disabled for Opcode stats to work.]) @@ -438,16 +410,16 @@ if test "$os_win32" = "no"; then AC_SUBST([XRENDER_LIBS]) fi -# Check if Gstreamer is available. if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then - gstreamer_modules="gstreamer-$GST_API_VERSION >= $GSTREAMER_REQUIRED_VERSION gstreamer-app-$GST_API_VERSION - gstreamer-audio-$GST_API_VERSION gstreamer-fft-$GST_API_VERSION gstreamer-base-$GST_API_VERSION - gstreamer-pbutils-$GST_API_VERSION gstreamer-plugins-base-$GST_API_VERSION >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION - gstreamer-video-$GST_API_VERSION"; - if test "$GST_API_VERSION" != "1.0"; then - gstreamer_modules="$gstreamer_modules gstreamer-interfaces-$GST_API_VERSION"; - fi - PKG_CHECK_MODULES([GSTREAMER], [$gstreamer_modules], [have_gstreamer=yes]) + PKG_CHECK_MODULES([GSTREAMER], [ + gstreamer-1.0 >= gstreamer_required_version + gstreamer-plugins-base-1.0 >= gstreamer_plugins_base_required_version + gstreamer-app-1.0 + gstreamer-audio-1.0, + gstreamer-fft-1.0, + gstreamer-base-1.0, + gstreamer-pbutils-1.0, + gstreamer-video-1.0]) AC_SUBST([GSTREAMER_CFLAGS]) AC_SUBST([GSTREAMER_LIBS]) fi diff --git a/Source/autotools/ReadCommandLineArguments.m4 b/Source/autotools/ReadCommandLineArguments.m4 index 9e8e8f25dfad..78538f0748f0 100644 --- a/Source/autotools/ReadCommandLineArguments.m4 +++ b/Source/autotools/ReadCommandLineArguments.m4 @@ -168,18 +168,6 @@ AC_ARG_ENABLE(debug_symbols, ]) AC_MSG_RESULT([$enable_debug_symbols]) -AC_MSG_CHECKING([the GStreamer version to use]) -AC_ARG_WITH([gstreamer], - AS_HELP_STRING([--with-gstreamer=1.0|0.10|auto], [the GStreamer version to use (default: auto, tries 1.0 first, 0.10 is fallback)]), - [ - case "$with_gstreamer" in - 0.10|1.0|auto) ;; - *) AC_MSG_ERROR([invalid GStreamer version specified]) ;; - esac - ], - [with_gstreamer=auto]) -AC_MSG_RESULT([$with_gstreamer]) - AC_MSG_CHECKING([which GPU acceleration backend to use]) AC_ARG_WITH(acceleration_backend, AC_HELP_STRING([--with-acceleration-backend=@<:@opengl/clutter/none@:>@], diff --git a/Source/autotools/SetupAutoconfHeader.m4 b/Source/autotools/SetupAutoconfHeader.m4 index 3dd92f019445..ec2387280ce2 100644 --- a/Source/autotools/SetupAutoconfHeader.m4 +++ b/Source/autotools/SetupAutoconfHeader.m4 @@ -72,9 +72,7 @@ if test "$have_gstreamer" = "yes"; then fi fi -if test "$GST_API_VERSION" = "1.0"; then - AC_DEFINE([GST_API_VERSION_1], [1], [Using GStreamer 1.0]) -fi +AC_DEFINE([GST_API_VERSION_1], [1], [Using GStreamer 1.0]) if test "$enable_web_audio" = "yes"; then AC_DEFINE([WTF_USE_WEBAUDIO_GSTREAMER], [1], [1]) diff --git a/Source/autotools/Versions.m4 b/Source/autotools/Versions.m4 index 0b626c619bc1..3da30973e6f9 100644 --- a/Source/autotools/Versions.m4 +++ b/Source/autotools/Versions.m4 @@ -28,9 +28,7 @@ m4_define([libsoup_required_version], [2.40.0]) m4_define([libxml_required_version], [2.6]) m4_define([pango_required_version], [1.21.0]) -m4_define([gstreamer_0_10_required_version], [0.10]) -m4_define([gstreamer_0_10_plugins_base_required_version], [0.10.30]) -m4_define([gstreamer_1_0_required_version], [1.0.3]) -m4_define([gstreamer_1_0_plugins_base_required_version], [1.0.3]) +m4_define([gstreamer_required_version], [1.0.3]) +m4_define([gstreamer_plugins_base_required_version], [1.0.3]) m4_define([gobject_introspection_required], [0.9.5]) -- 2.36.0