From: Jakub Bogusz Date: Thu, 4 Jun 2020 16:03:34 +0000 (+0200) Subject: - updated to 1.22.8 X-Git-Tag: auto/th/cogl-1.22.8-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=964044ad3c780bd0d4f33ccd206964bfc2ac1fdb;p=packages%2Fcogl.git - updated to 1.22.8 - removed obsolete egl patch --- diff --git a/cogl-egl.patch b/cogl-egl.patch deleted file mode 100644 index 7552dda..0000000 --- a/cogl-egl.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a9a81c9de385e326b622502433cffdaea162462e..1f0c6060672708d2f6701ea6c55784351052c8cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -685,10 +685,15 @@ AS_IF([test "x$enable_gles1" = "xyes"], - AC_SUBST([COGL_EGL_INCLUDES]) - - AC_CHECK_HEADERS([EGL/eglext.h], -- [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE -+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES - #include "], - [], - [$COGL_EGL_INCLUDES]) -+ AC_CHECK_HEADERS([EGL/eglmesaext.h], -+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES -+#include "], -+ [], -+ [$COGL_EGL_INCLUDES]) - - # Check for a GLES 1.x Common Profile library with/without EGL. - # -@@ -1216,6 +1221,12 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], - [], - [AC_MSG_ERROR([Unable to locate required EGL headers])], - [#include ]) -+ AC_CHECK_HEADERS( -+ [EGL/eglmesaext.h], -+ [], -+ [AC_MSG_ERROR([Unable to locate required EGL headers])], -+ [#include -+#include ]) - - AC_CHECK_LIB(EGL, [eglInitialize], - [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"], -@@ -1226,7 +1237,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], - ) - - COGL_EGL_INCLUDES="#include --#include " -+#include -+#include " - AC_SUBST([COGL_EGL_INCLUDES]) - ]) - diff --git a/cogl.spec b/cogl.spec index 793655d..ff51554 100644 --- a/cogl.spec +++ b/cogl.spec @@ -14,15 +14,13 @@ Summary: A library for using 3D graphics hardware to draw pretty pictures Summary(pl.UTF-8): Biblioteka do rysowania ładnych obrazków przy użyciu sprzętowej grafiki 3D Name: cogl -Version: 1.22.6 +Version: 1.22.8 Release: 1 License: LGPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/cogl/1.22/%{name}-%{version}.tar.xz -# Source0-md5: 7bcc01edb5462d4d08d01bf893feddb0 +# Source0-md5: 7dd8b2e24171ef7399f851cea144b569 Patch0: %{name}-link.patch -# https://gitlab.gnome.org/GNOME/cogl/-/commit/ff5dfc658042115392d9215a40afab3636b8461a.diff -Patch1: %{name}-egl.patch URL: http://www.clutter-project.org/ %{?with_wayland:BuildRequires: EGL-devel} %{?with_kms:BuildRequires: Mesa-libgbm-devel} @@ -238,7 +236,6 @@ Dokumentacja API biblioteki cogl-gst. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__gettextize}