From f032ff59deabd7d86de25bbca91c97db92aac1e8 Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Wed, 22 Oct 2014 09:39:10 +0000 Subject: [PATCH] [GTK][Stable] webkitgtk-2.4.6: fails to build with --disable-video https://bugs.webkit.org/show_bug.cgi?id=137445 Patch by Michael Weber on 2014-10-22 Reviewed by Carlos Garcia Campos. * Source/autotools/SetupWebKitFeatures.m4: --- ChangeLog | 9 +++++++++ Source/autotools/SetupWebKitFeatures.m4 | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 305521fd56b4..3a67118e18a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2014-10-22 Michael Weber + + [GTK][Stable] webkitgtk-2.4.6: fails to build with --disable-video + https://bugs.webkit.org/show_bug.cgi?id=137445 + + Reviewed by Carlos Garcia Campos. + + * Source/autotools/SetupWebKitFeatures.m4: + 2014-07-11 Carlos Garcia Campos [GTK] Enable VIDEO_TRACK by default diff --git a/Source/autotools/SetupWebKitFeatures.m4 b/Source/autotools/SetupWebKitFeatures.m4 index ec98779e9582..a885f2026014 100644 --- a/Source/autotools/SetupWebKitFeatures.m4 +++ b/Source/autotools/SetupWebKitFeatures.m4 @@ -24,9 +24,9 @@ else fi if test "$enable_video" = "yes"; then - CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=1" + CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=1 ENABLE_VIDEO_TRACK=1" else - CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=0" + CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0" fi if test "$enable_css_filters" = "yes"; then @@ -171,7 +171,6 @@ $srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \ ENABLE_TOUCH_ICON_LOADING=0 \ ENABLE_USER_TIMING=0 \ ENABLE_VIBRATION=0 \ - ENABLE_VIDEO_TRACK=1 \ ENABLE_VIEW_MODE_CSS_MEDIA=1 \ ENABLE_WEB_SOCKETS=1 \ ENABLE_WEB_TIMING=1 \