Changeset 245450 in webkit

Timestamp:

May 17, 2019, 4:25:03 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r245182 - [WPE] Forward libepoxy cflags
​https://bugs.webkit.org/show_bug.cgi?id=197784

Reviewed by Žan Doberšek.

• wpe/backends/CMakeLists.txt: This is required to keep

-DMESA_EGL_NO_X11_HEADERS in the build, if we don't do this, EGL ends
up trying to include X11 headers even when they're not present in the
environment.

Location:

releases/WebKitGTK/webkit-2.24/Tools

Files:

• ChangeLog (modified) (1 diff)
• wpe/backends/CMakeLists.txt (modified) (1 diff)

releases/WebKitGTK/webkit-2.24/Tools/ChangeLog

@@ +1 @@
+2019-05-10  Charlie Turner  <cturner@igalia.com>
+
+        [WPE] Forward libepoxy cflags
+        https://bugs.webkit.org/show_bug.cgi?id=197784
+
+        Reviewed by Žan Doberšek.
+
+        Patch by Zan Dobersek.
+
+        * wpe/backends/CMakeLists.txt: This is required to keep
+        -DMESA_EGL_NO_X11_HEADERS in the build, if we don't do this, EGL ends
+        up trying to include X11 headers even when they're not present in the
+        environment.
+
 2019-04-03  Myles C. Maxfield  <mmaxfield@apple.com>
 

releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/CMakeLists.txt

@@ -37 +37 @@
 )
 
+add_definitions(${LIBEPOXY_DEFINITIONS})
+
 add_custom_command(
     OUTPUT ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR}/xdg-shell-unstable-v6-protocol.c