Title: [217673] trunk/Tools
- Revision
- 217673
- Author
- commit-qu...@webkit.org
- Date
- 2017-06-01 12:34:52 -0700 (Thu, 01 Jun 2017)
Log Message
[GTK] Bump wayland and weston in jhbuild
https://bugs.webkit.org/show_bug.cgi?id=171921
Patch by Carlos Garcia Campos <cgar...@igalia.com> on 2017-06-01
Reviewed by Carlos Alberto Lopez Perez.
* gtk/jhbuild.modules:
* gtk/patches/weston-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (217672 => 217673)
--- trunk/Tools/ChangeLog 2017-06-01 19:14:28 UTC (rev 217672)
+++ trunk/Tools/ChangeLog 2017-06-01 19:34:52 UTC (rev 217673)
@@ -1,3 +1,13 @@
+2017-06-01 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Bump wayland and weston in jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=171921
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * gtk/jhbuild.modules:
+ * gtk/patches/weston-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch: Added.
+
2017-06-01 Andy Estes <aes...@apple.com>
REGRESSION (r217626): ENABLE_APPLE_PAY_SESSION_V3 was disabled by mistake
Modified: trunk/Tools/gtk/jhbuild.modules (217672 => 217673)
--- trunk/Tools/gtk/jhbuild.modules 2017-06-01 19:14:28 UTC (rev 217672)
+++ trunk/Tools/gtk/jhbuild.modules 2017-06-01 19:34:52 UTC (rev 217673)
@@ -448,14 +448,19 @@
<dependencies>
<dep package="libffi"/>
</dependencies>
- <branch module="releases/wayland-1.8.1.tar.xz"
- version="1.8.1"
+ <branch module="releases/wayland-1.12.0.tar.xz"
+ version="1.12.0"
repo="wayland.freedesktop.org"
- hash="sha256:f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8"
- md5sum="6e877877c3e04cfb865cfcd0733c9ab1">
- </branch>
+ hash="sha256:d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1"/>
</autotools>
+ <autotools id="wayland-protocols">
+ <branch module="releases/wayland-protocols-1.7.tar.xz"
+ version="1.7"
+ repo="wayland.freedesktop.org"
+ hash="sha256:635f2a937d318f1fecb97b54074ca211486e38af943868dd0fa82ea38d091c1f"/>
+ </autotools>
+
<autotools id="weston" autogenargs="--enable-x11-compositor --disable-rpi-compositor --disable-fbdev-compositor --disable-setuid-install --disable-ivi-shell --disable-weston-launch --with-cairo=gl">
<pkg-config>weston.pc</pkg-config>
<dependencies>
@@ -464,12 +469,13 @@
<dep package="xserver"/>
<dep package="cairo"/>
<dep package="libinput"/>
+ <dep package="wayland-protocols"/>
</dependencies>
- <branch module="releases/weston-1.8.0.tar.xz"
- version="1.8.0"
+ <branch module="releases/weston-1.12.0.tar.xz"
+ version="1.12.0"
repo="wayland.freedesktop.org"
- hash="sha256:8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312"
- md5sum="24cb8a7ed0535b4fc3642643988dab36">
+ hash="sha256:ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033">
+ <patch file="weston-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch" strip="1"/>
</branch>
</autotools>
@@ -634,15 +640,13 @@
</autotools>
<!-- libinput is only included because the version of libinput shipped with Debian Jessie
- os too old for building Weston 1.8. This may be removed after Debian Strech is released -->
+ os too old for building Weston. This may be removed after Debian Strech is released -->
<autotools id="libinput" autogen-sh="configure" autogenargs="--disable-libwacom --disable-tests --disable-documentation">
<pkg-config>libinput.pc</pkg-config>
- <branch module="software/libinput/libinput-1.2.4.tar.xz"
- version="1.2.4"
+ <branch module="software/libinput/libinput-1.6.3.tar.xz"
+ version="1.6.3"
repo="freedesktop.org"
- hash="sha256:aee3650ad2a864ab9a10e7e63df543cc2b475f6bf3974751037a2df325dabbb1"
- md5sum="1cbaa34f04a336f2703906d564e0a37a">
- </branch>
+ hash="sha256:74da2798728e79c3aedfffa268d8fe811c3766ca3708309c0dc45502be137da1"/>
</autotools>
</moduleset>
Added: trunk/Tools/gtk/patches/weston-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch (0 => 217673)
--- trunk/Tools/gtk/patches/weston-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch (rev 0)
+++ trunk/Tools/gtk/patches/weston-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch 2017-06-01 19:34:52 UTC (rev 217673)
@@ -0,0 +1,58 @@
+From c950667e87dc175bd2741a51460ebd3e29a57c92 Mon Sep 17 00:00:00 2001
+From: Vincent Abriou <vincent.abr...@st.com>
+Date: Wed, 5 Oct 2016 16:14:07 +0200
+Subject: [PATCH] libweston: include weston-egl-ext.h in drm, x11 and wayland
+ compositor
+
+As to what is done for gl-renderer.c, weston-egl-ext.h should be
+include in compositor-drm.c, compositor-x11.c and compositor-wayland.c.
+This fix building issue with GPU that does not have EGL_PLATFORM_xxx_KHR
+in their extension header file eglext.h.
+
+Signed-off-by: Vincent Abriou <vincent.abr...@st.com>
+Reviewed-by: Daniel Stone <dani...@collabora.com>
+---
+ libweston/compositor-drm.c | 1 +
+ libweston/compositor-wayland.c | 1 +
+ libweston/compositor-x11.c | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
+index 567240f9..f61e3d9c 100644
+--- a/libweston/compositor-drm.c
++++ b/libweston/compositor-drm.c
+@@ -52,6 +52,7 @@
+ #include "shared/helpers.h"
+ #include "shared/timespec-util.h"
+ #include "gl-renderer.h"
++#include "weston-egl-ext.h"
+ #include "pixman-renderer.h"
+ #include "libbacklight.h"
+ #include "libinput-seat.h"
+diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
+index 580c7b5a..46fdde15 100644
+--- a/libweston/compositor-wayland.c
++++ b/libweston/compositor-wayland.c
+@@ -44,6 +44,7 @@
+ #include "compositor.h"
+ #include "compositor-wayland.h"
+ #include "gl-renderer.h"
++#include "weston-egl-ext.h"
+ #include "pixman-renderer.h"
+ #include "shared/helpers.h"
+ #include "shared/image-loader.h"
+diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
+index dadcd10f..1c6de084 100644
+--- a/libweston/compositor-x11.c
++++ b/libweston/compositor-x11.c
+@@ -56,6 +56,7 @@
+ #include "shared/helpers.h"
+ #include "shared/image-loader.h"
+ #include "gl-renderer.h"
++#include "weston-egl-ext.h"
+ #include "pixman-renderer.h"
+ #include "presentation-time-server-protocol.h"
+ #include "linux-dmabuf.h"
+--
+2.11.0
+
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
