Skip to content

Commit

Permalink
[GTK][Stable] webkitgtk-2.4.6: fails to build with --disable-video
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=137445

Patch by Michael Weber <xmw@gentoo.org> on 2014-10-22
Reviewed by Carlos Garcia Campos.

* Source/autotools/SetupWebKitFeatures.m4:
  • Loading branch information
xmw authored and carlosgcampos committed Oct 22, 2014
1 parent 34b80d2 commit f032ff5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
9 changes: 9 additions & 0 deletions ChangeLog
@@ -1,3 +1,12 @@
2014-10-22 Michael Weber <xmw@gentoo.org>

[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 <cgarcia@igalia.com>

[GTK] Enable VIDEO_TRACK by default
Expand Down
5 changes: 2 additions & 3 deletions Source/autotools/SetupWebKitFeatures.m4
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit f032ff5

Please sign in to comment.