[arch-commits] Commit in cogl/repos/extra-x86_64 (PKGBUILD PKGBUILD eglmesaext.diff)

[Jan Steffens]

    Date: Monday, March 9, 2020 @ 19:01:01
  Author: heftig
Revision: 377223

archrelease: copy trunk to extra-x86_64

Added:
  cogl/repos/extra-x86_64/PKGBUILD
    (from rev 377221, cogl/trunk/PKGBUILD)
  cogl/repos/extra-x86_64/eglmesaext.diff
    (from rev 377221, cogl/trunk/eglmesaext.diff)
Deleted:
  cogl/repos/extra-x86_64/PKGBUILD

-----------------+
 PKGBUILD        |   98 +++++++++++++++++++++++++++++-------------------------
 eglmesaext.diff |   26 ++++++++++++++
 2 files changed, 79 insertions(+), 45 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-09 19:01:00 UTC (rev 377222)
+++ PKGBUILD	2020-03-09 19:01:01 UTC (rev 377223)
@@ -1,45 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=cogl
-pkgver=1.22.4
-pkgrel=1
-pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
-url="https://blogs.gnome.org/clutter/"
-arch=(x86_64)
-license=(GPL2)
-depends=(mesa libdrm libxext libxdamage libxcomposite gdk-pixbuf2 pango libxrandr)
-makedepends=(gobject-introspection git gtk-doc)
-_commit=60015d7d9756a89fb608887b52fa6b6a5a7db18d  # tags/1.22.4^0
-source=("git+https://gitlab.gnome.org/GNOME/cogl.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  ./configure --prefix=/usr \
-    --enable-gles{1,2} \
-    --enable-{kms,wayland}-egl-platform \
-    --enable-wayland-egl-server
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: cogl/repos/extra-x86_64/PKGBUILD (from rev 377221, cogl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-09 19:01:01 UTC (rev 377223)
@@ -0,0 +1,53 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=cogl
+pkgver=1.22.6
+pkgrel=1
+pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
+url="https://blogs.gnome.org/clutter/"
+arch=(x86_64)
+license=(GPL2)
+depends=(mesa libdrm libxext libxdamage libxcomposite gdk-pixbuf2 pango
+         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')
+
+pkgver() {
+  cd $pkgname
+  git describe | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Fix building with libglvnd headers
+  patch -Np1 -i ../eglmesaext.diff
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+  ./configure --prefix=/usr \
+    --enable-gles2 \
+    --enable-{kms,wayland}-egl-platform \
+    --enable-wayland-egl-server
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: cogl/repos/extra-x86_64/eglmesaext.diff (from rev 377221, cogl/trunk/eglmesaext.diff)
===================================================================
--- eglmesaext.diff	                        (rev 0)
+++ eglmesaext.diff	2020-03-09 19:01:01 UTC (rev 377223)
@@ -0,0 +1,26 @@
+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])
+       ])
+