<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184954] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184954">184954</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2015-05-28 04:30:52 -0700 (Thu, 28 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] Improve detection and usage of GL/GLES/EGL libraries.
https://bugs.webkit.org/show_bug.cgi?id=145408
Reviewed by Carlos Garcia Campos.
.:
* Source/cmake/FindEGL.cmake: Improve detection of EGL libraries.
* Source/cmake/FindGLES.cmake: Removed. It was used by the EGL port.
Remove it and make the EGL port use the improved FindOpenGLES2.cmake
instead.
* Source/cmake/FindOpenGL.cmake: Added. Add module to detect OpenGL
libraries. Detect also GLX libraries.
* Source/cmake/FindOpenGLES2.cmake: Improve detection of OpenGLES-v2
libraries. Use find_path() to get the include path.
* Source/cmake/OptionsEfl.cmake: Use now the improved FindOpenGLES2
module.
* Source/cmake/OptionsGTK.cmake: Set default value for ENABLE_GLES2
depending on the libraries found on the system.
Move the detection of GLX (and the include of CMakePushCheckState)
to FindOpenGL.cmake.
Ensure that we only define USE_GLX when we build with OpenGL
(but not with GLESv2).
Source/WebCore:
No new tests, no behavior changes.
* CMakeLists.txt: Ensure that we include the libraries and includes
for the GL/GLESv2/EGL libraries before including the ANGLE directories.
Define also any CFLAG that the system GL/GLESv2/EGL libraries may need.
* PlatformEfl.cmake: Remove some includes that are now unneeded,
because we are including now the EGL libraries on CMakeLists.txt
* PlatformGTK.cmake: Remove unneeded include (We are including the EGL
libraries now on CMakeLists.txt)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeFindEGLcmake">trunk/Source/cmake/FindEGL.cmake</a></li>
<li><a href="#trunkSourcecmakeFindOpenGLES2cmake">trunk/Source/cmake/FindOpenGLES2.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeFindOpenGLcmake">trunk/Source/cmake/FindOpenGL.cmake</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeFindGLEScmake">trunk/Source/cmake/FindGLES.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (184953 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-05-28 10:12:46 UTC (rev 184953)
+++ trunk/ChangeLog 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-05-28 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [CMake] Improve detection and usage of GL/GLES/EGL libraries.
+ https://bugs.webkit.org/show_bug.cgi?id=145408
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/FindEGL.cmake: Improve detection of EGL libraries.
+ * Source/cmake/FindGLES.cmake: Removed. It was used by the EGL port.
+ Remove it and make the EGL port use the improved FindOpenGLES2.cmake
+ instead.
+ * Source/cmake/FindOpenGL.cmake: Added. Add module to detect OpenGL
+ libraries. Detect also GLX libraries.
+ * Source/cmake/FindOpenGLES2.cmake: Improve detection of OpenGLES-v2
+ libraries. Use find_path() to get the include path.
+ * Source/cmake/OptionsEfl.cmake: Use now the improved FindOpenGLES2
+ module.
+ * Source/cmake/OptionsGTK.cmake: Set default value for ENABLE_GLES2
+ depending on the libraries found on the system.
+ Move the detection of GLX (and the include of CMakePushCheckState)
+ to FindOpenGL.cmake.
+ Ensure that we only define USE_GLX when we build with OpenGL
+ (but not with GLESv2).
+
</ins><span class="cx"> 2015-05-27 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> img.currentSrc problem in strict mode with old picturefill
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (184953 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-05-28 10:12:46 UTC (rev 184953)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -3000,24 +3000,37 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_GRAPHICS_CONTEXT_3D)
</span><del>- # For platforms that want to use system-provided OpenGL (ES) headers,
- # these include directories need to be added before the ANGLE directories.
- if (OPENGL_FOUND)
</del><ins>+ # For platforms that want to use system-provided OpenGL (ES) / EGL headers,
+ # these include directories, libraries or definitions need to be
+ # added before the ANGLE directories.
+ if (USE_OPENGL)
</ins><span class="cx"> list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><del>- ${OPENGL_INCLUDE_DIR}
</del><ins>+ ${OPENGL_INCLUDE_DIRS}
</ins><span class="cx"> )
</span><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><del>- ${OPENGL_gl_LIBRARY}
</del><ins>+ ${OPENGL_LIBRARIES}
</ins><span class="cx"> )
</span><del>- elseif (OPENGLES2_FOUND)
</del><ins>+ add_definitions(${OPENGL_DEFINITIONS})
+ elseif (USE_OPENGL_ES_2)
</ins><span class="cx"> list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><del>- ${OPENGLES2_INCLUDE_DIR}
</del><ins>+ ${OPENGLES2_INCLUDE_DIRS}
</ins><span class="cx"> )
</span><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><span class="cx"> ${OPENGLES2_LIBRARIES}
</span><span class="cx"> )
</span><ins>+ add_definitions(${OPENGLES2_DEFINITIONS})
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+ if (USE_EGL)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${EGL_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${EGL_LIBRARIES}
+ )
+ add_definitions(${EGL_DEFINITIONS})
+ endif ()
+
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/"
</span><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/include/KHR"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184953 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-28 10:12:46 UTC (rev 184953)
+++ trunk/Source/WebCore/ChangeLog 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-05-28 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [CMake] Improve detection and usage of GL/GLES/EGL libraries.
+ https://bugs.webkit.org/show_bug.cgi?id=145408
+
+ Reviewed by Carlos Garcia Campos.
+
+ No new tests, no behavior changes.
+
+ * CMakeLists.txt: Ensure that we include the libraries and includes
+ for the GL/GLESv2/EGL libraries before including the ANGLE directories.
+ Define also any CFLAG that the system GL/GLESv2/EGL libraries may need.
+ * PlatformEfl.cmake: Remove some includes that are now unneeded,
+ because we are including now the EGL libraries on CMakeLists.txt
+ * PlatformGTK.cmake: Remove unneeded include (We are including the EGL
+ libraries now on CMakeLists.txt)
+
</ins><span class="cx"> 2015-05-28 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Binding generator should support interfaces with CustomConstructor and NoInterfaceObject
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (184953 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-05-28 10:12:46 UTC (rev 184953)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -393,7 +393,6 @@
</span><span class="cx">
</span><span class="cx"> if (USE_EGL)
</span><span class="cx"> list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><del>- ${EGL_INCLUDE_DIR}
</del><span class="cx"> "${WEBCORE_DIR}/platform/graphics/surfaces/egl"
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="lines">@@ -427,12 +426,8 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (USE_EGL)
</del><ins>+if (NOT USE_EGL AND X11_Xcomposite_FOUND AND X11_Xrender_FOUND)
</ins><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><del>- ${EGL_LIBRARY}
- )
-elseif (X11_Xcomposite_FOUND AND X11_Xrender_FOUND)
- list(APPEND WebCore_LIBRARIES
</del><span class="cx"> ${X11_Xcomposite_LIB}
</span><span class="cx"> ${X11_Xrender_LIB}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (184953 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-05-28 10:12:46 UTC (rev 184953)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -419,11 +419,6 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (USE_EGL)
- list(APPEND WebCore_LIBRARIES
- ${EGL_LIBRARY}
- )
-endif ()
</del><span class="cx">
</span><span class="cx"> if (USE_OPENGL_ES_2)
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span></span></pre></div>
<a id="trunkSourcecmakeFindEGLcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindEGL.cmake (184953 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindEGL.cmake 2015-05-28 10:12:46 UTC (rev 184953)
+++ trunk/Source/cmake/FindEGL.cmake 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -2,8 +2,9 @@
</span><span class="cx"> # Once done, this will define
</span><span class="cx"> #
</span><span class="cx"> # EGL_FOUND - system has EGL installed.
</span><del>-# EGL_INCLUDE_DIR - directories which contain the EGL headers.
-# EGL_LIBRARY - libraries required to link against EGL.
</del><ins>+# EGL_INCLUDE_DIRS - directories which contain the EGL headers.
+# EGL_LIBRARIES - libraries required to link against EGL.
+# EGL_DEFINITIONS - Compiler switches required for using EGL.
</ins><span class="cx"> #
</span><span class="cx"> # Copyright (C) 2012 Intel Corporation. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -28,12 +29,25 @@
</span><span class="cx"> # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
</span><span class="cx"> # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-find_path(EGL_INCLUDE_DIR NAMES EGL/egl.h)
</del><span class="cx">
</span><ins>+find_package(PkgConfig)
+
+pkg_check_modules(PC_EGL egl)
+
+if (PC_EGL_FOUND)
+ set(EGL_DEFINITIONS ${PC_EGL_CFLAGS_OTHER})
+endif ()
+
+find_path(EGL_INCLUDE_DIRS NAMES EGL/egl.h
+ HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS}
+)
+
</ins><span class="cx"> set(EGL_NAMES ${EGL_NAMES} egl EGL)
</span><del>-find_library(EGL_LIBRARY NAMES ${EGL_NAMES})
</del><ins>+find_library(EGL_LIBRARIES NAMES ${EGL_NAMES}
+ HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS}
+)
</ins><span class="cx">
</span><span class="cx"> include(FindPackageHandleStandardArgs)
</span><del>-FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_INCLUDE_DIR EGL_LIBRARY)
</del><ins>+FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_INCLUDE_DIRS EGL_LIBRARIES)
</ins><span class="cx">
</span><del>-mark_as_advanced(EGL_INCLUDE_DIR EGL_LIBRARY)
</del><ins>+mark_as_advanced(EGL_INCLUDE_DIRS EGL_LIBRARIES)
</ins></span></pre></div>
<a id="trunkSourcecmakeFindGLEScmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/cmake/FindGLES.cmake (184953 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGLES.cmake 2015-05-28 10:12:46 UTC (rev 184953)
+++ trunk/Source/cmake/FindGLES.cmake 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-# - Try to find OpenGLES
-# Once done this will define
-#
-# OPENGLES2_FOUND - system has OpenGLESv2 installed.
-# OPENGLES2_INCLUDE_DIR - directories which contain the OpenGlEsv2 headers.
-# OPENGLES2_LIBRARIES - libraries required to link against OpenGLESv2
-#
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-find_path(OPENGLES2_INCLUDE_DIR NAMES GLES2/gl2.h)
-
-find_library(OPENGLES2_LIBRARY NAMES GLESv2)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENGLES2 DEFAULT_MSG OPENGLES2_INCLUDE_DIR OPENGLES2_LIBRARY)
-
-mark_as_advanced(OPENGLES2_INCLUDE_DIR OPENGLES2_LIBRARY)
</del></span></pre></div>
<a id="trunkSourcecmakeFindOpenGLcmakefromrev184953trunkSourcecmakeFindEGLcmake"></a>
<div class="copfile"><h4>Copied: trunk/Source/cmake/FindOpenGL.cmake (from rev 184953, trunk/Source/cmake/FindEGL.cmake) (0 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindOpenGL.cmake (rev 0)
+++ trunk/Source/cmake/FindOpenGL.cmake 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+# - Try to Find OpenGL
+# Once done, this will define
+#
+# OPENGL_FOUND - system has OpenGL installed.
+# OPENGL_INCLUDE_DIRS - directories which contain the OpenGL headers.
+# OPENGL_LIBRARIES - libraries required to link against OpenGL.
+# OPENGL_DEFINITIONS - Compiler switches required for using OpenGL.
+#
+# Copyright (C) 2015 Igalia S.L.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+find_package(PkgConfig)
+
+pkg_check_modules(PC_OPENGL gl)
+
+if (PC_OPENGL_FOUND)
+ set(OPENGL_DEFINITIONS ${PC_OPENGL_CFLAGS_OTHER})
+endif ()
+
+find_path(OPENGL_INCLUDE_DIRS NAMES GL/gl.h
+ HINTS ${PC_OPENGL_INCLUDEDIR} ${PC_OPENGL_INCLUDE_DIRS}
+)
+
+set(OPENGL_NAMES ${OPENGL_NAMES} gl GL)
+find_library(OPENGL_LIBRARIES NAMES ${OPENGL_NAMES}
+ HINTS ${PC_OPENGL_LIBDIR} ${PC_OPENGL_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENGL DEFAULT_MSG OPENGL_INCLUDE_DIRS OPENGL_LIBRARIES)
+
+mark_as_advanced(OPENGL_INCLUDE_DIRS OPENGL_LIBRARIES)
+
+if (OPENGL_FOUND)
+ # We don't use find_package for GLX because it is part of -lGL, unlike EGL. We need to
+ # have OPENGL_INCLUDE_DIRS as part of the directories check_include_files() looks for in
+ # case OpenGL is installed into a non-standard location.
+ include(CMakePushCheckState)
+ CMAKE_PUSH_CHECK_STATE()
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIRS})
+ check_include_files("GL/glx.h" GLX_FOUND)
+ CMAKE_POP_CHECK_STATE()
+endif ()
</ins></span></pre></div>
<a id="trunkSourcecmakeFindOpenGLES2cmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindOpenGLES2.cmake (184953 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindOpenGLES2.cmake 2015-05-28 10:12:46 UTC (rev 184953)
+++ trunk/Source/cmake/FindOpenGLES2.cmake 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -9,17 +9,19 @@
</span><span class="cx"> pkg_check_modules(PC_OPENGLES2 glesv2)
</span><span class="cx">
</span><span class="cx"> if (PC_OPENGLES2_FOUND)
</span><del>- set(OPENGLES2_INCLUDE_DIRS ${PC_OPENGLES2_INCLUDE_DIRS})
</del><span class="cx"> set(OPENGLES2_DEFINITIONS ${PC_OPENGLES2_CFLAGS_OTHER})
</span><del>-else ()
- find_path(OPENGLES2_INCLUDE_DIRS NAMES GLES2/gl2.h)
</del><span class="cx"> endif ()
</span><span class="cx">
</span><del>-find_library(OPENGLES2_LIBRARIES GLESv2
- HINTS ${PC_OPENGLES2_LIBRARY_DIRS} ${PC_OPENGLES2_LIBDIR}
</del><ins>+find_path(OPENGLES2_INCLUDE_DIRS NAMES GLES2/gl2.h
+ HINTS ${PC_OPENGLES2_INCLUDEDIR} ${PC_OPENGLES2_INCLUDE_DIRS}
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+set(OPENGLES2_NAMES ${OPENGLES2_NAMES} glesv2 GLESv2)
+find_library(OPENGLES2_LIBRARIES NAMES ${OPENGLES2_NAMES}
+ HINTS ${PC_OPENGLES2_LIBDIR} ${PC_OPENGLES2_LIBRARY_DIRS}
+)
+
</ins><span class="cx"> include(FindPackageHandleStandardArgs)
</span><del>-find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG OPENGLES2_LIBRARIES OPENGLES2_INCLUDE_DIRS)
</del><ins>+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENGLES2 DEFAULT_MSG OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARIES)
</ins><span class="cx">
</span><del>-mark_as_advanced(OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARY)
</del><ins>+mark_as_advanced(OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARIES)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (184953 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2015-05-28 10:12:46 UTC (rev 184953)
+++ trunk/Source/cmake/OptionsEfl.cmake 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> option(ENABLE_GLES2 "Enable GLES Support")
</span><span class="cx"> if (ENABLE_GLES2)
</span><del>- find_package(GLES REQUIRED)
</del><ins>+ find_package(OpenGLES2 REQUIRED)
</ins><span class="cx"> set(USE_OPENGL_ES_2 1)
</span><span class="cx"> add_definitions(-DUSE_OPENGL_ES_2=1)
</span><span class="cx"> else ()
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (184953 => 184954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2015-05-28 10:12:46 UTC (rev 184953)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-05-28 11:30:52 UTC (rev 184954)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><del>-include(CMakePushCheckState)
</del><span class="cx"> include(GNUInstallDirs)
</span><span class="cx">
</span><span class="cx"> set(PROJECT_VERSION_MAJOR 2)
</span><span class="lines">@@ -49,10 +48,22 @@
</span><span class="cx"> find_package(ATSPI 2.5.3)
</span><span class="cx"> find_package(EGL)
</span><span class="cx"> find_package(OpenGL)
</span><ins>+find_package(OpenGLES2)
</ins><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx">
</span><del>-WEBKIT_OPTION_DEFINE(ENABLE_GLES2 "Whether to enable OpenGL ES 2.0." PUBLIC OFF)
</del><ins>+# Set the default value for ENABLE_GLES2 automatically.
+# We are not enabling or disabling automatically a feature here, because
+# the feature is by default always on (ENABLE_OPENGL=ON).
+# What we select here automatically is if we use OPENGL (ENABLE_GLES2=OFF)
+# or OPENGLES2 (ENABLE_GLES2=ON) for building the feature.
+set(ENABLE_GLES2_DEFAULT OFF)
+
+if (NOT OPENGL_FOUND AND OPENGLES2_FOUND)
+ set(ENABLE_GLES2_DEFAULT ON)
+endif ()
+
+WEBKIT_OPTION_DEFINE(ENABLE_GLES2 "Whether to enable OpenGL ES 2.0." PUBLIC ${ENABLE_GLES2_DEFAULT})
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
</span><span class="lines">@@ -102,14 +113,6 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (OPENGL_FOUND)
</span><del>- # We don't use find_package for GLX because it is part of -lGL, unlike EGL. 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.
- CMAKE_PUSH_CHECK_STATE()
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR})
- check_include_files("GL/glx.h" GLX_FOUND)
- CMAKE_POP_CHECK_STATE()
-
</del><span class="cx"> if (GLX_FOUND)
</span><span class="cx"> list(APPEND CAIROGL_COMPONENTS cairo-glx)
</span><span class="cx"> endif ()
</span><span class="lines">@@ -323,7 +326,7 @@
</span><span class="cx">
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_EGL ${EGL_FOUND})
</span><span class="cx">
</span><del>- if (ENABLE_X11_TARGET AND GLX_FOUND)
</del><ins>+ if (ENABLE_X11_TARGET AND GLX_FOUND AND USE_OPENGL)
</ins><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_GLX TRUE)
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>