[GTK] Remove support for compiling with GStreamer 0.10
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Feb 2013 17:24:40 +0000 (17:24 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Feb 2013 17:24:40 +0000 (17:24 +0000)
https://bugs.webkit.org/show_bug.cgi?id=109593

Patch by Martin Robinson <mrobinson@igalia.com> 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
Source/autotools/FindDependencies.m4
Source/autotools/ReadCommandLineArguments.m4
Source/autotools/SetupAutoconfHeader.m4
Source/autotools/Versions.m4

index fd35bb164096855f816ff5b1d8743e260f079641..1bd33ddf802b312f4b2625ca558be103bd1457a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2013-02-13  Martin Robinson  <mrobinson@igalia.com>
+
+        [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  <mrobinson@igalia.com>
 
         [GTK] Remove the GLib unicode backend
index 10e635d87fa49055f259b86947c36998dc8cf82f..0dcb4626337b03a7d797f71933be388230070d50 100644 (file)
@@ -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
index 9e8e8f25dfadd26735a4c3d8da6dc1e0750c481e..78538f0748f0e5074d73a03122a8be0d872ec9d9 100644 (file)
@@ -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@:>@],
index 3dd92f0194458df5bd07fc6d3a2889a5017b3771..ec2387280ce2d60972759ef2806e7b0962a07b6a 100644 (file)
@@ -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])
index 0b626c619bc167f05e234ceaaa4a93a0a3d4ea29..3da30973e6f9696855ad811701dbe6a82140d975 100644 (file)
@@ -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])