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

[Jan Steffens]

    Date: Wednesday, June 6, 2018 @ 20:04:44
  Author: heftig
Revision: 326070

archrelease: copy trunk to extra-x86_64

Added:
  egl-wayland/repos/extra-x86_64/10_nvidia_wayland.json
    (from rev 326069, egl-wayland/trunk/10_nvidia_wayland.json)
  egl-wayland/repos/extra-x86_64/PKGBUILD
    (from rev 326069, 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/unbreak-meson.diff

------------------------+
 10_nvidia_wayland.json |   12 +++---
 PKGBUILD               |   91 +++++++++++++++++++++++------------------------
 unbreak-meson.diff     |   13 ------
 3 files changed, 51 insertions(+), 65 deletions(-)

Deleted: 10_nvidia_wayland.json
===================================================================
--- 10_nvidia_wayland.json	2018-06-06 20:04:27 UTC (rev 326069)
+++ 10_nvidia_wayland.json	2018-06-06 20:04:44 UTC (rev 326070)
@@ -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 326069, egl-wayland/trunk/10_nvidia_wayland.json)
===================================================================
--- 10_nvidia_wayland.json	                        (rev 0)
+++ 10_nvidia_wayland.json	2018-06-06 20:04:44 UTC (rev 326070)
@@ -0,0 +1,6 @@
+{
+    "file_format_version" : "1.0.0",
+    "ICD" : {
+        "library_path" : "libnvidia-egl-wayland.so.1"
+    }
+}

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-06 20:04:27 UTC (rev 326069)
+++ PKGBUILD	2018-06-06 20:04:44 UTC (rev 326070)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=egl-wayland
-pkgver=0+23
-pkgrel=2
-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=68ffe6fff49fff7667e8bab5b743c3e6c1950a6f  # master
-source=("git+$url#commit=$_commit" unbreak-meson.diff
-        10_nvidia_wayland.json)
-sha256sums=('SKIP'
-            'c9a1aa2ff24219c3177749d8c14d22ac49f964bf90dc1275d90c2e1a8b2f6cf1'
-            '5cccf1905a266e8e34d5ad4aad4be85390e60b1a0850a29dd9d64adc641de412')
-
-pkgver() {
-  cd $pkgname
-  printf '0+%s' "$(git rev-list --count HEAD)"
-}
-
-prepare() {
-  cd $pkgname
-  patch -Np1 -i ../unbreak-meson.diff
-}
-
-build() {
-  arch-meson $pkgname build
-  ninja -C build
-}
-
-check() {
-  cd build
-  meson test
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C build install
-  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 326069, egl-wayland/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-06 20:04:44 UTC (rev 326070)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=egl-wayland
+pkgver=1.0.4
+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)
+_commit=4ab087336614770c524cc51d8f9befa719d80cc9  # master
+source=("git+$url#commit=$_commit"
+        10_nvidia_wayland.json)
+sha256sums=('SKIP'
+            '5cccf1905a266e8e34d5ad4aad4be85390e60b1a0850a29dd9d64adc641de412')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  git tag -f 1.0.4 4ab087336614770c524cc51d8f9befa719d80cc9  # Fixup missing tag
+}
+
+build() {
+  arch-meson $pkgname build
+  ninja -C build
+}
+
+check() {
+  cd build
+  meson test
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+  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: unbreak-meson.diff
===================================================================
--- unbreak-meson.diff	2018-06-06 20:04:27 UTC (rev 326069)
+++ unbreak-meson.diff	2018-06-06 20:04:44 UTC (rev 326070)
@@ -1,13 +0,0 @@
-diff --git i/meson.build w/meson.build
-index 10a6d52..93a3e86 100644
---- i/meson.build
-+++ w/meson.build
-@@ -55,7 +55,7 @@ pkgconf.set('datarootdir', '${prefix}/@0@'.format(get_option('datadir')))
- pkgconf.set('PACKAGE',                           meson.project_name())
- pkgconf.set('WAYLAND_EXTERNAL_VERSION',          meson.project_version())
- pkgconf.set('EGL_EXTERNAL_PLATFORM_MIN_VERSION', '@0 at .@1@'.format(wayland_eglstream_major_version, wayland_eglstream_minor_version))
--pkgconf.set('EGL_EXTERNAL_PLATFORM_MAX_VERSION', [wayland_eglstream_major_version.to_int() + 1])
-+pkgconf.set('EGL_EXTERNAL_PLATFORM_MAX_VERSION', wayland_eglstream_major_version.to_int() + 1)
- 
- configure_file(input : 'wayland-eglstream.pc.in',
-                output : 'wayland-eglstream.pc',