Attachment 179996 Details for Bug 104760 – Patch

[patch] Patch

104760.patch (text/plain), 3.02 KB, created by Yael on 2012-12-18 12:08:59 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Yael

Created: 2012-12-18 12:08:59 PST

Size: 3.02 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>--- ChangeLog	(revision 138046)
>+++ ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2012-12-18  Yael Aharon  <yael.aharon@intel.com>
>+
>+        [EFL] Allow the build system to find OpenGL ES
>+        https://bugs.webkit.org/show_bug.cgi?id=104760
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add a way to find if GLESv2 is supported by the build system.
>+        Support for GLESv2 will be added separately.
>+        FindGLES.cmake is loosely based on the example from
>+        https://bitbucket.org/sinbad/ogre/src/3cbd67467fab3fef44d1b32bc42ccf4fb1ccfdd0/CMake/Packages/FindOpenGLES2.cmake?at=default.
>+
>+        * Source/cmake/FindGLES.cmake: Added.
>+
> 2012-12-18  Kondapally Kalyan  <kalyan.kondapally@intel.com>
> 
>         [EFL] Allow the build system to detect EGL support.
>Index: Source/cmake/FindGLES.cmake
>===================================================================
>--- Source/cmake/FindGLES.cmake	(revision 0)
>+++ Source/cmake/FindGLES.cmake	(revision 0)
>@@ -0,0 +1,40 @@
>+# - 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_gl_LIBRARY NAMES GLESv2)
>+
>+IF(OPENGLES2_gl_LIBRARY)
>+    SET( OPENGLES2_LIBRARIES ${OPENGLES2_gl_LIBRARY} ${OPENGLES2_LIBRARIES})
>+    SET( OPENGLES2_FOUND "YES" )
>+ENDIF(OPENGLES2_gl_LIBRARY AND EGL_egl_LIBRARY)
>+
>+MARK_AS_ADVANCED(OPENGLES2_INCLUDE_DIR OPENGLES2_gl_LIBRARY)

Actions: View | Formatted Diff | Diff

Attachments on bug 104760: 179996 | 180005 | 180168 | 180191