Rebuild (libimagequant)

Use std=gnu17 to avoid errors

.gitignore

@@ -8,3 +8,8 @@ gd-2.0.35.tar.bz2
 /libgd-2.2.2.tar.xz
 /libgd-2.2.3.tar.xz
 /libgd-2.2.4.tar.xz
+/libgd-2.2.5.tar.xz
+/libgd-2.3.0.tar.xz
+/libgd-2.3.1.tar.xz
+/libgd-2.3.2.tar.xz
+/libgd-2.3.3.tar.xz

gd-2.1.0-multilib.patch

@@ -1,33 +0,0 @@
-diff -up gd-2.1.0/config/gdlib-config.in.multilib gd-2.1.0/config/gdlib-config.in
---- gd-2.1.0/config/gdlib-config.in.multilib	2013-04-21 16:58:17.820010758 +0200
-+++ gd-2.1.0/config/gdlib-config.in	2013-04-21 16:59:27.896317922 +0200
-@@ -7,9 +7,10 @@
- # installation directories
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=`pkg-config gdlib --variable=libdir`
- includedir=@includedir@
- bindir=@bindir@
-+ldflags=`pkg-config gdlib --variable=ldflags`
- 
- usage()
- {
-@@ -68,7 +69,7 @@ while test $# -gt 0; do
- 	echo @GDLIB_REVISION@
- 	;;
-     --ldflags)
--	echo @LDFLAGS@
-+	echo $ldflags
- 	;;
-     --libs)
- 	echo -lgd @LIBS@ @LIBICONV@
-@@ -83,7 +84,7 @@ while test $# -gt 0; do
- 	echo "GD library  @VERSION@"
- 	echo "includedir: $includedir"
- 	echo "cflags:     -I@includedir@"
--	echo "ldflags:    @LDFLAGS@"
-+	echo "ldflags:    $ldflags"
- 	echo "libs:       @LIBS@ @LIBICONV@"
- 	echo "libdir:     $libdir"
- 	echo "features:   @FEATURES@"

gd-2.2.3-tests.patch

@@ -1,42 +0,0 @@
-From 2b3dd57a6ccb2940f2e9119ae04e14362e2a1f61 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Fri, 22 Jul 2016 08:14:12 +0200
-Subject: [PATCH] Fix gd2/gd2_read.c:8:6: error: 'error' may be used
- uninitialized in this function [-Werror=maybe-uninitialized]
-
-Also report about any error, not only the last one.
----
- tests/gd2/gd2_read.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/tests/gd2/gd2_read.c b/tests/gd2/gd2_read.c
-index 94fe069..8ce8bd1 100644
---- a/tests/gd2/gd2_read.c
-+++ b/tests/gd2/gd2_read.c
-@@ -5,7 +5,7 @@
- 
- int main(int argc, char *argv[])
- {
--	int error, i = 0;
-+	int error = 0, i = 0;
- 	gdImagePtr im, exp;
- 	FILE *fp;
- 	char *path[] = {
-@@ -40,8 +40,6 @@ int main(int argc, char *argv[])
- 				gdTestErrorMsg("image %s differs from expected result\n", path[i]);
- 				gdImageDestroy(im);
- 				error = 1;
--			} else {
--				error = 0;
- 			}
- 			if (exp) {
- 				gdImageDestroy(exp);
-@@ -52,8 +50,6 @@ int main(int argc, char *argv[])
- 				gdTestErrorMsg("image %s should have failed to be loaded\n", path[i]);
- 				gdImageDestroy(im);
- 				error = 1;
--			} else {
--				error = 0;
- 			}
- 		}
- 		i++;

gd-2.2.4-upstream.patch

@@ -1,50 +0,0 @@
-From c9b601a658a79e6ea2aad29fbf60ca6e24ccef1e Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Wed, 18 Jan 2017 13:59:02 +0100
-Subject: [PATCH] Fix build issue regarding INT_MAX
-
-For portability gd_gd2.c needs to include <limits.h>.
----
- src/gd_gd2.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gd_gd2.c b/src/gd_gd2.c
-index c2904ca..049c4c5 100644
---- a/src/gd_gd2.c
-+++ b/src/gd_gd2.c
-@@ -74,6 +74,7 @@
- 
- /* 2.0.29: no more errno.h, makes windows happy */
- #include <math.h>
-+#include <limits.h>
- #include <string.h>
- #include "gd.h"
- #include "gd_errors.h"
-
-
-From 55ac28a293eaa8c531870c8bb8ecc04b333975f4 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Thu, 19 Jan 2017 01:02:58 +0100
-Subject: [PATCH] Fix #357: 2.2.4: Segfault in test suite.
-
-We make sure to never pass a negative `int` as argument to a `size_t`
-parameter.
----
- src/gd_io_dp.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gd_io_dp.c b/src/gd_io_dp.c
-index eda2eeb..cb38794 100644
---- a/src/gd_io_dp.c
-+++ b/src/gd_io_dp.c
-@@ -292,6 +292,10 @@ static int dynamicGetbuf(gdIOCtxPtr ctx, void *buf, int len)
- 		rlen = dp->realSize - dp->pos;
- 	}
- 
-+	if (rlen < 0) {
-+		return 0;
-+	}
-+
- 	memcpy(buf, (void *) ((char *)dp->data + dp->pos), rlen);
- 	dp->pos += rlen;
- 

gd.spec

@@ -1,13 +1,25 @@
-#global prever    rc2
-#global commit    725ba9de4005144d137d2a7a70f760068fc3d306
-#global short     %(c=%{commit}; echo ${c:0:7})
+%if 0%{?rhel}
+%bcond_with liq
+%bcond_with raqm
+%bcond_with avif
+%else
+# Enabled by default
+%bcond_without liq
+%bcond_without avif
+%endif
+# disabled as breaks vertical text
+# See https://bugzilla.redhat.com/2022957
+%bcond_with    raqm
+# Not available in Fedora, only in rpmfusion
+# Also see https://github.com/libgd/libgd/issues/678 segfault
+%bcond_with    heif
+
 
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
-Version:       2.2.4
-Release:       1%{?prever}%{?short}%{?dist}
-Group:         System Environment/Libraries
-License:       MIT
+Version:       2.3.3
+Release:       20%{?prever}%{?short}%{?dist}
+License:       GD
 URL:           http://libgd.github.io/
 %if 0%{?commit:1}
 # git clone https://github.com/libgd/libgd.git; cd gd-libgd
@@ -17,9 +29,10 @@ Source0:       libgd-%{version}-%{commit}.tgz
 Source0:       https://github.com/libgd/libgd/releases/download/gd-%{version}/libgd-%{version}.tar.xz
 %endif
 
-Patch1:        gd-2.1.0-multilib.patch
-Patch2:        gd-2.2.3-tests.patch
-Patch3:        gd-2.2.4-upstream.patch
+# Needed by PHP see https://github.com/libgd/libgd/pull/766
+Patch0:        libgd-flip.patch
+# Missing header see https://github.com/libgd/libgd/pull/766
+Patch1:        libgd-iostream.patch
 
 BuildRequires: freetype-devel
 BuildRequires: fontconfig-devel
@@ -28,15 +41,29 @@ BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libwebp-devel
+%if %{with liq}
+BuildRequires: libimagequant-devel
+%endif
+%if %{with raqm}
+BuildRequires: libraqm-devel
+%endif
+%if %{with avif}
+BuildRequires: libavif-devel
+%endif
+%if %{with heif}
+BuildRequires: libheif-devel
+%endif
 BuildRequires: libX11-devel
 BuildRequires: libXpm-devel
 BuildRequires: zlib-devel
 BuildRequires: pkgconfig
 BuildRequires: libtool
-BuildRequires: perl
+BuildRequires: perl-interpreter
 BuildRequires: perl-generators
+BuildRequires: perl(FindBin)
 # for fontconfig/basic test
 BuildRequires: liberation-sans-fonts
+BuildRequires: make
 
 
 %description
@@ -51,7 +78,6 @@ browsers. Note that gd is not a paint program.
 %package progs
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Summary:        Utility programs that use libgd
-Group:          Applications/Multimedia
 
 %description progs
 The gd-progs package includes utility programs supplied with gd, a
@@ -60,7 +86,6 @@ graphics library for creating PNG and JPEG images.
 
 %package devel
 Summary:  The development libraries and header files for gd
-Group:    Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: freetype-devel%{?_isa}
 Requires: fontconfig-devel%{?_isa}
@@ -71,6 +96,19 @@ Requires: libwebp-devel%{?_isa}
 Requires: libX11-devel%{?_isa}
 Requires: libXpm-devel%{?_isa}
 Requires: zlib-devel%{?_isa}
+%if %{with liq}
+Requires: libimagequant-devel%{?_isa}
+%endif
+%if %{with raqm}
+Requires: libraqm-devel
+%endif
+%if %{with avif}
+Requires: libavif-devel
+%endif
+%if %{with heif}
+Requires: libheif-devel
+%endif
+
 
 %description devel
 The gd-devel package contains the development libraries and header
@@ -79,17 +117,8 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
 
 %prep
 %setup -q -n libgd-%{version}%{?prever:-%{prever}}
-%patch1 -p1 -b .mlib
-%patch2 -p1 -b .build
-%patch3 -p1 -b .upstream
-
-%if 0%{?fedora} >= 26
-# TODO - tests using freetype 2.7 are failing
-# https://github.com/libgd/libgd/issues/302
-# https://github.com/libgd/libgd/issues/217
-sed -i -e "s|libgd_test_programs +=|libgd_freetype_test_program =|" tests/freetype/Makemodule.am
-sed -i -e "s|libgd_test_programs +=|libgd_freetype_test_program +=|" tests/gdimagestringft/Makemodule.am
-%endif
+%patch -P0 -p1
+%patch -P1 -p1
 
 : $(perl config/getver.pl)
 
@@ -104,7 +133,7 @@ fi
 
 %build
 # Provide a correct default font search path
-CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
+CFLAGS="-std=gnu17 $RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
 /usr/share/fonts/bitstream-vera:\
 /usr/share/fonts/dejavu:\
 /usr/share/fonts/default/Type1:\
@@ -116,12 +145,13 @@ CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
 CFLAGS="$CFLAGS -msse -mfpmath=sse"
 %endif
 
-%ifarch aarch64 ppc64 ppc64le s390 s390x
+%ifarch aarch64 ppc64 ppc64le s390 s390x x86_64 riscv64
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1359680
 export CFLAGS="$CFLAGS -ffp-contract=off"
 %endif
 
 %configure \
+    --enable-gd-formats \
     --with-tiff=%{_prefix} \
     --disable-rpath
 make %{?_smp_mflags}
@@ -134,17 +164,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a
 
 
 %check
-%ifarch %{ix86}
-# See https://github.com/libgd/libgd/issues/359
-XFAIL_TESTS="gdimagegrayscale/basic $XFAIL_TESTS"
-%endif
-%if 0%{?fedora} >= 26
-# See https://github.com/libgd/libgd/issues/363
-XFAIL_TESTS="freetype/bug00132 $XFAIL_TESTS"
-XFAIL_TESTS="gdimagestringft/gdimagestringft_bbox $XFAIL_TESTS"
-%endif
-
-export XFAIL_TESTS
+# Workaround to https://github.com/libgd/libgd/issues/763
+export TMPDIR=/tmp
 
 : Upstream test suite
 make check
@@ -153,9 +174,7 @@ make check
 grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 
 %files
@@ -165,16 +184,180 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc
 
 %files progs
 %{_bindir}/*
-%exclude %{_bindir}/gdlib-config
 
 %files devel
-%{_bindir}/gdlib-config
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/gdlib.pc
 
 
 %changelog
+* Tue Sep 09 2025 Sandro Mani <manisandro@gmail.com> - 2.3.3-20
+- Rebuild (libimagequant)
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Mar 06 2024 Richard W.M. Jones <rjones@redhat.com> - 2.3.3-16
+- Bump and rebuild package (for riscv64)
+
+* Wed Jan 31 2024 František Zatloukal <fzatlouk@redhat.com> - 2.3.3-15
+- Rebuilt for libavif 1.0.3
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Mar 04 2023 Sandro Mani <manisandro@gmail.com> - 2.3.3-11
+- Rebuild (libimagequant)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Dec 01 2022 Kalev Lember <klember@redhat.com> - 2.3.3-9
+- Rebuild for new libavif
+
+* Sun Oct 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.3-8
+- Rebuild for new libavif
+
+* Sun Oct 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.3-7
+- Rebuild for new libavif
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Nov 29 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.3-4
+- Rebuild for libavif soname bump
+
+* Fri Nov 19 2021 Remi Collet <remi@remirepo.net> - 2.3.3-3
+- disable libraqm usage, see #2022957
+
+* Mon Sep 20 2021 Paul Howarth <paul@city-fan.org> - 2.3.3-2
+- Explicitly enable gd/gd2 formats, wanted by perl bindings (#2005916)
+
+* Mon Sep 13 2021 Remi Collet <remi@remirepo.net> - 2.3.3-1
+- update to 2.3.3
+- open https://github.com/libgd/libgd/pull/766 missing macros
+- open https://github.com/libgd/libgd/pull/767 missing headers
+
+* Tue Jul 27 2021 Florian Weimer <fweimer@redhat.com> - 2.3.2-9
+- Rebuild again for libavif soname bump
+
+* Thu Jul 22 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.2-8
+- Rebuild for libavif soname bump
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jul 19 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.2-6
+- Rebuild for libavif soname bump
+
+* Sun May 23 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.2-5
+- Rebuild for libavif soname bump
+
+* Mon Mar 29 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.2-4
+- Rebuild for libavif soname bump
+
+* Wed Mar 17 2021 Filip Januš <fjanus@redhat.com> - 2.3.2-3
+- Add condition if fedora for packages not available in RHEL
+
+* Mon Mar  8 2021 Remi Collet <remi@remirepo.net> - 2.3.2-2
+- enable avif support
+- use bcond
+
+* Mon Mar 08 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.3.2-1
+- rebase to version 2.3.2
+
+* Wed Feb 3 2021 Filip Januš <fjanus@redhat.com> - 2.3.1-1
+- Upstream released new version 2.3.1
+- patch bug615 is no more needed - fixed by upstream in release
+- gdimagestring16/gdimagestring16 gdimagestringup16/gdimagestringup16 passed on
+  x390s - XFAIL_TEST definition for x390s is no more necessary
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 15 2020 Remi Collet <remi@remirepo.net> - 2.3.0-2
+- fix gdImageStringFT() fails for empty strings
+  https://github.com/libgd/libgd/issues/615
+
+* Tue Mar 24 2020 Remi Collet <remi@remirepo.net> - 2.3.0-1
+- update to 2.3.0
+- add dependency on libraqm
+- remove gdlib-config
+
+* Fri Jan 31 2020 Filip Januš <fjanus@redhat.com> - 2.2.5-12
+- Add patch(gd-2.2.5-null-pointer.patch) - fix Null pointer reference in gdImageClone (gdImagePtr src)
+- Resolves: #1599032
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov 01 2019 odubaj@redhat.com - 2.2.5-10
+- Fixed heap based buffer overflow in gd_color_match.c:gdImageColorMatch() in libgd as used in imagecolormatch()
+- Resolves: RHBZ#1678104 (CVE-2019-6977)
+- Fixed potential double-free in gdImage*Ptr()
+- Resolves: RHBZ#1671391 (CVE-2019-6978)
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Sep 07 2018 mskalick@redhat.com - 2.2.5-7
+- Add missing requires to libimagequent-devel
+
+* Thu Aug 30 2018 mskalick@redhat.com - 2.2.5-6
+- Use libimagequant library (RHBZ#1468338)
+
+* Thu Aug 30 2018 mskalick@redhat.com - 2.2.5-5
+- Check return value in gdImageBmpPtr to avoid double free (CVE-2018-1000222)
+- Don't mark gdimagegrayscale/basic test as failing
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Mar 26 2018 Marek Skalický <mskalick@redhat.com> - 2.2.5-3
+- Fix CVE-2018-5711 - Potential infinite loop in gdImageCreateFromGifCtx
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 30 2017 Remi Collet <remi@fedoraproject.org> - 2.2.5-1
+- Update to 2.2.5
+- fix double-free in gdImagePngPtr(). CVE-2017-6362
+- fix buffer over-read into uninitialized memory. CVE-2017-7890
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 01 2017 Sandro Mani <manisandro@gmail.com> - 2.2.4-2
+- Rebuild (libwebp)
+
 * Wed Jan 18 2017 Remi Collet <remi@fedoraproject.org> - 2.2.4-1
 - Update to 2.2.4
 

getlib.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+GETVER="${0%/*}/getver.pl"
+GDLIB_MAJOR=$("${GETVER}" MAJOR)
+GDLIB_MINOR=$("${GETVER}" MINOR)
+GDLIB_REVISION=$("${GETVER}" RELEASE)
+
+# Dynamic library version information
+# See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
+
+GDLIB_LT_CURRENT=3
+# This is the version where the soname (current above) changes.  We use it
+# to reset the revision base back to zero.  It's a bit of a pain, but some
+# systems restrict the revision range below to [0..255] (like OS X).
+GDLIB_PREV_MAJOR=2
+GDLIB_PREV_MINOR=2
+# This isn't 100% correct, but it tends to be a close enough approximation
+# for how we manage the codebase.  It's rare to do a release that doesn't
+# modify the library since this project is centered around the library.
+GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION ))
+GDLIB_LT_AGE=0
+
+# The first three fields we feed into libtool and the OS target determines how
+# they get used.  The last two fields we feed into cmake.  We use the same rules
+# as Linux SONAME versioning in libtool, but cmake should handle it for us.
+case $1 in
+CURRENT)
+	printf '%s' "${GDLIB_LT_CURRENT}"
+	;;
+REVISION)
+	printf '%s' "${GDLIB_LT_REVISION}"
+	;;
+AGE)
+	printf '%s' "${GDLIB_LT_AGE}"
+	;;
+VERSION)
+	printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE )).${GDLIB_LT_AGE}.${GDLIB_LT_REVISION}"
+	;;
+SONAME)
+	printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))"
+	;;
+esac

libgd-flip.patch

@@ -0,0 +1,50 @@
+From f4bc1f5c26925548662946ed7cfa473c190a104a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 13 Sep 2021 14:57:52 +0200
+Subject: [PATCH 1/2] Revert "Fix #318, these macros are not used as planed, we
+ have separate functions for each"
+
+This reverts commit bdc281eadb1d58d5c0c7bbc1125ee4674256df08.
+---
+ src/gd.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/gd.h b/src/gd.h
+index 30560395..1ad9e637 100644
+--- a/src/gd.h
++++ b/src/gd.h
+@@ -1604,6 +1604,11 @@ BGD_DECLARE(void) gdImageFlipHorizontal(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipVertical(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipBoth(gdImagePtr im);
+ 
++#define GD_FLIP_HORINZONTAL 1 /* typo, kept for BC */
++#define GD_FLIP_HORIZONTAL 1
++#define GD_FLIP_VERTICAL 2
++#define GD_FLIP_BOTH 3
++
+ /**
+  * Group: Crop
+  *
+
+From e47c619d792455aad23708d2ec2947455394427e Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 13 Sep 2021 14:59:47 +0200
+Subject: [PATCH 2/2] add comment to not remove these macros
+
+---
+ src/gd.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gd.h b/src/gd.h
+index 1ad9e637..71f5a89c 100644
+--- a/src/gd.h
++++ b/src/gd.h
+@@ -1604,6 +1604,8 @@ BGD_DECLARE(void) gdImageFlipHorizontal(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipVertical(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipBoth(gdImagePtr im);
+ 
++/* Macros still used in gd extension up to PHP 8.0
++   so please keep these unused macros for now */
+ #define GD_FLIP_HORINZONTAL 1 /* typo, kept for BC */
+ #define GD_FLIP_HORIZONTAL 1
+ #define GD_FLIP_VERTICAL 2

libgd-iostream.patch

@@ -0,0 +1,35 @@
+From 01bcbdcae35b90de082012e639094c711a7aa2b3 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 13 Sep 2021 15:05:18 +0200
+Subject: [PATCH] install missing header, used by gdpp.h
+
+---
+ src/CMakeLists.txt | 1 +
+ src/Makefile.am    | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3839bc78..c1eea100 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -194,6 +194,7 @@ install(FILES
+ 	gdfontt.h
+ 	gdfx.h
+ 	gdpp.h
++	gd_io_stream.h
+ 	DESTINATION include)
+ 
+ CONFIGURE_FILE(../config/gdlib.pc.cmake gdlib.pc @ONLY)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index dbe9243c..c8c779f1 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -52,7 +52,7 @@ EXTRA_DIST = \
+ 	msinttypes/inttypes.h \
+ 	msinttypes/stdint.h
+ 
+-include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h gd_color_map.h gd_errors.h gdpp.h
++include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h gd_color_map.h gd_errors.h gdpp.h gd_io_stream.h
+ 
+ lib_LTLIBRARIES = libgd.la
+ 

sources

@@ -1 +1 @@
-SHA512 (libgd-2.2.4.tar.xz) = 07903f322c4f6ab392508b0f60c38ca133699111ea92995dc6cd9379210d598bcb24a46c19657884d9e252f8663d0ee8c89c600e3a382a5ae598198c190f39b5
+SHA512 (libgd-2.3.3.tar.xz) = aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c