1 Make gstreamer support conditional
3 Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
5 From f1055f61bce46eccf8dc0aa017113a08d3d71944 Mon Sep 17 00:00:00 2001
6 From: "commit-queue@webkit.org"
7 <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
8 Date: Fri, 15 Mar 2013 07:13:51 +0000
9 Subject: [PATCH] Build fix for Tools/GtkLauncher/Programs_GtkLauncher-main.o
10 if gstreamer is not installed https://bugs.webkit.org/show_bug.cgi?id=112394
12 Patch by Tobias Mueller <tobiasmue@gnome.org> on 2013-03-15
13 Reviewed by Philippe Normand.
16 (main): Guard using the gstreamer function with #ifdef WTF_USE_GSTREAMER
18 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@145881 268f45cc-cd09-0410-ab3c-d52691b4dbfc
20 Tools/ChangeLog | 10 ++++++++++
21 Tools/GtkLauncher/main.c | 5 ++++-
22 2 files changed, 14 insertions(+), 1 deletion(-)
24 diff --git a/Tools/GtkLauncher/main.c b/Tools/GtkLauncher/main.c
25 index 32baf4a..84c8833 100644
26 --- a/Tools/GtkLauncher/main.c
27 +++ b/Tools/GtkLauncher/main.c
29 #include "autotoolsconfig.h"
30 #include "LauncherInspectorWindow.h"
32 +#ifdef WTF_USE_GSTREAMER
38 @@ -489,8 +491,9 @@ int main(int argc, char* argv[])
39 GOptionContext *context = g_option_context_new(0);
40 g_option_context_add_main_entries(context, commandLineOptions, 0);
41 g_option_context_add_group(context, gtk_get_option_group(TRUE));
42 +#ifdef WTF_USE_GSTREAMER
43 g_option_context_add_group(context, gst_init_get_option_group());
46 webkitSettings = webkit_web_settings_new();
47 g_object_set(webkitSettings, "enable-developer-extras", TRUE, NULL);
48 if (!addWebSettingsGroupToContext(context, webkitSettings)) {