[arch-commits] Commit in egl-wayland/repos/extra-x86_64 (5 files)

Jan Steffens heftig at archlinux.org
Fri May 22 12:11:09 UTC 2020


    Date: Friday, May 22, 2020 @ 12:11:07
  Author: heftig
Revision: 387412

archrelease: copy trunk to extra-x86_64

Added:
  egl-wayland/repos/extra-x86_64/10_nvidia_wayland.json
    (from rev 387411, egl-wayland/trunk/10_nvidia_wayland.json)
  egl-wayland/repos/extra-x86_64/PKGBUILD
    (from rev 387411, egl-wayland/trunk/PKGBUILD)
Deleted:
  egl-wayland/repos/extra-x86_64/10_nvidia_wayland.json
  egl-wayland/repos/extra-x86_64/PKGBUILD
  egl-wayland/repos/extra-x86_64/glvnd.diff

------------------------+
 10_nvidia_wayland.json |   12 ++---
 PKGBUILD               |   90 ++++++++++++++++++---------------------
 glvnd.diff             |  108 -----------------------------------------------
 3 files changed, 49 insertions(+), 161 deletions(-)

Deleted: 10_nvidia_wayland.json
===================================================================
--- 10_nvidia_wayland.json	2020-05-22 12:10:34 UTC (rev 387411)
+++ 10_nvidia_wayland.json	2020-05-22 12:11:07 UTC (rev 387412)
@@ -1,6 +0,0 @@
-{
-    "file_format_version" : "1.0.0",
-    "ICD" : {
-        "library_path" : "libnvidia-egl-wayland.so.1"
-    }
-}

Copied: egl-wayland/repos/extra-x86_64/10_nvidia_wayland.json (from rev 387411, egl-wayland/trunk/10_nvidia_wayland.json)
===================================================================
--- 10_nvidia_wayland.json	                        (rev 0)
+++ 10_nvidia_wayland.json	2020-05-22 12:11:07 UTC (rev 387412)
@@ -0,0 +1,6 @@
+{
+    "file_format_version" : "1.0.0",
+    "ICD" : {
+        "library_path" : "libnvidia-egl-wayland.so.1"
+    }
+}

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-22 12:10:34 UTC (rev 387411)
+++ PKGBUILD	2020-05-22 12:11:07 UTC (rev 387412)
@@ -1,47 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=egl-wayland
-pkgver=1.1.4
-pkgrel=3
-pkgdesc="EGLStream-based Wayland external platform"
-arch=(x86_64)
-url=https://github.com/NVIDIA/egl-wayland
-license=(MIT)
-depends=(wayland eglexternalplatform)
-makedepends=(meson git)
-_commit=47d96a84b04d21cd0a2f23b59a4936c829a65364  # tags/1.1.4
-source=("git+$url#commit=$_commit"
-        glvnd.diff
-        10_nvidia_wayland.json)
-sha256sums=('SKIP'
-            'e6d965551829448ffc2ea0fdf97d7d44c3d35be0b56fc025e6cc343f29f7b9d6'
-            '5cccf1905a266e8e34d5ad4aad4be85390e60b1a0850a29dd9d64adc641de412')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # Fix build with headers from libglvnd
-  git apply -3 ../glvnd.diff
-}
-
-build() {
-  arch-meson $pkgname build
-  ninja -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-  install -Dt "$pkgdir/usr/share/egl/egl_external_platform.d" -m644 10_nvidia_wayland.json
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname/COPYING
-}
-
-# vim:set sw=2 et:

Copied: egl-wayland/repos/extra-x86_64/PKGBUILD (from rev 387411, egl-wayland/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-22 12:11:07 UTC (rev 387412)
@@ -0,0 +1,43 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=egl-wayland
+pkgver=1.1.5
+pkgrel=1
+pkgdesc="EGLStream-based Wayland external platform"
+arch=(x86_64)
+url=https://github.com/NVIDIA/egl-wayland
+license=(MIT)
+depends=(wayland eglexternalplatform)
+makedepends=(meson git)
+provides=(libnvidia-egl-wayland.so)
+_commit=f08e1a570eee30cbaed4c49e761830667f5ba29e  # tags/1.1.5^0
+source=("git+$url#commit=$_commit"
+        10_nvidia_wayland.json)
+sha256sums=('SKIP'
+            '5cccf1905a266e8e34d5ad4aad4be85390e60b1a0850a29dd9d64adc641de412')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
+
+build() {
+  arch-meson $pkgname build
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+  install -Dt "$pkgdir/usr/share/egl/egl_external_platform.d" -m644 10_nvidia_wayland.json
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname/COPYING
+}
+
+# vim:set sw=2 et:

Deleted: glvnd.diff
===================================================================
--- glvnd.diff	2020-05-22 12:10:34 UTC (rev 387411)
+++ glvnd.diff	2020-05-22 12:11:07 UTC (rev 387412)
@@ -1,108 +0,0 @@
-diff --git i/include/wayland-egldevice.h w/include/wayland-egldevice.h
-index 2b436aa..d32cce6 100644
---- i/include/wayland-egldevice.h
-+++ w/include/wayland-egldevice.h
-@@ -25,6 +25,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <wayland-client.h>
- #include "wayland-external-exports.h"
- #include "wayland-eglhandle.h"
-diff --git i/include/wayland-egldisplay.h w/include/wayland-egldisplay.h
-index ac42e7b..fe11f74 100644
---- i/include/wayland-egldisplay.h
-+++ w/include/wayland-egldisplay.h
-@@ -25,6 +25,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <wayland-client.h>
- #include "wayland-external-exports.h"
- #include "wayland-eglhandle.h"
-diff --git i/include/wayland-eglhandle.h w/include/wayland-eglhandle.h
-index 2697206..01bf11b 100644
---- i/include/wayland-eglhandle.h
-+++ w/include/wayland-eglhandle.h
-@@ -25,6 +25,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include "wayland-external-exports.h"
- #include "wayland-egl-ext.h"
- #include <pthread.h>
-diff --git i/include/wayland-eglstream-server.h w/include/wayland-eglstream-server.h
-index 27ab863..359926e 100644
---- i/include/wayland-eglstream-server.h
-+++ w/include/wayland-eglstream-server.h
-@@ -26,6 +26,7 @@
- #include <wayland-server-protocol.h>
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include "wayland-eglhandle.h"
- 
- #ifdef __cplusplus
-diff --git i/include/wayland-eglstream.h w/include/wayland-eglstream.h
-index e8486be..57b5e04 100644
---- i/include/wayland-eglstream.h
-+++ w/include/wayland-eglstream.h
-@@ -25,6 +25,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff --git i/include/wayland-eglsurface.h w/include/wayland-eglsurface.h
-index 38fcd85..f292812 100644
---- i/include/wayland-eglsurface.h
-+++ w/include/wayland-eglsurface.h
-@@ -25,6 +25,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <pthread.h>
- #include <wayland-client.h>
- #include "wayland-egldisplay.h"
-diff --git i/include/wayland-eglswap.h w/include/wayland-eglswap.h
-index 594f3ce..783ecbe 100644
---- i/include/wayland-eglswap.h
-+++ w/include/wayland-eglswap.h
-@@ -25,6 +25,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include "wayland-eglhandle.h"
- #include "wayland-eglsurface.h"
- 
-diff --git i/include/wayland-eglutils.h w/include/wayland-eglutils.h
-index ae54fcb..797bee7 100644
---- i/include/wayland-eglutils.h
-+++ w/include/wayland-eglutils.h
-@@ -25,6 +25,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include "wayland-external-exports.h"
- #include "wayland-eglhandle.h"
- 
-diff --git i/src/wayland-eglstream-server.c w/src/wayland-eglstream-server.c
-index c37f8e6..ef4bcb5 100644
---- i/src/wayland-eglstream-server.c
-+++ w/src/wayland-eglstream-server.c
-@@ -34,6 +34,7 @@
- #include <wayland-server.h>
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- 
- #include "wayland-eglstream-server.h"
- #include "wayland-eglstream-server-protocol.h"



More information about the arch-commits mailing list