upg cmake

add egl-wayland

cmake/PKGBUILD

@@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=cmake
-pkgver=3.28.1
+pkgver=3.28.2
 pkgrel=01
 pkgdesc='A cross-platform open-source make system w/o zstd or qt-gui '
 url="https://www.cmake.org/"
@@ -59,9 +59,12 @@ license=('custom')
 
 validpgpkeys=(CBA23971357C2E6590D9EFD3EC8FEF3A7BFB4EDA) # Brad King <brad.king@kitware.com>
 
-sha256sums=(15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad  # cmake-3.28.1.tar.gz
-	9a103d6e58cedc3662148f4a08b1a00bc50710b114df158eed613c8c5cf712ea  # cmake-3.28.1-SHA-256.txt
-	f2b256b2b92605ccfac80e3a19a045cf1bce8c3ea7c5bfdd10b443d77c90b953) # cmake-3.28.1-SHA-256.txt.asc
+sha512sums=('225f6d3eb56d41c449a32f7c3e0f8f3ffafbbf45474e29ad86e965a87f8d95e55e87affc62ef0a7b25c9fb070c6fca08e9838539e5f7011dc3ee83787025151b'
+            '7337877f928b22e227e27c7ceff10b953c008ad35ee532d83290db3844f46607f79d48931676ad5203147bae4b2caec0520b146c4a2949db94da0b2ed85a0990'
+             'SKIP')
 
-##  5727c81bef81ea5778188c80b1a0b5be50f6e1bacba8f10a7f947f0ffe325c62  cmake-3.28.1-01-x86_64.pkg.tar.lz
+sha256sums=(1466f872dc1c226f373cf8fba4230ed216a8f108bd54b477b5ccdfd9ea2d124a  # cmake-3.28.2.tar.gz
+	5fd59262a3e4955b1cd7a85df8edbb84f192d8c5f2387c452b7b86e1c73c53e1  # cmake-3.28.2-SHA-256.txt
+	64c6b0308572c0ce7f741222b8c24064766d766ff7ffbfc2a2c379f989a39c89) # cmake-3.28.2-SHA-256.txt.asc
 
+##  

cmake/PKGBUILD-arch

@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=3.28.1
+pkgver=3.28.2
 pkgrel=1
 pkgdesc='A cross-platform open-source make system'
 arch=('x86_64')
@@ -18,8 +18,8 @@ optdepends=(
 )
 source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
         "https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}-SHA-256.txt"{,.asc})
-sha512sums=('62693c423dd46d252d046662ac34cf9c927b7ec23c213c6b5cd1683636b8bbb5326698af1e7f851f3c01fe3f14dd769b9a8bd405f8f9e73e6d8defae7517cbcb'
-            'd23085b03c33c9ca205b55d8049eb2dd331e1ef4b393d2cd707759ec7b162f79e3a7a84add6231d0ddd144c410fc3e013664946088e809ce7a508bfdb1909392'
+sha512sums=('225f6d3eb56d41c449a32f7c3e0f8f3ffafbbf45474e29ad86e965a87f8d95e55e87affc62ef0a7b25c9fb070c6fca08e9838539e5f7011dc3ee83787025151b'
+            '7337877f928b22e227e27c7ceff10b953c008ad35ee532d83290db3844f46607f79d48931676ad5203147bae4b2caec0520b146c4a2949db94da0b2ed85a0990'
             'SKIP')
 validpgpkeys=(CBA23971357C2E6590D9EFD3EC8FEF3A7BFB4EDA) # Brad King <brad.king@kitware.com>
 

cmake/deps

@@ -7,5 +7,6 @@ emacs-git
 python-sphinx-autoapi
 cppdap
 nlohmann-json
+dbus
 
 

egl-wayland/0001-Destroy-all-created-wayland-object-in-terminateDispl.patch

@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robin Ebert <ebertrobin2002@gmail.com>
+Date: Wed, 25 Jan 2023 17:31:46 +0100
+Subject: [PATCH] Destroy all created wayland object in terminateDisplay
+
+---
+ src/wayland-egldisplay.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/wayland-egldisplay.c b/src/wayland-egldisplay.c
+index aaf0ff653217..284d2add762c 100644
+--- a/src/wayland-egldisplay.c
++++ b/src/wayland-egldisplay.c
+@@ -412,6 +412,14 @@ static EGLBoolean terminateDisplay(WlEglDisplay *display, EGLBoolean globalTeard
+             wl_eglstream_display_destroy(display->wlStreamDpy);
+             display->wlStreamDpy = NULL;
+         }
++        if (display->wlStreamCtl) {
++            wl_eglstream_controller_destroy(display->wlStreamCtl);
++            display->wlStreamCtl = NULL;
++        }
++        if (display->wlDmaBuf) {
++            zwp_linux_dmabuf_v1_destroy(display->wlDmaBuf);
++            display->wlDmaBuf = NULL;
++        }
+         if (display->wlEventQueue) {
+             wl_event_queue_destroy(display->wlEventQueue);
+             display->wlEventQueue = NULL;

egl-wayland/0002-Fix-wrong-destruction-order-for-event-queue.patch

@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: q234rty <q23456yuiop@gmail.com>
+Date: Fri, 7 Apr 2023 18:08:03 +0800
+Subject: [PATCH] Fix wrong destruction order for event queue
+
+---
+ src/wayland-egldisplay.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/wayland-egldisplay.c b/src/wayland-egldisplay.c
+index 284d2add762c..99e6e3b82953 100644
+--- a/src/wayland-egldisplay.c
++++ b/src/wayland-egldisplay.c
+@@ -481,12 +481,12 @@ static void getServerProtocolsInfo(struct wl_display *nativeDpy,
+         }
+     }
+ 
++    if (wlRegistry) {
++        wl_registry_destroy(wlRegistry);
++    }
+     if (queue) {
+         wl_event_queue_destroy(queue);
+     }
+-    if (wlRegistry) {
+-       wl_registry_destroy(wlRegistry);
+-    }
+ }
+ 
+ EGLDisplay wlEglGetPlatformDisplayExport(void *data,

egl-wayland/10_nvidia_wayland.json

@@ -0,0 +1,6 @@
+{
+    "file_format_version" : "1.0.0",
+    "ICD" : {
+        "library_path" : "libnvidia-egl-wayland.so.1"
+    }
+}

egl-wayland/PKGBUILD

@@ -0,0 +1,65 @@
+#!/usr/bin/bash
+# JOBoRun		: Jwm OpenBox Obarun RUNit
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
+# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
+# Website		: https://pozol.eu
+#-----------------------------------------| DESCRIPTION |---------------------------------------
+
+pkgname=egl-wayland
+pkgver=1.1.13
+pkgrel=01
+epoch=2
+pkgdesc="EGLStream-based Wayland external platform"
+url="https://github.com/NVIDIA/egl-wayland"
+depends=(eglexternalplatform wayland)
+makedepends=(git 'libglvnd>=1.3.4'  meson  wayland-protocols)
+provides=(libnvidia-egl-wayland.so)
+_commit=69ae9cf07bbec3b00a682918bf0dc845e9896771  # tags/1.1.13
+source=("git+$url#commit=$_commit"
+	10_nvidia_wayland.json)
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # https://bugs.archlinux.org/task/77260
+  # https://github.com/NVIDIA/egl-wayland/pull/74
+  #  git apply -3 ../0001-Destroy-all-created-wayland-object-in-terminateDispl.patch
+
+  # https://bugs.archlinux.org/task/78143
+  # https://github.com/NVIDIA/egl-wayland/pull/79
+  #  git apply -3 ../0002-Fix-wrong-destruction-order-for-event-queue.patch
+}
+
+build() {
+  arch-meson $pkgname build
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+  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
+}
+
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
+
+license=(MIT)
+
+sha256sums=(SKIP
+	5cccf1905a266e8e34d5ad4aad4be85390e60b1a0850a29dd9d64adc641de412) # 10_nvidia_wayland.json
+
+##  5acef3030f1e147ff28b001772f96e1f6557c1fd669fbb0a3e3c69121ac5daca  egl-wayland-2_1.1.13-01-x86_64.pkg.tar.lz
+
+##  Switch epoch nd-2:1.1 nd-2_1.1 for sourceforge repo
+

egl-wayland/PKGBUILD-arch

@@ -0,0 +1,54 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+
+pkgname=egl-wayland
+pkgver=1.1.13
+pkgrel=1
+epoch=2
+pkgdesc="EGLStream-based Wayland external platform"
+url="https://github.com/NVIDIA/egl-wayland"
+arch=(x86_64)
+license=(MIT)
+depends=(
+  eglexternalplatform
+  wayland
+)
+makedepends=(
+  git
+  'libglvnd>=1.3.4'
+  meson
+  wayland-protocols
+)
+provides=(libnvidia-egl-wayland.so)
+_commit=69ae9cf07bbec3b00a682918bf0dc845e9896771  # tags/1.1.13
+source=(
+  "git+$url#commit=$_commit"
+  10_nvidia_wayland.json
+)
+b2sums=('SKIP'
+        'b10206c742e8966d1192b9b0604137e6b296d2be74a437841c63844c0716343578b11565a34fb4c534d5908c0b5775305581b68039a6ff9ed7421c9d385a2b7a')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
+
+build() {
+  arch-meson $pkgname build
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+  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 sts=-1 et:

egl-wayland/clean

@@ -0,0 +1 @@
+rm -rf {src,pkg,egl-wayland}

egl-wayland/deps

@@ -0,0 +1,5 @@
+eglexternalplatform
+meson
+
+git
+wayland-protocols

egl-wayland/time

@@ -0,0 +1,6 @@
+
+
+real	0m4.727s
+user	0m4.889s
+sys	0m0.898s
+