[arch-commits] Commit in egl-wayland/trunk (PKGBUILD unbreak-meson.diff)

[Jan Steffens]

    Date: Wednesday, June 6, 2018 @ 20:03:29
  Author: heftig
Revision: 326067

1.0.4-1

Modified:
  egl-wayland/trunk/PKGBUILD
Deleted:
  egl-wayland/trunk/unbreak-meson.diff

--------------------+
 PKGBUILD           |   13 ++++++-------
 unbreak-meson.diff |   13 -------------
 2 files changed, 6 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-06 19:49:01 UTC (rev 326066)
+++ PKGBUILD	2018-06-06 20:03:29 UTC (rev 326067)
@@ -2,8 +2,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=egl-wayland
-pkgver=0+23
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="EGLStream-based Wayland external platform"
 arch=(x86_64)
 url=https://github.com/NVIDIA/egl-wayland
@@ -10,21 +10,20 @@
 license=(MIT)
 depends=(wayland eglexternalplatform)
 makedepends=(meson git)
-_commit=68ffe6fff49fff7667e8bab5b743c3e6c1950a6f  # master
-source=("git+$url#commit=$_commit" unbreak-meson.diff
+_commit=4ab087336614770c524cc51d8f9befa719d80cc9  # master
+source=("git+$url#commit=$_commit"
         10_nvidia_wayland.json)
 sha256sums=('SKIP'
-            'c9a1aa2ff24219c3177749d8c14d22ac49f964bf90dc1275d90c2e1a8b2f6cf1'
             '5cccf1905a266e8e34d5ad4aad4be85390e60b1a0850a29dd9d64adc641de412')
 
 pkgver() {
   cd $pkgname
-  printf '0+%s' "$(git rev-list --count HEAD)"
+  git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../unbreak-meson.diff
+  git tag -f 1.0.4 4ab087336614770c524cc51d8f9befa719d80cc9  # Fixup missing tag
 }
 
 build() {

Deleted: unbreak-meson.diff
===================================================================
--- unbreak-meson.diff	2018-06-06 19:49:01 UTC (rev 326066)
+++ unbreak-meson.diff	2018-06-06 20:03:29 UTC (rev 326067)
@@ -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',