[arch-commits] Commit in wpebackend-fdo/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Saturday, November 23, 2019 @ 17:39:32
  Author: heftig
Revision: 369649

archrelease: copy trunk to extra-x86_64

Added:
  wpebackend-fdo/repos/extra-x86_64/PKGBUILD
    (from rev 369648, wpebackend-fdo/trunk/PKGBUILD)
  wpebackend-fdo/repos/extra-x86_64/glvnd.diff
    (from rev 369648, wpebackend-fdo/trunk/glvnd.diff)
Deleted:
  wpebackend-fdo/repos/extra-x86_64/PKGBUILD

------------+
 PKGBUILD   |   73 +++++++++++++++++++++++++++++++----------------------------
 glvnd.diff |   22 +++++++++++++++++
 2 files changed, 61 insertions(+), 34 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-23 17:38:48 UTC (rev 369648)
+++ PKGBUILD	2019-11-23 17:39:32 UTC (rev 369649)
@@ -1,34 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=wpebackend-fdo
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="freedesktop.org backend for WPE WebKit"
-url="https://wpewebkit.org/"
-arch=(x86_64)
-license=(custom)
-depends=(libwpe glib2 libegl wayland)
-makedepends=(cmake mesa)
-source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc})
-sha256sums=('a919ca4a5bc445f9419a5b7f3781cfc98e5abcf5d7259eb1869f5ab20fd18baf'
-            'SKIP')
-validpgpkeys=('5AA3BC334FD7E3369E7C77B291C559DBE4C9123B') # Adrián Pérez de Castro <aperez at igalia.com>
-
-prepare() {
-  cd $pkgname-$pkgver
-}
-
-build() {
-  cmake -H$pkgname-$pkgver -Bbuild \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --build build --target install
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" $pkgname-$pkgver/COPYING
-}
-
-# vim:set sw=2 et:

Copied: wpebackend-fdo/repos/extra-x86_64/PKGBUILD (from rev 369648, wpebackend-fdo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-11-23 17:39:32 UTC (rev 369649)
@@ -0,0 +1,39 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=wpebackend-fdo
+pkgver=1.4.0
+pkgrel=2
+pkgdesc="freedesktop.org backend for WPE WebKit"
+url="https://wpewebkit.org/"
+arch=(x86_64)
+license=(custom)
+depends=(libwpe glib2 libegl wayland)
+makedepends=(cmake mesa)
+source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc}
+        glvnd.diff)
+sha256sums=('a919ca4a5bc445f9419a5b7f3781cfc98e5abcf5d7259eb1869f5ab20fd18baf'
+            '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() {
+  cmake -H$pkgname-$pkgver -Bbuild \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --build build --target install
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" $pkgname-$pkgver/COPYING
+}
+
+# vim:set sw=2 et:

Copied: wpebackend-fdo/repos/extra-x86_64/glvnd.diff (from rev 369648, wpebackend-fdo/trunk/glvnd.diff)
===================================================================
--- glvnd.diff	                        (rev 0)
+++ glvnd.diff	2019-11-23 17:39:32 UTC (rev 369649)
@@ -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>