Changeset 142756 in webkit
- Timestamp:
- Feb 13, 2013 9:24:40 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r142724 r142756 1 2013-02-13 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] Remove support for compiling with GStreamer 0.10 4 https://bugs.webkit.org/show_bug.cgi?id=109593 5 6 Reviewed by Philippe Normand. 7 8 Remove support for building WebKitGTK+ with GStreamer 0.10. We 9 can simplify things greatly because we don't have to worry any 10 longer about selecting one GStreamer API set. 11 12 * Source/autotools/FindDependencies.m4: 13 * Source/autotools/ReadCommandLineArguments.m4: 14 * Source/autotools/SetupAutoconfHeader.m4: 15 * Source/autotools/Versions.m4: 16 1 17 2013-02-12 Martin Robinson <mrobinson@igalia.com> 2 18 -
trunk/Source/autotools/FindDependencies.m4
r142724 r142756 314 314 fi 315 315 316 if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then317 if test "$with_gstreamer" = "auto"; then318 gstreamer_modules="gstreamer-1.0 >= gstreamer_1_0_required_version gstreamer-app-1.0 gstreamer-audio-1.0319 gstreamer-fft-1.0 gstreamer-base-1.0 gstreamer-pbutils-1.0320 gstreamer-plugins-base-1.0 >= gstreamer_1_0_plugins_base_required_version gstreamer-video-1.0";321 PKG_CHECK_MODULES([GSTREAMER_1_0], [$gstreamer_modules], [with_gstreamer=1.0], [with_gstreamer=0.10])322 AC_MSG_NOTICE([Selected GStreamer $with_gstreamer])323 fi324 else325 if test "$with_gstreamer" != "auto"; then326 AC_MSG_WARN([You have specified GStreamer $with_gstreamer version but it will not be used327 because neither HTML5 Video nor Web Audio are enabled])328 fi329 fi330 331 case "$with_gstreamer" in332 0.10) GSTREAMER_REQUIRED_VERSION=gstreamer_0_10_required_version333 GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=gstreamer_0_10_plugins_base_required_version334 GST_API_VERSION=0.10335 ;;336 1.0) GSTREAMER_REQUIRED_VERSION=gstreamer_1_0_required_version337 GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=gstreamer_1_0_plugins_base_required_version338 GST_API_VERSION=1.0339 ;;340 esac341 342 AC_SUBST([GST_API_VERSION])343 344 316 if test "$enable_opcode_stats" = "yes"; then 345 317 if test "$enable_jit" = "yes"; then … … 439 411 fi 440 412 441 # Check if Gstreamer is available.442 413 if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then 443 gstreamer_modules="gstreamer-$GST_API_VERSION >= $GSTREAMER_REQUIRED_VERSION gstreamer-app-$GST_API_VERSION 444 gstreamer-audio-$GST_API_VERSION gstreamer-fft-$GST_API_VERSION gstreamer-base-$GST_API_VERSION 445 gstreamer-pbutils-$GST_API_VERSION gstreamer-plugins-base-$GST_API_VERSION >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION 446 gstreamer-video-$GST_API_VERSION"; 447 if test "$GST_API_VERSION" != "1.0"; then 448 gstreamer_modules="$gstreamer_modules gstreamer-interfaces-$GST_API_VERSION"; 449 fi 450 PKG_CHECK_MODULES([GSTREAMER], [$gstreamer_modules], [have_gstreamer=yes]) 414 PKG_CHECK_MODULES([GSTREAMER], [ 415 gstreamer-1.0 >= gstreamer_required_version 416 gstreamer-plugins-base-1.0 >= gstreamer_plugins_base_required_version 417 gstreamer-app-1.0 418 gstreamer-audio-1.0, 419 gstreamer-fft-1.0, 420 gstreamer-base-1.0, 421 gstreamer-pbutils-1.0, 422 gstreamer-video-1.0]) 451 423 AC_SUBST([GSTREAMER_CFLAGS]) 452 424 AC_SUBST([GSTREAMER_LIBS]) -
trunk/Source/autotools/ReadCommandLineArguments.m4
r142724 r142756 169 169 AC_MSG_RESULT([$enable_debug_symbols]) 170 170 171 AC_MSG_CHECKING([the GStreamer version to use])172 AC_ARG_WITH([gstreamer],173 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)]),174 [175 case "$with_gstreamer" in176 0.10|1.0|auto) ;;177 *) AC_MSG_ERROR([invalid GStreamer version specified]) ;;178 esac179 ],180 [with_gstreamer=auto])181 AC_MSG_RESULT([$with_gstreamer])182 183 171 AC_MSG_CHECKING([which GPU acceleration backend to use]) 184 172 AC_ARG_WITH(acceleration_backend, -
trunk/Source/autotools/SetupAutoconfHeader.m4
r142724 r142756 73 73 fi 74 74 75 if test "$GST_API_VERSION" = "1.0"; then 76 AC_DEFINE([GST_API_VERSION_1], [1], [Using GStreamer 1.0]) 77 fi 75 AC_DEFINE([GST_API_VERSION_1], [1], [Using GStreamer 1.0]) 78 76 79 77 if test "$enable_web_audio" = "yes"; then -
trunk/Source/autotools/Versions.m4
r142284 r142756 29 29 m4_define([pango_required_version], [1.21.0]) 30 30 31 m4_define([gstreamer_0_10_required_version], [0.10]) 32 m4_define([gstreamer_0_10_plugins_base_required_version], [0.10.30]) 33 m4_define([gstreamer_1_0_required_version], [1.0.3]) 34 m4_define([gstreamer_1_0_plugins_base_required_version], [1.0.3]) 31 m4_define([gstreamer_required_version], [1.0.3]) 32 m4_define([gstreamer_plugins_base_required_version], [1.0.3]) 35 33 36 34 m4_define([gobject_introspection_required], [0.9.5])
Note: See TracChangeset
for help on using the changeset viewer.