automatic version update by autodist [release 1.22.6-1mamba;Sat Mar 28 2020]

This commit is contained in:
Automatic Build System 2024-01-06 04:01:04 +01:00
parent 81d943b335
commit bf67871f1b
2 changed files with 60 additions and 5 deletions

View File

@ -0,0 +1,51 @@
Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
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 <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.
#
@@ -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 <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"],
@@ -1188,7 +1199,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])
])

View File

@ -1,6 +1,6 @@
%define majver %(echo %version | cut -d. -f1-2) %define majver %(echo %version | cut -d. -f1-2)
Name: libcogl Name: libcogl
Version: 1.22.4 Version: 1.22.6
Release: 1mamba Release: 1mamba
Summary: A library for using 3D graphics hardware for rendering Summary: A library for using 3D graphics hardware for rendering
Group: System/Libraries Group: System/Libraries
@ -9,9 +9,11 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.clutter-project.org/ URL: http://www.clutter-project.org/
Source: ftp://ftp.gnome.org/pub/gnome/sources/cogl/%{majver}/cogl-%{version}.tar.xz 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 License: LGPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: ldconfig
BuildRequires: libEGL-devel BuildRequires: libEGL-devel
BuildRequires: libGL-devel BuildRequires: libGL-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
@ -30,11 +32,8 @@ BuildRequires: libcairo-devel
BuildRequires: libdrm-devel BuildRequires: libdrm-devel
BuildRequires: libdw-devel BuildRequires: libdw-devel
BuildRequires: libelf-devel BuildRequires: libelf-devel
BuildRequires: libexpat-devel
BuildRequires: libffi-devel BuildRequires: libffi-devel
BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel BuildRequires: libfreetype-devel
BuildRequires: libfribidi-devel
BuildRequires: libgbm-devel BuildRequires: libgbm-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libgdk-pixbuf-devel BuildRequires: libgdk-pixbuf-devel
@ -50,7 +49,6 @@ BuildRequires: libpcre-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: libsepol-devel BuildRequires: libsepol-devel
BuildRequires: libthai-devel
BuildRequires: libunwind-devel BuildRequires: libunwind-devel
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: libwayland-devel BuildRequires: libwayland-devel
@ -81,8 +79,11 @@ Requires: gtk-doc
%description apidocs %description apidocs
This package includes the %{name} API documentation. This package includes the %{name} API documentation.
%debug_package
%prep %prep
%setup -q -n cogl-%{version} %setup -q -n cogl-%{version}
%patch0 -p1
%build %build
%configure \ %configure \
@ -170,6 +171,9 @@ export LC_ALL=en_US.UTF-8
%{_datadir}/gtk-doc/html/cogl-2.0-experimental/* %{_datadir}/gtk-doc/html/cogl-2.0-experimental/*
%changelog %changelog
* Sat Mar 28 2020 Automatic Build System <autodist@mambasoft.it> 1.22.6-1mamba
- automatic version update by autodist
* Tue Apr 23 2019 Automatic Build System <autodist@mambasoft.it> 1.22.4-1mamba * Tue Apr 23 2019 Automatic Build System <autodist@mambasoft.it> 1.22.4-1mamba
- automatic version update by autodist - automatic version update by autodist