From patchwork Wed Jul 12 23:55:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 787454 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x7G7G1Qskz9s03 for ; Thu, 13 Jul 2017 09:56:10 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="rr69yzaH"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1341788047; Wed, 12 Jul 2017 23:56:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g2g9XxHv3YZW; Wed, 12 Jul 2017 23:56:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B0F8188052; Wed, 12 Jul 2017 23:56:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BA2BA1BF228 for ; Wed, 12 Jul 2017 23:55:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A151087FDA for ; Wed, 12 Jul 2017 23:55:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 80WmZGJwkukZ for ; Wed, 12 Jul 2017 23:55:51 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from fanzine.igalia.com (fanzine.igalia.com [91.117.99.155]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9E1C987E61 for ; Wed, 12 Jul 2017 23:55:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=8u+tfu7o+e2L5mxBLU5gx02YBIudmiPhnvRSPyjVBO0=; b=rr69yzaHo/Ssy6b16iOzxLIX3fVCeg7fy5pJ4qZ+x9eIRzrhIJS7jGojBwgPRvS6BQshGEi5cQRFHZ2NzNXTtnk8C77lvxBRIZiCH8bujV4pcpR5zJ9T6pPseNKv52ryC2ZohFxK8GRSMmf3Yn2x17YdLFhwDZLhqyukRuu1SRtCFKOTzF1dP0/c4vGWqSXwWSgnO/Hk5u0H71XoZGU793jJEq5NfeIRgj7VTmBOABBahwh1Zt/uMWfp2Yh5hYUzxKokPDYsqZ1/w5Fh79jyEK/7hF975tFDVGosYGIWnHqxyEGy5bzStDCv6upMRAn1WLIGWnn0/2IiX5jWBvDJjw==; Received: from 82-181-162-35.bb.dnainternet.fi ([82.181.162.35] helo=momiji) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1dVRTv-0000mt-QV; Thu, 13 Jul 2017 01:55:48 +0200 Received: from localhost (momiji [local]) by momiji (OpenSMTPD) with ESMTPA id dc52e1d4; Wed, 12 Jul 2017 23:55:31 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 13 Jul 2017 02:55:30 +0300 Message-Id: <20170712235531.20444-4-aperez@igalia.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170712235531.20444-1-aperez@igalia.com> References: <20170712235531.20444-1-aperez@igalia.com> Cc: Adrian Perez de Castro Subject: [Buildroot] [PATCH 3/4] webkitgtk: Add patch to allow Wayland-only builds X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The added patch allows building WebKitGTK+ with Wayland support enabled, and with X11/X.org support disabled. Without this the code includes the X11 headers, which are not available in this case. The patch has to be adapted from the one attached in the corresponding upstream bug report, as it would not apply on top of the 2.16.5 sources. Signed-off-by: Adrian Perez de Castro --- .../webkitgtk/0003-angle-egl-wayland-support.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/webkitgtk/0003-angle-egl-wayland-support.patch diff --git a/package/webkitgtk/0003-angle-egl-wayland-support.patch b/package/webkitgtk/0003-angle-egl-wayland-support.patch new file mode 100644 index 0000000000..4461e4390a --- /dev/null +++ b/package/webkitgtk/0003-angle-egl-wayland-support.patch @@ -0,0 +1,45 @@ +eglplatform.h does not support Wayland + +Upstream, adapted from https://bugs.webkit.org/show_bug.cgi?id=163482 + +Signed-off-by: Adrian Perez de Castro + +--- a/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2017-07-12 13:26:36.222193809 +0300 ++++ b/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2017-07-12 13:30:04.071741009 +0300 +@@ -89,6 +89,12 @@ typedef int EGLNativeDisplayType; + typedef void *EGLNativeWindowType; + typedef void *EGLNativePixmapType; + ++#elif defined(WL_EGL_PLATFORM) ++ ++typedef struct wl_display *EGLNativeDisplayType; ++typedef struct wl_egl_pixmap *EGLNativePixmapType; ++typedef struct wl_egl_window *EGLNativeWindowType; ++ + #elif defined(__ANDROID__) || defined(ANDROID) + + #include +@@ -107,6 +113,8 @@ typedef intptr_t EGLNativePixmapType; + + #elif defined(__unix__) + ++#if defined(ANGLE_USE_X11) ++ + /* X11 (tentative) */ + #include + #include +@@ -115,6 +123,14 @@ typedef Display *EGLNativeDisplayType; + typedef Pixmap EGLNativePixmapType; + typedef Window EGLNativeWindowType; + ++#else ++ ++typedef void *EGLNativeDisplayType; ++typedef khronos_uintptr_t EGLNativePixmapType; ++typedef khronos_uintptr_t EGLNativeWindowType; ++ ++#endif /* ANGLE_USE_X11 */ ++ + #elif defined(__GNUC__) && ( defined(__APPLE_CPP__) || defined(__APPLE_CC__) || defined(__MACOS_CLASSIC__) ) + + #if defined(__OBJC__)