commit b3e2ec24c9ad644abe42ef8225c0394967fc139c
Author: Jakub Bogusz <[email protected]>
Date: Thu Jul 1 20:23:40 2021 +0200
- updated to 2.3.2
- removed obsolete missing patch
- added avif and heif support (via libavif and libheif)
- disable one heif test failing because of missing input file
gd-missing.patch | 45 ---------------------------------------------
gd.spec | 28 +++++++++++++++++-----------
2 files changed, 17 insertions(+), 56 deletions(-)
---
diff --git a/gd.spec b/gd.spec
index 3f83a2b..94fae31 100644
--- a/gd.spec
+++ b/gd.spec
@@ -1,6 +1,8 @@
#
# Conditional build:
+%bcond_without avif # AVIF support via libavif
%bcond_without fontconfig # fontconfig support
+%bcond_without heif # HEIF support via libheif
%bcond_with libimagequant # LIQ quantization method support (breaks
transparency in TrueColor->palette conversion)
%bcond_without raqm # RAQM complex text layout support
%bcond_with sse # SSE math on ix86
@@ -15,22 +17,23 @@ Summary(es.UTF-8): Biblioteca para manipulación de imágenes
Summary(pl.UTF-8): Biblioteka do tworzenia grafiki w formacie PNG, JPEG
Summary(pt_BR.UTF-8): Biblioteca para manipulação de imagens
Name: gd
-Version: 2.3.0
+Version: 2.3.2
Release: 1
License: BSD-like
Group: Libraries
#Source0Download: https://github.com/libgd/libgd/releases
Source0:
https://github.com/libgd/libgd/releases/download/%{name}-%{version}/lib%{name}-%{version}.tar.xz
-# Source0-md5: 44e052abf0914bf1b93ceb1af564766f
+# Source0-md5: 0ee844caca06bb02bf4b4dabdfab4fb1
Patch0: %{name}-fontpath.patch
-Patch1: %{name}-missing.patch
-Patch2: %{name}-loop.patch
+Patch1: %{name}-loop.patch
URL: https://libgd.github.io/
BuildRequires: autoconf >= 2.54
BuildRequires: automake
%{?with_fontconfig:BuildRequires: fontconfig-devel}
BuildRequires: freetype-devel >= 1:2.1.10
BuildRequires: gettext-tools
+%{?with_avif:BuildRequires: libavif-devel >= 0.8.2}
+%{?with_heif:BuildRequires: libheif-devel >= 1.7.0}
%{?with_libimagequant:BuildRequires: libimagequant-devel}
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel >= 2:1.4.0
@@ -45,6 +48,8 @@ BuildRequires: tar >= 1:1.22
BuildRequires: xz
BuildRequires: zlib-devel
Requires: freetype >= 1:2.1.10
+%{?with_avif:Requires: libavif >= 0.8.2}
+%{?with_heif:Requires: libheif >= 1.7.0}
Provides: gd(gif) = %{version}-%{release}
# versioned by php version rotate_from_php code comes from
Provides: gd(imagerotate) = 5.2.0
@@ -92,6 +97,8 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: fontconfig-devel
Requires: freetype-devel >= 1:2.1.10
+%{?with_avif:Requires: libavif-devel >= 0.8.2}
+%{?with_heif:Requires: libheif-devel >= 1.7.0}
%{?with_libimagequant:Requires: libimagequant-devel}
Requires: libjpeg-devel
Requires: libpng-devel
@@ -164,13 +171,6 @@ para uso pelos programas que usam a libgd.
%setup -q -n libgd-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-
-chmod 755 config/getlib.sh
-# hack to avoid inclusion of -s in --ldflags
-#%{__sed} -i -e 's,@LDFLAGS@,,g' config/gdlib-config.in
-# disable error caused by subdir-objects warning in automake 1.14
-#%{__sed} -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac
%build
%{__libtoolize}
@@ -184,7 +184,9 @@ CFLAGS="%{rpmcflags} -msse -mfpmath=sse"
%endif
%endif
%configure \
+ %{!?with_avif:--without-avif} \
%{!?with_fontconfig:--without-fontconfig} \
+ %{!?with_heif:--without-heif} \
%{!?with_libimagequant:--without-liq} \
%{!?with_raqm:--without-raqm} \
%{!?with_xpm:--without-xpm}
@@ -203,6 +205,10 @@ XFAIL_TESTS="$XFAIL_TESTS gdimagecopyresampled/bug00201"
# https://github.com/libgd/libgd/issues/613
XFAIL_TESTS="$XFAIL_TESTS gdimagestringft/gdimagestringft_bbox"
%endif
+%if %{with heif}
+# input file (label.heic) is missing
+XFAIL_TESTS="$XFAIL_TESTS heif/heif_read"
+%endif
export XFAIL_TESTS
%{__make} check
%endif
diff --git a/gd-missing.patch b/gd-missing.patch
deleted file mode 100644
index edf676a..0000000
--- a/gd-missing.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- libgd-2.3.0/config/getlib.sh.orig 1970-01-01 01:00:00.000000000 +0100
-+++ libgd-2.3.0/config/getlib.sh 2020-04-18 21:06:18.162626216 +0200
-@@ -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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gd.git/commitdiff/b3e2ec24c9ad644abe42ef8225c0394967fc139c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
