From d3ce34a557a3ea3d736abe8a83eef53fce4f2e4c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 15 Nov 2021 16:31:59 +0100
Subject: update to 8.12.0rc1

enable libcgif usage
disable libjxl usage
open https://github.com/libvips/libvips/pull/2538
  fails if library is requested and missing
open https://github.com/libvips/libvips/pull/2539
  allow libjxl 0.5
---
 libvips.xml |  2 +-
 vips.spec   | 40 +++++++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/libvips.xml b/libvips.xml
index dfbad83..63350b5 100644
--- a/libvips.xml
+++ b/libvips.xml
@@ -9,7 +9,7 @@
 
 <version>
     <!-- Version of the library -->
-8.11.4
+8.12.0rc1
 </version>
 
 <headers>
diff --git a/vips.spec b/vips.spec
index 596cb31..23a15cd 100644
--- a/vips.spec
+++ b/vips.spec
@@ -7,10 +7,10 @@
 #
 # Please preserve changelog entries
 #
-%global vips_version_base 8.11
-%global vips_version %{vips_version_base}.4
+%global vips_version_base 8.12
+%global vips_version %{vips_version_base}.0
 %global vips_soname_major 42
-#global vips_prever rc1
+%global vips_prever rc1
 %global vips_tarver %{vips_version}%{?vips_prever:-%{vips_prever}}
 
 %if 0%{?fedora} || 0%{?rhel} >= 8
@@ -21,8 +21,10 @@
 
 %if 0%{?fedora} || 0%{?rhel} >= 8
 %bcond_without             libimagequant
+%bcond_without             libcgif
 %else
 %bcond_with                libimagequant
+%bcond_with                libcgif
 %endif
 
 %if 0%{?fedora} >= 34
@@ -52,7 +54,7 @@
 %bcond_without             im7
 %bcond_with                gm
 
-%if 0%{?fedora} >= 33
+%if 0%{?fedora} >= 99
 %bcond_without             jxl
 %else
 %bcond_with                jxl
@@ -107,6 +109,9 @@ BuildRequires:  pkgconfig(libopenjp2) >= 2.4
 #BuildRequires: pkgconfig(imagequant) TODO only in 2.12+
 BuildRequires:  libimagequant-devel
 %endif
+%if %{with libcgif}
+BuildRequires:  pkgconfig(cgif)
+%endif
 BuildRequires:  pkgconfig(gthread-2.0)
 
 BuildRequires:  gcc-c++
@@ -186,8 +191,8 @@ HTML and PDF formats.
 
 %if %{with jxl}
 %package jxl
-Summary:       Jxl support for %{name}
-BuildRequires: pkgconfig(libjxl) >= 0.3.7
+Summary:       JPEG-XL support for %{name}
+BuildRequires: pkgconfig(libjxl) >= 0.6
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Supplements:   %{name}
 
@@ -225,12 +230,7 @@ The %{name}-poppler package contains the Poppler module for VIPS.
 %if %{with im6}
 %package magick-im6
 Summary:       Magick support for %{name} using ImageMagick6
-%if 0%{?fedora} >= 99 || 0%{?rhel} >= 99
-BuildRequires: ImageMagick-devel
-%else
-# Ensure we use version 6 (same as imagick ext).
 BuildRequires: ImageMagick6-devel
-%endif
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 %if 0%{?fedora} >= 34
 Obsoletes:     %{name}-magick         < %{version}-%{release}
@@ -317,6 +317,11 @@ export CXXFLAGS="%{optflags} -ftree-vectorize"
 %else
     --without-imagequant \
 %endif
+%if %{with libcgif}
+    --with-cgif \
+%else
+    --without-cgif \
+%endif
 %if %{with openjpeg2}
     --with-libopenjp2 \
 %else
@@ -333,6 +338,7 @@ export CXXFLAGS="%{optflags} -ftree-vectorize"
     --without-libjxl \
 %endif
 %if %{with doc}
+    --enable-doxygen \
     --enable-gtk-doc \
 %endif
 %if %{with gm}
@@ -429,6 +435,18 @@ mv cplusplus/html cplusplus_html
 
 
 %changelog
+* Mon Nov 15 2021 Remi Collet <remi@remirepo.net> - 8.12.0~rc1-1
+- update to 8.12.0rc1
+- enable libcgif usage
+- disable libjxl usage
+- open https://github.com/libvips/libvips/pull/2538
+  fails if library is requested and missing
+- open https://github.com/libvips/libvips/pull/2539
+  allow libjxl 0.5
+
+* Fri Nov  5 2021 Remi Collet <remi@remirepo.net> - 8.11.4-2
+- EL-9 build
+
 * Fri Sep 24 2021 Remi Collet <remi@remirepo.net> - 8.11.4-1
 - update to 8.11.4
 
-- 
cgit