[arch-commits] Commit in cogl/trunk (PKGBUILD eglmesaext.diff)

[Jan Steffens]

    Date: Thursday, June 4, 2020 @ 16:58:00
  Author: heftig
Revision: 388287

1.22.8-1

Modified:
  cogl/trunk/PKGBUILD
Deleted:
  cogl/trunk/eglmesaext.diff

-----------------+
 PKGBUILD        |   14 ++++----------
 eglmesaext.diff |   26 --------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-04 16:54:41 UTC (rev 388286)
+++ PKGBUILD	2020-06-04 16:58:00 UTC (rev 388287)
@@ -2,7 +2,7 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=cogl
-pkgver=1.22.6
+pkgver=1.22.8
 pkgrel=1
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 url="https://blogs.gnome.org/clutter/"
@@ -12,11 +12,9 @@
          libxrandr)
 makedepends=(gobject-introspection git gtk-doc)
 provides=(libcogl.so libcogl-{gles2,pango,path}.so)
-_commit=dd104794b0d5e477e4ac2dbf3382f873fb40e5e1  # tags/1.22.6^0
-source=("git+https://gitlab.gnome.org/GNOME/cogl.git#commit=$_commit"
-        eglmesaext.diff)
-sha256sums=('SKIP'
-            '1d8909cbeea87964f1218bc545b17fa6d4369aadb63e9c2926ce7b17f76e6883')
+_commit=c2e25cef6bd7b3f12c8625f82956388e419cd046  # tags/1.22.8^0
+source=("git+https://gitlab.gnome.org/GNOME/cogl.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -25,10 +23,6 @@
 
 prepare() {
   cd $pkgname
-
-  # Fix building with libglvnd headers
-  patch -Np1 -i ../eglmesaext.diff
-
   NOCONFIGURE=1 ./autogen.sh
 }
 

Deleted: eglmesaext.diff
===================================================================
--- eglmesaext.diff	2020-06-04 16:54:41 UTC (rev 388286)
+++ eglmesaext.diff	2020-06-04 16:58:00 UTC (rev 388287)
@@ -1,26 +0,0 @@
-diff --git i/cogl/winsys/cogl-winsys-egl-kms.c w/cogl/winsys/cogl-winsys-egl-kms.c
-index 4da1f141..1ad9f5e8 100644
---- i/cogl/winsys/cogl-winsys-egl-kms.c
-+++ w/cogl/winsys/cogl-winsys-egl-kms.c
-@@ -40,6 +40,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <errno.h>
- #include <stddef.h>
- #include <drm.h>
-diff --git i/configure.ac w/configure.ac
-index a9a81c9d..0cf84a87 100644
---- i/configure.ac
-+++ w/configure.ac
-@@ -1226,7 +1226,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
-           )
- 
-         COGL_EGL_INCLUDES="#include <EGL/egl.h>
--#include <EGL/eglext.h>"
-+#include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>"
-         AC_SUBST([COGL_EGL_INCLUDES])
-       ])
-