summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/cogl/APKBUILD8
-rw-r--r--user/cogl/fix-wayland-egl-check.patch12
2 files changed, 3 insertions, 17 deletions
diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD
index 4f1b2202f..f7e7b699c 100644
--- a/user/cogl/APKBUILD
+++ b/user/cogl/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=cogl
-pkgver=1.22.2
+pkgver=1.22.4
pkgrel=0
pkgdesc="GObject-based GL/GLES abstraction library"
url="https://gnome.org"
@@ -11,8 +11,7 @@ license="MIT AND SGI-B-2.0 AND BSD-3-Clause AND Public-Domain AND LGPL-2.0+ AND
makedepends="glib-dev libxcomposite-dev libxrandr-dev mesa-dev cairo-dev
pango-dev vala gobject-introspection-dev gdk-pixbuf-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.gnome.org/sources/cogl/1.22/cogl-$pkgver.tar.xz
- fix-wayland-egl-check.patch"
+source="https://download.gnome.org/sources/cogl/1.22/cogl-$pkgver.tar.xz"
build() {
cd "$builddir"
@@ -38,5 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3 cogl-1.22.2.tar.xz
-73fa3a7258e2624d13abfe36259bef1a28e993653f0fdebfb4b0822752fa40a95399f4f9cd707873938bc6b8edcc7db46228247851471899f05a7e7132af58c7 fix-wayland-egl-check.patch"
+sha512sums="85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a cogl-1.22.4.tar.xz"
diff --git a/user/cogl/fix-wayland-egl-check.patch b/user/cogl/fix-wayland-egl-check.patch
deleted file mode 100644
index 72ec484e5..000000000
--- a/user/cogl/fix-wayland-egl-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nurd cogl-1.22.2/cogl/winsys/cogl-winsys-egl.c cogl-1.22.2.new/cogl/winsys/cogl-winsys-egl.c
---- cogl-1.22.2/cogl/winsys/cogl-winsys-egl.c 2016-08-26 11:18:16.000000000 -0500
-+++ cogl-1.22.2.new/cogl/winsys/cogl-winsys-egl.c 2018-09-07 08:28:36.950138458 -0500
-@@ -1029,7 +1029,7 @@
- egl_ctx = EGL_NO_CONTEXT;
- else
- #endif
--#if COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
-+#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
- /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used
- * in conjunction with the EGL_WAYLAND_BUFFER_WL target */
- if (target == EGL_WAYLAND_BUFFER_WL)