Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/gd.git#3f8f4f35986b02f6d91ca5eb828313a33d498584
This commit is contained in:
DistroBaker
parent
0a55ebca3d
commit
fc412b44f5
49
gd.spec
49
gd.spec
@ -1,10 +1,21 @@
|
||||
%global with_liq 1
|
||||
%global with_raqm 1
|
||||
%if 0%{?rhel}
|
||||
%bcond_with liq
|
||||
%bcond_with raqm
|
||||
%bcond_with avif
|
||||
%else
|
||||
# Enabled by default
|
||||
%bcond_without liq
|
||||
%bcond_without raqm
|
||||
%bcond_without avif
|
||||
%endif
|
||||
# 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.3.1
|
||||
Version: 2.3.2
|
||||
Release: 1%{?prever}%{?short}%{?dist}
|
||||
License: MIT
|
||||
URL: http://libgd.github.io/
|
||||
@ -15,8 +26,6 @@ Source0: libgd-%{version}-%{commit}.tgz
|
||||
%else
|
||||
Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/libgd-%{version}.tar.xz
|
||||
%endif
|
||||
# Missing, temporary workaround, fixed upstream for next version
|
||||
Source1: https://raw.githubusercontent.com/libgd/libgd/gd-%{version}/config/getlib.sh
|
||||
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: fontconfig-devel
|
||||
@ -25,12 +34,18 @@ BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libwebp-devel
|
||||
%if %{with_liq}
|
||||
%if %{with liq}
|
||||
BuildRequires: libimagequant-devel
|
||||
%endif
|
||||
%if %{with_raqm}
|
||||
%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
|
||||
@ -74,12 +89,18 @@ Requires: libwebp-devel%{?_isa}
|
||||
Requires: libX11-devel%{?_isa}
|
||||
Requires: libXpm-devel%{?_isa}
|
||||
Requires: zlib-devel%{?_isa}
|
||||
%if %{with_liq}
|
||||
%if %{with liq}
|
||||
Requires: libimagequant-devel%{?_isa}
|
||||
%endif
|
||||
%if %{with_raqm}
|
||||
%if %{with raqm}
|
||||
Requires: libraqm-devel
|
||||
%endif
|
||||
%if %{with avif}
|
||||
Requires: libavif-devel
|
||||
%endif
|
||||
%if %{with heif}
|
||||
Requires: libheif-devel
|
||||
%endif
|
||||
|
||||
|
||||
%description devel
|
||||
@ -89,7 +110,6 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
|
||||
|
||||
%prep
|
||||
%setup -q -n libgd-%{version}%{?prever:-%{prever}}
|
||||
install -m 0755 %{SOURCE1} config/
|
||||
|
||||
: $(perl config/getver.pl)
|
||||
|
||||
@ -135,9 +155,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a
|
||||
|
||||
%check
|
||||
# minor diff in size
|
||||
%if %{with raqm}
|
||||
XFAIL_TESTS="gdimagestringft/gdimagestringft_bbox"
|
||||
|
||||
export XFAIL_TESTS
|
||||
%endif
|
||||
|
||||
: Upstream test suite
|
||||
make check
|
||||
@ -164,6 +185,12 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Mar 17 2021 Filip Januš <fjanus@redhat.com> - 2.3.2-1
|
||||
- Add condition if fedora for packages not available in RHEL
|
||||
- enable avif support
|
||||
- use bcond
|
||||
- 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
|
||||
|
||||
42
getlib.sh
42
getlib.sh
@ -1,42 +0,0 @@
|
||||
#!/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
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (libgd-2.3.1.tar.xz) = 0b96406a1d62129d7d63f78fc4558062c223a3bfbf9719be86362fd922b72b5dac294524dd1b0a996a4a7a709ee9d2dfc790ee32564add70adad41d044a0ed80
|
||||
SHA512 (libgd-2.3.2.tar.xz) = a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user