<!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>[184505] releases/WebKitGTK/webkit-2.4</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/184505">184505</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-18 11:44:16 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[W32] Wrong configure tests for OpenGL on Windows, wrong ifdefs
https://bugs.webkit.org/show_bug.cgi?id=143763
Patch by Руслан Ижбулатов <lrn1986@gmail.com> on 2015-04-15
Reviewed by Carlos Garcia Campos.
Change OpenGL checks to work on W32, add libopengl32
AGain, use OS(WINDOWS) for things that are W32 but not necessarily MSVC.
Don't try to check for dlopen() on W32 (it might be available, but
native code is already here, so use it).
Correctly cast the result of GetProcAddress(), because C++.
Link W32 version to -lOpenGL32 instead of -lGL, otherwise libtool complains:
*** Warning: linker path does not have real file for library -lGL.
.:
* Source/autotools/FindDependencies.m4:
Source/WebCore:
* platform/graphics/OpenGLShims.cpp:
(WebCore::getProcAddress):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24ChangeLog">releases/WebKitGTK/webkit-2.4/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsOpenGLShimscpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/OpenGLShims.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceautotoolsFindDependenciesm4">releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/ChangeLog (184504 => 184505)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/ChangeLog 2015-05-18 18:24:28 UTC (rev 184504)
+++ releases/WebKitGTK/webkit-2.4/ChangeLog 2015-05-18 18:44:16 UTC (rev 184505)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>
</span><span class="cx">
</span><ins>+ [W32] Wrong configure tests for OpenGL on Windows, wrong ifdefs
+ https://bugs.webkit.org/show_bug.cgi?id=143763
+
+ Reviewed by Carlos Garcia Campos.
+
+ Change OpenGL checks to work on W32, add libopengl32
+
+ AGain, use OS(WINDOWS) for things that are W32 but not necessarily MSVC.
+ Don't try to check for dlopen() on W32 (it might be available, but
+ native code is already here, so use it).
+
+ Correctly cast the result of GetProcAddress(), because C++.
+
+ Link W32 version to -lOpenGL32 instead of -lGL, otherwise libtool complains:
+ *** Warning: linker path does not have real file for library -lGL.
+
+ * Source/autotools/FindDependencies.m4:
+
+2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>
+
</ins><span class="cx"> [W32] Configure may misdetect ICU libraries
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143767
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (184504 => 184505)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 18:24:28 UTC (rev 184504)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 18:44:16 UTC (rev 184505)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>
</span><span class="cx">
</span><ins>+ [W32] Wrong configure tests for OpenGL on Windows, wrong ifdefs
+ https://bugs.webkit.org/show_bug.cgi?id=143763
+
+ Reviewed by Carlos Garcia Campos.
+
+ Change OpenGL checks to work on W32, add libopengl32
+
+ AGain, use OS(WINDOWS) for things that are W32 but not necessarily MSVC.
+ Don't try to check for dlopen() on W32 (it might be available, but
+ native code is already here, so use it).
+
+ Correctly cast the result of GetProcAddress(), because C++.
+
+ Link W32 version to -lOpenGL32 instead of -lGL, otherwise libtool complains:
+ *** Warning: linker path does not have real file for library -lGL.
+
+ * platform/graphics/OpenGLShims.cpp:
+ (WebCore::getProcAddress):
+
+2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>
+
</ins><span class="cx"> [W32] windowsVersion() and osVersionForUAString() are outdated
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143771
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsOpenGLShimscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/OpenGLShims.cpp (184504 => 184505)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/OpenGLShims.cpp 2015-05-18 18:24:28 UTC (rev 184504)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/OpenGLShims.cpp 2015-05-18 18:44:16 UTC (rev 184505)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #define DISABLE_SHIMS
</span><span class="cx"> #include "OpenGLShims.h"
</span><span class="cx">
</span><del>-#if !PLATFORM(WIN)
</del><ins>+#if !OS(WINDOWS)
</ins><span class="cx"> #include <dlfcn.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx"> return &table;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
</del><ins>+#if OS(WINDOWS)
</ins><span class="cx"> static void* getProcAddress(const char* procName)
</span><span class="cx"> {
</span><del>- return GetProcAddress(GetModuleHandleA("libGLESv2"), procName);
</del><ins>+ return reinterpret_cast<void*>(GetProcAddress(GetModuleHandleA("libGLESv2"), procName));
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> typedef void* (*glGetProcAddressType) (const char* procName);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceautotoolsFindDependenciesm4"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 (184504 => 184505)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 2015-05-18 18:24:28 UTC (rev 184504)
+++ releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 2015-05-18 18:44:16 UTC (rev 184505)
</span><span class="lines">@@ -459,6 +459,9 @@
</span><span class="cx"> if test "$enable_gles2" = "yes"; then
</span><span class="cx"> acceleration_description="$acceleration_description (gles2"
</span><span class="cx"> OPENGL_LIBS="-lGLESv2"
</span><ins>+ elif test "$os_win32" = "yes"; then
+ acceleration_description="$acceleration_description (gl"
+ OPENGL_LIBS="-lopengl32"
</ins><span class="cx"> else
</span><span class="cx"> acceleration_description="$acceleration_description (gl"
</span><span class="cx"> OPENGL_LIBS="-lGL"
</span><span class="lines">@@ -473,7 +476,9 @@
</span><span class="cx">
</span><span class="cx"> # Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
</span><span class="cx"> # libdl like on GNU/Linux (in which case we want to link to libdl).
</span><del>- AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [OPENGL_LIBS="$OPENGL_LIBS -ldl"])])
</del><ins>+ if test "$os_win32" = "no"; then
+ AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [OPENGL_LIBS="$OPENGL_LIBS -ldl"])])
+ fi
</ins><span class="cx">
</span><span class="cx"> acceleration_description="$acceleration_description)"
</span><span class="cx"> fi
</span></span></pre>
</div>
</div>
</body>
</html>