Attachment 233624 Details for Bug 134160 – Patch

[patch] Patch

bug-134160-20140623121651.patch (text/plain), 8.44 KB, created by Zan Dobersek on 2014-06-23 12:17:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2014-06-23 12:17:14 PDT

Size: 8.44 KB

patch

obsolete

>Subversion Revision: 170303
>diff --git a/Source/cmake/FindGTK3.cmake b/Source/cmake/FindGTK3.cmake
>index cfa578467d4b1b2dfba7d5a32b39c3a47cb8eb92..5d7911333e3cd6eeea883350b411c148987029d7 100644
>--- a/Source/cmake/FindGTK3.cmake
>+++ b/Source/cmake/FindGTK3.cmake
>@@ -45,5 +45,19 @@ if (GTK3_VERSION)
>     endif ()
> endif ()
> 
>+if (GTK3_VERSION AND VERSION_OK AND ENABLE_X11_TARGET)
>+    pkg_check_modules(GTK3_X11 gtk+-x11-3.0)
>+    if (NOT("${GTK3_X11_VERSION}" VERSION_EQUAL "${GTK3_VERSION}"))
>+        set(VERSION_OK FALSE)
>+    endif ()
>+endif ()
>+
>+if (GTK3_VERSION AND VERSION_OK AND ENABLE_WAYLAND_TARGET)
>+    pkg_check_modules(GTK3_WAYLAND gtk+-wayland-3.0)
>+    if (NOT("${GTK3_WAYLAND_VERSION}" VERSION_EQUAL "${GTK3_VERSION}"))
>+        set(VERSION_OK FALSE)
>+    endif ()
>+endif ()
>+
> include(FindPackageHandleStandardArgs)
> FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARIES VERSION_OK)
>diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
>index 9f88486341d0d7fc59657967e7a4125a9aaceb3a..e304a999dbf7faaa03749d56c7e2b3ea2c1d36ff 100644
>--- a/Source/cmake/OptionsCommon.cmake
>+++ b/Source/cmake/OptionsCommon.cmake
>@@ -1,10 +1,6 @@
> add_definitions(-DBUILDING_WITH_CMAKE=1)
> add_definitions(-DHAVE_CONFIG_H=1)
> 
>-if (WTF_OS_UNIX)
>-    add_definitions(-DXP_UNIX)
>-endif (WTF_OS_UNIX)
>-
> # CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0.  Since this
> # version, -P does not output empty lines, which currently breaks make_names.pl in
> # WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to
>diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
>index aa7222617e7e40b4ba0380be2d5d8b33a4d9ba06..00b31dd83c29596c5d69d192c94ac5b544151c06 100644
>--- a/Source/cmake/OptionsEfl.cmake
>+++ b/Source/cmake/OptionsEfl.cmake
>@@ -167,6 +167,11 @@ if (ENABLE_NETSCAPE_PLUGIN_API)
>     set(ENABLE_PLUGIN_PROCESS 1)
> endif ()
> 
>+if (WTF_OS_UNIX)
>+    set(ENABLE_X11_TARGET ON)
>+    add_definitions(-DXP_UNIX)
>+endif (WTF_OS_UNIX)
>+
> if (ENABLE_BATTERY_STATUS OR (EFL_REQUIRED_VERSION VERSION_LESS 1.8))
>     find_package(DBus REQUIRED)
>     find_package(E_DBus 1.7 COMPONENTS EUKit)
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index e14e22b8e5a87bb6d787d1830d15b7b9c7836cf0..e86d73a09151bce65a6459f5ade213d2ec12d95b 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -66,6 +66,21 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(WTF_USE_TILED_BACKING_STORE OFF)
> 
>+set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
>+set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayland windowing target.")
>+
>+if (ENABLE_X11_TARGET)
>+    add_definitions(-DWTF_PLATFORM_X11=1)
>+    add_definitions(-DMOZ_X11=1)
>+    if (WTF_OS_UNIX)
>+        add_definitions(-DXP_UNIX)
>+    endif ()
>+endif ()
>+
>+if (ENABLE_WAYLAND_TARGET)
>+    add_definitions(-DWTF_PLATFORM_WAYLAND=1)
>+endif ()
>+
> # FIXME: Perhaps we need a more generic way of defining dependencies between features.
> # VIDEO_TRACK depends on VIDEO.
> if (NOT ENABLE_VIDEO AND ENABLE_VIDEO_TRACK)
>@@ -142,10 +157,6 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
>     endif ()
> endif ()
> 
>-# FIXME: These need to be configurable.
>-add_definitions(-DWTF_PLATFORM_X11=1)
>-add_definitions(-DMOZ_X11)
>-
> find_package(Cairo 1.10.2 REQUIRED)
> find_package(Fontconfig 2.8.0 REQUIRED)
> find_package(Freetype2 2.4.2 REQUIRED)
>@@ -166,8 +177,14 @@ find_package(WebP REQUIRED)
> find_package(ATSPI 2.5.3)
> find_package(GObjectIntrospection)
> 
>-find_package(GTK3 3.6.0 REQUIRED)
>-find_package(GDK3 3.6.0 REQUIRED)
>+if (ENABLE_WAYLAND_TARGET)
>+    set(GTK3_REQUIRED_VERSION 3.12.0)
>+else ()
>+    set(GTK3_REQUIRED_VERSION 3.6.0)
>+endif ()
>+
>+find_package(GTK3 ${GTK3_REQUIRED_VERSION} REQUIRED)
>+find_package(GDK3 ${GTK3_REQUIRED_VERSION} REQUIRED)
> set(GTK_LIBRARIES ${GTK3_LIBRARIES})
> set(GTK_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS})
> set(GDK_LIBRARIES ${GDK3_LIBRARIES})
>@@ -205,15 +222,23 @@ find_package(OpenGL)
> # CMakePushCheckState can be used. We need to have OPENGL_INCLUDE_DIR as part
> # of the directories check_include_files() looks for in case OpenGL is
> # installed into a non-standard location.
>-set(REQUIRED_INCLUDES_OLD ${CMAKE_REQUIRED_INCLUDES})
>-set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR})
>-# We don't use find_package for GLX because it is part of -lGL, unlike EGL.
>-check_include_files("GL/glx.h" GLX_FOUND)
>-set(CMAKE_REQUIRED_INCLUDES ${REQUIRED_INCLUDES_OLD})
>+if (ENABLE_X11_TARGET)
>+    set(REQUIRED_INCLUDES_OLD ${CMAKE_REQUIRED_INCLUDES})
>+    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR})
>+    # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
>+    check_include_files("GL/glx.h" GLX_FOUND)
>+    set(CMAKE_REQUIRED_INCLUDES ${REQUIRED_INCLUDES_OLD})
>+
>+    if (GLX_FOUND)
>+        set(WTF_USE_GLX 1)
>+        add_definitions(-DWTF_USE_GLX=1)
>+    endif ()
>+endif ()
> 
> find_package(EGL)
> if (EGL_FOUND)
>     set(WTF_USE_EGL 1)
>+    add_definitions(-DWTF_USE_EGL=1)
> endif ()
> 
> if (ENABLE_SPELLCHECK)
>@@ -231,14 +256,6 @@ if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND))
>     add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
>     add_definitions(-DWTF_USE_TEXTURE_MAPPER_GL=1)
>     add_definitions(-DENABLE_3D_RENDERING=1)
>-
>-    if (EGL_FOUND)
>-        add_definitions(-DWTF_USE_EGL=1)
>-    endif ()
>-
>-    if (GLX_FOUND)
>-        add_definitions(-DWTF_USE_GLX=1)
>-    endif ()
> endif ()
> 
> if (ENABLE_INDEXED_DATABASE)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 34c31eca23c6678c23e179619653dca5e6709368..e02ec1bf00619cce4b13a17e12ee140293f02928 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2014-06-23  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        [CMake] Add necessary support for building for the Wayland target
>+        https://bugs.webkit.org/show_bug.cgi?id=134160
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt: Only build the TestNetscapePlugIn target in case
>+        the X11 windowing target is enabled.
>+
> 2014-06-21  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
> 
>         Disable gamepad feature on EFL and GTK ports by default
>diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt
>index b12480483ea91d997992141c382a63f6e5d100a4..73fb096111062172537ecdc248f4f7b30063495d 100644
>--- a/Tools/CMakeLists.txt
>+++ b/Tools/CMakeLists.txt
>@@ -13,7 +13,9 @@ elseif ("${PORT}" STREQUAL "GTK")
>         add_subdirectory(MiniBrowser/gtk)
>         add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk)
>     endif ()
>-    add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
>+    if (ENABLE_X11_TARGET)
>+        add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
>+    endif ()
> elseif ("${PORT}" STREQUAL "WinCE")
>     add_subdirectory(WinCELauncher)
> endif ()
>diff --git a/ChangeLog b/ChangeLog
>index 80cf3f041d450236a564375e5018f729fc770d8b..3253b695a3254c7b4141addc1ddfe170734aab3d 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,24 @@
>+2014-06-23  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        [CMake] Add necessary support for building for the Wayland target
>+        https://bugs.webkit.org/show_bug.cgi?id=134160
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/FindGTK3.cmake: Check for the gtk+-x11-3.0 package if the X11 target
>+        is enabled, and that its version matches the version of the generic package. Same
>+        for the gtk+-wayland-3.0 package and the Wayland target.
>+        * Source/cmake/OptionsCommon.cmake: Don't add the -DXP_UNIX definition here.
>+        * Source/cmake/OptionsEfl.cmake: Add -DXP_UNIX here for the EFL port, under the same
>+        condition as in OptionsCommon.cmake. ENABLE_X11_TARGET is enabled by default for EFL
>+        so they keep building the TestNetscapePlugin target.
>+        * Source/cmake/OptionsGTK.cmake: Enable the X11 target and disable the Wayland target
>+        by default. Group all the X11-specific macro definitions (WTF_PLATFORM_X11, MOZ_X11,
>+        XP_UNIX) and only add them if the X11 target is enabled. Similar goes for the Wayland
>+        target and WTF_PLATFORM_WAYLAND. The Wayland target requires GTK+ 3.12.0, so that's
>+        the minimum required version as soon as that target is enabled. Only search for GLX
>+        if the X11 target is enabled.
>+
> 2014-06-23  Krzysztof Czech  <k.czech@samsung.com>
> 
>         [EFL] Platform support for WebSpeech feature.

Flags:

darin: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 134160: 233540 | 233624