Date: Monday, March 9, 2020 @ 18:08:42 Author: heftig Revision: 377217
1.22.6-1 Added: cogl/trunk/eglmesaext.diff Modified: cogl/trunk/PKGBUILD -----------------+ PKGBUILD | 20 ++++++++++++++------ eglmesaext.diff | 26 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-03-09 15:39:16 UTC (rev 377216) +++ PKGBUILD 2020-03-09 18:08:42 UTC (rev 377217) @@ -2,17 +2,21 @@ # Contributor: Ionut Biru <[email protected]> pkgname=cogl -pkgver=1.22.4 +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) +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') +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 @@ -21,6 +25,10 @@ prepare() { cd $pkgname + + # Fix building with libglvnd headers + patch -Np1 -i ../eglmesaext.diff + NOCONFIGURE=1 ./autogen.sh } @@ -27,7 +35,7 @@ build() { cd $pkgname ./configure --prefix=/usr \ - --enable-gles{1,2} \ + --enable-gles2 \ --enable-{kms,wayland}-egl-platform \ --enable-wayland-egl-server Added: eglmesaext.diff =================================================================== --- eglmesaext.diff (rev 0) +++ eglmesaext.diff 2020-03-09 18:08:42 UTC (rev 377217) @@ -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]) + ]) +
