From 95727a39a54f888718fccfca2a901e6b7a9b78f2 Mon Sep 17 00:00:00 2001 From: Kondapally Kalyan Date: Wed, 3 Jul 2013 06:01:29 +0300 Subject: [PATCH] Add Mesa checks. With Wayland on Mesa, we include MesaExtensions header. This header might not be present on platforms not using mesa. This patch adds checks to include mesa specific headers only when available. Change-Id: I49a542d5e36e4b4ca1b2f178f85f18c7ba98690c --- Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h | 2 +- Source/cmake/OptionsTizen.cmake | 4 ++++ packaging/webkit2-efl.spec | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h b/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h index c5f921b..36d5dd43 100644 --- a/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h +++ b/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h @@ -41,7 +41,7 @@ #include #include -#if PLATFORM(WAYLAND) +#if PLATFORM(WAYLAND) && USE(MESA) #include #endif diff --git a/Source/cmake/OptionsTizen.cmake b/Source/cmake/OptionsTizen.cmake index af25d19..71805bc 100644 --- a/Source/cmake/OptionsTizen.cmake +++ b/Source/cmake/OptionsTizen.cmake @@ -391,6 +391,10 @@ ELSE () SET(WTF_PLATFORM_WAYLAND 1) ENDIF () +IF (USE_MESA) + ADD_DEFINITIONS(-DWTF_USE_MESA=1) +ENDIF () + FIND_PACKAGE(Eina 1.2 REQUIRED) FIND_PACKAGE(Evas 1.0 REQUIRED) FIND_PACKAGE(Ecore 1.2 COMPONENTS Evas File Input ${ECORE_ADDITIONAL_COMPONENTS}) diff --git a/packaging/webkit2-efl.spec b/packaging/webkit2-efl.spec index bb8055f..0bf3bef 100644 --- a/packaging/webkit2-efl.spec +++ b/packaging/webkit2-efl.spec @@ -171,6 +171,9 @@ then $TIZEN_WEBKIT_EXTRA_OPTIONS \ $GSTREAMER_API \ $ECORE_X \ +%if %{with mesa} + -DUSE_MESA=On \ +%endif -DCMAKE_CXX_ARCHIVE_APPEND=" ruT " \ -DCMAKE_CXX_ARCHIVE_CREATE=" cruT " make %{?_smp_mflags} -- 2.7.4