- updated to 1.22.6

- added egl patch (adjust includes for new Mesa/glvnd EGL headers)

diff --git a/cogl-egl.patch b/cogl-egl.patch
new file mode 100644 (file)
index 0000000..7552dda
--- /dev/null
+++ b/cogl-egl.patch
@@ -0,0 +1,44 @@
+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 <EGL/eglext.h>"],
+                              [],
+                              [$COGL_EGL_INCLUDES])
++            AC_CHECK_HEADERS([EGL/eglmesaext.h],
++                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
++#include <EGL/eglmesaext.h>"],
++                             [],
++                             [$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 <EGL/egl.h>])
++            AC_CHECK_HEADERS(
++              [EGL/eglmesaext.h],
++              [],
++              [AC_MSG_ERROR([Unable to locate required EGL headers])],
++              [#include <EGL/egl.h>
++#include <EGL/eglext.h>])
+ 
+             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 <EGL/egl.h>
+-#include <EGL/eglext.h>"
++#include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>"
+         AC_SUBST([COGL_EGL_INCLUDES])
+       ])
+ 

diff --git a/cogl.spec b/cogl.spec
index 5d734bb9abe38156277c8fca3a51bba4a144cbff..793655d17a70a59856861174c329a0995166c8e2 100644 (file)
--- a/cogl.spec
+++ b/cogl.spec
@@ -14,17 +14,18 @@
 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.4
+Version:       1.22.6
 Release:       1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/cogl/1.22/%{name}-%{version}.tar.xz
-# Source0-md5: 31755015a865c4af51ac84f6e53af8ab
+# Source0-md5: 7bcc01edb5462d4d08d01bf893feddb0
 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}
-%{?with_wayland:BuildRequires: wayland-egl-devel >= 1.0.0}
 BuildRequires: OpenGL-GLX-devel
 %{?with_gles1:BuildRequires:   OpenGLESv1-devel >= 1.1}
 %{?with_sdl1:BuildRequires:    SDL-devel >= 1.2}
@@ -48,6 +49,7 @@ BuildRequires:        pkgconfig
 BuildRequires: tar >= 1:1.22
 # wayland-client >= 1.0.0, wayland-server >= 1.1.90
 %{?with_wayland:BuildRequires: wayland-devel >= 1.2.0}
+%{?with_wayland:BuildRequires: wayland-egl-devel >= 1.0.0}
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXcomposite-devel >= 0.4
 BuildRequires: xorg-lib-libXdamage-devel
@@ -236,6 +238,7 @@ Dokumentacja API biblioteki cogl-gst.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gettextize}