[arch-commits] Commit in wpebackend-fdo/trunk (PKGBUILD glvnd.diff)

[Jan Steffens]

    Date: Saturday, November 23, 2019 @ 17:38:21
  Author: heftig
Revision: 369646

1.4.0-2: fix build

Added:
  wpebackend-fdo/trunk/glvnd.diff
Modified:
  wpebackend-fdo/trunk/PKGBUILD

------------+
 PKGBUILD   |   11 ++++++++---
 glvnd.diff |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-23 17:36:31 UTC (rev 369645)
+++ PKGBUILD	2019-11-23 17:38:21 UTC (rev 369646)
@@ -2,7 +2,7 @@
 
 pkgname=wpebackend-fdo
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="freedesktop.org backend for WPE WebKit"
 url="https://wpewebkit.org/"
 arch=(x86_64)
@@ -9,13 +9,18 @@
 license=(custom)
 depends=(libwpe glib2 libegl wayland)
 makedepends=(cmake mesa)
-source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc})
+source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc}
+        glvnd.diff)
 sha256sums=('a919ca4a5bc445f9419a5b7f3781cfc98e5abcf5d7259eb1869f5ab20fd18baf'
-            'SKIP')
+            'SKIP'
+            'ac67e680efb5040d10c6f1cf475259dd3efaf5bc1f97c316930e28bab07f44ce')
 validpgpkeys=('5AA3BC334FD7E3369E7C77B291C559DBE4C9123B') # Adrián Pérez de Castro <aperez at igalia.com>
 
 prepare() {
   cd $pkgname-$pkgver
+
+  # Fix build with headers from libglvnd
+  patch -Np1 -i ../glvnd.diff
 }
 
 build() {

Added: glvnd.diff
===================================================================
--- glvnd.diff	                        (rev 0)
+++ glvnd.diff	2019-11-23 17:38:21 UTC (rev 369646)
@@ -0,0 +1,22 @@
+diff -u -r wpebackend-fdo-1.4.0/src/view-backend-exportable-fdo-egl.cpp wpebackend-fdo-1.4.0-glvnd/src/view-backend-exportable-fdo-egl.cpp
+--- wpebackend-fdo-1.4.0/src/view-backend-exportable-fdo-egl.cpp	2019-09-18 12:32:18.000000000 +0000
++++ wpebackend-fdo-1.4.0-glvnd/src/view-backend-exportable-fdo-egl.cpp	2019-11-23 17:35:13.156702854 +0000
+@@ -28,6 +28,7 @@
+ #include "ws.h"
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <cassert>
+ #include <list>
+ #include <wpe-fdo/view-backend-exportable-egl.h>
+diff -u -r wpebackend-fdo-1.4.0/src/ws.cpp wpebackend-fdo-1.4.0-glvnd/src/ws.cpp
+--- wpebackend-fdo-1.4.0/src/ws.cpp	2019-09-18 12:32:18.000000000 +0000
++++ wpebackend-fdo-1.4.0-glvnd/src/ws.cpp	2019-11-23 17:34:59.746513647 +0000
+@@ -27,6 +27,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include "linux-dmabuf/linux-dmabuf.h"
+ #include "bridge/wpe-bridge-server-protocol.h"
+ #include <cassert>