[GTK][AC] Build failure with an option --with-acceleration-backend=clutter
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 16 Dec 2012 17:59:46 +0000 (17:59 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 16 Dec 2012 17:59:46 +0000 (17:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=105027

Patch by ChangSeok Oh <shivamidow@gmail.com> on 2012-12-16
Reviewed by Gustavo Noronha Silva.

.:

I turned off opengl related variables, enable_glx, enable_egl and enable_gles2
when selecting clutter as the acceleration-backend. Because they seem useless for the AC by clutter.

* configure.ac:

Source/WebCore:

GLContext.* and RedirectedXCompositeWindow.* are meaningful only if opengl is
a backend for the AC. So I wrap them in USE_OPENGL.

No new tests. This patch fixes a build fauilure, not adding new features.

* GNUmakefile.list.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@137839 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
configure.ac

index 4d4e21a..0c4a447 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-12-16  ChangSeok Oh  <shivamidow@gmail.com>
+
+        [GTK][AC] Build failure with an option --with-acceleration-backend=clutter
+        https://bugs.webkit.org/show_bug.cgi?id=105027
+
+        Reviewed by Gustavo Noronha Silva.
+
+        I turned off opengl related variables, enable_glx, enable_egl and enable_gles2
+        when selecting clutter as the acceleration-backend. Because they seem useless for the AC by clutter.
+
+        * configure.ac:
+
 2012-12-15  Simon Fraser  <simon.fraser@apple.com>
 
         Fix repaint issues when resizing a window with centered content, for platforms with a tile cache
index 2238551..5097578 100644 (file)
@@ -1,3 +1,17 @@
+2012-12-16  ChangSeok Oh  <shivamidow@gmail.com>
+
+        [GTK][AC] Build failure with an option --with-acceleration-backend=clutter
+        https://bugs.webkit.org/show_bug.cgi?id=105027
+
+        Reviewed by Gustavo Noronha Silva.
+
+        GLContext.* and RedirectedXCompositeWindow.* are meaningful only if opengl is
+        a backend for the AC. So I wrap them in USE_OPENGL.
+
+        No new tests. This patch fixes a build fauilure, not adding new features.
+
+        * GNUmakefile.list.am:
+
 2012-12-16  Víctor Manuel Jáquez Leal  <vjaquez@igalia.com>
 
         [GStreamer] create playbin in ::load(), not in player constructor
index 705f72c..122b54f 100644 (file)
@@ -6103,16 +6103,19 @@ webcoregtk_sources += \
 
 if TARGET_X11
 webcoregtk_sources += \
-       Source/WebCore/platform/graphics/cairo/GLContext.cpp \
-       Source/WebCore/platform/graphics/cairo/GLContext.h \
        Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp \
-       Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
-       Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h \
        Source/WebCore/plugins/gtk/gtk2xtbin.c \
        Source/WebCore/plugins/gtk/gtk2xtbin.h \
        Source/WebCore/plugins/gtk/PluginPackageGtk.cpp \
        Source/WebCore/plugins/gtk/PluginViewGtk.cpp \
        Source/WebCore/plugins/gtk/xembed.h
+if USE_OPENGL
+webcoregtk_sources += \
+       Source/WebCore/platform/graphics/cairo/GLContext.cpp \
+       Source/WebCore/platform/graphics/cairo/GLContext.h \
+       Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
+       Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
+endif # END USE_OPENGL
 if USE_EGL
 webcoregtk_sources += \
        Source/WebCore/platform/graphics/egl/GLContextEGL.cpp \
index 7544b56..34ba1f3 100644 (file)
@@ -1012,6 +1012,10 @@ if test "$with_acceleration_backend" = "clutter"; then
    AC_SUBST(CLUTTER_LIBS)
    AC_SUBST(CLUTTER_GTK_CFLAGS)
    AC_SUBST(CLUTTER_GTK_LIBS)
+
+   enable_gles2=no
+   enable_glx=no
+   enable_egl=no
 fi
 
 if test "$with_acceleration_backend" = "opengl"; then