diff --git a/libcogl-1.22.6-Mesa-20.0.2.patch b/libcogl-1.22.6-Mesa-20.0.2.patch new file mode 100644 index 0000000..d9cb7d9 --- /dev/null +++ b/libcogl-1.22.6-Mesa-20.0.2.patch @@ -0,0 +1,51 @@ +Submitted By: Pierre Labastie +Date: 2020-03-04 +Initial Package Version: 1.22.4.0 +Upstream Status: PR submitted +Origin: Debian patches +Descripton: Fix some headers moved around by Mesa-20.x. + +diff --git a/configure.ac b/configure.ac +index da188edd721eb4884683c8ef7263a25cd4429851..b0b0c94d8945d095b7b31728fe5482e622599d96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -670,10 +670,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. + # +@@ -1178,6 +1183,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"], +@@ -1188,7 +1199,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/libcogl.spec b/libcogl.spec index 577b7a0..40c57b1 100644 --- a/libcogl.spec +++ b/libcogl.spec @@ -1,6 +1,6 @@ %define majver %(echo %version | cut -d. -f1-2) Name: libcogl -Version: 1.22.4 +Version: 1.22.6 Release: 1mamba Summary: A library for using 3D graphics hardware for rendering Group: System/Libraries @@ -9,9 +9,11 @@ Distribution: openmamba Packager: Silvan Calarco URL: http://www.clutter-project.org/ Source: ftp://ftp.gnome.org/pub/gnome/sources/cogl/%{majver}/cogl-%{version}.tar.xz +Patch0: libcogl-1.22.6-Mesa-20.0.2.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: ldconfig BuildRequires: libEGL-devel BuildRequires: libGL-devel BuildRequires: libX11-devel @@ -30,11 +32,8 @@ BuildRequires: libcairo-devel BuildRequires: libdrm-devel BuildRequires: libdw-devel BuildRequires: libelf-devel -BuildRequires: libexpat-devel BuildRequires: libffi-devel -BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel -BuildRequires: libfribidi-devel BuildRequires: libgbm-devel BuildRequires: libgcc BuildRequires: libgdk-pixbuf-devel @@ -50,7 +49,6 @@ BuildRequires: libpcre-devel BuildRequires: libpng-devel BuildRequires: libselinux-devel BuildRequires: libsepol-devel -BuildRequires: libthai-devel BuildRequires: libunwind-devel BuildRequires: libuuid-devel BuildRequires: libwayland-devel @@ -81,8 +79,11 @@ Requires: gtk-doc %description apidocs This package includes the %{name} API documentation. +%debug_package + %prep %setup -q -n cogl-%{version} +%patch0 -p1 %build %configure \ @@ -170,6 +171,9 @@ export LC_ALL=en_US.UTF-8 %{_datadir}/gtk-doc/html/cogl-2.0-experimental/* %changelog +* Sat Mar 28 2020 Automatic Build System 1.22.6-1mamba +- automatic version update by autodist + * Tue Apr 23 2019 Automatic Build System 1.22.4-1mamba - automatic version update by autodist