rpms/ImageMagick
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-riscv64

Browse Source 
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2020-05-17 16:24:47 +03:00
commit 4f062847d3
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
3 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,4 +1 @@
/ImageMagick-6.9.10-23.tar.xz
/ImageMagick-6.9.10-25.tar.xz
/ImageMagick-6.9.10-27.tar.xz
/ImageMagick-6.9.10-28.tar.xz
/ImageMagick-6.9.10-86.tar.xz

48
ImageMagick.spec
View File

@ -1,5 +1,5 @@
%global VER 6.9.10
%global Patchlevel 28
%global Patchlevel 86
Name: ImageMagick
%if 0%{?fedora} >= 27
@ -10,7 +10,7 @@ Epoch: 1
Epoch: 0
%endif
Version: %{VER}.%{Patchlevel}
Release: 3%{?dist}.rvre1
Release: 3%{?dist}
Summary: An X application for displaying and manipulating images
License: ImageMagick
@ -34,6 +34,10 @@ BuildRequires: lcms2-devel, libxml2-devel, librsvg2-devel
BuildRequires: fftw-devel, ilmbase-devel, OpenEXR-devel, libwebp-devel
BuildRequires: jbigkit-devel
BuildRequires: openjpeg2-devel >= 2.1.0
BuildRequires: graphviz-devel >= 2.9.0
BuildRequires: libraqm-devel
BuildRequires: liblqr-1-devel
BuildRequires: LibRaw-devel >= 0.14.8
BuildRequires: autoconf automake gcc gcc-c++
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
@ -158,6 +162,8 @@ cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
%build
autoconf -f -i
# Reduce thread contention, upstream sets this flag for Linux hosts
export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE"
%configure \
--enable-shared \
--disable-static \
@ -176,7 +182,11 @@ autoconf -f -i
--without-dps \
--without-gcc-arch \
--with-jbig \
--with-openjp2
--with-openjp2 \
--with-raw \
--with-lqr \
--with-gvc \
--with-raqm
# Do *NOT* use %%{?_smp_mflags}, this causes PerlMagick to be silently misbuild
make
@ -238,12 +248,10 @@ multilibFileVersions %{buildroot}%{_includedir}/%{name}-6/magick/magick-baseconf
multilibFileVersions %{buildroot}%{_includedir}/%{name}-6/magick/version.h
# Fonts must be packaged separately. It does not have matter and demos work without it.
rm PerlMagick/demo/Generic.ttf
%check
export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}
make %{?_smp_mflags} check
rm PerlMagick/demo/Generic.ttf
%ldconfig_scriptlets libs
%ldconfig_scriptlets c++
@ -317,11 +325,31 @@ make %{?_smp_mflags} check
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog
* Sun May 17 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 6.9.10.28-3.rvre1
- Rebuilt for Fedora RISCV, no changes
* Mon May 11 2020 Gwyn Ciesla <gwync@protonmail.com> - 1:6.9.10.86-3
- Rebuild for new LibRaw
* Mon Jul 29 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 6.9.10.28-3.fc30.rvre0
- Rebuilt for Fedora RISCV, no changes
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.9.10.86-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 13 2020 Michael Cronenworth <mike@cchtml.com> - 1:6.9.10.86-1
- Update to 6.9.10.86
* Tue Nov 26 2019 Michael Cronenworth <mike@cchtml.com> - 1:6.9.10.75-1
- Update to 6.9.10.75
* Fri Oct 04 2019 Pete Walter <pwalter@fedoraproject.org> - 1:6.9.10.67-1
- Update to 6.9.10.67
* Sat Sep 21 2019 Pete Walter <pwalter@fedoraproject.org> - 1:6.9.10.65-1
- Update to 6.9.10.65
* Fri Sep 13 2019 Michael Cronenworth <mike@cchtml.com> - 1:6.9.10.64-1
- Update to 6.9.10.64
- Set threading option (https://src.fedoraproject.org/rpms/ImageMagick/pull-request/2)
- Enable more image formats (RHBZ#1485823)
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.9.10.28-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1:6.9.10.28-3
- Perl 5.30 rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (ImageMagick-6.9.10-28.tar.xz) = 300632f540ec533ec981d8173135b33422b9d53d4d5fa5d619463030749d3822a74dee14ab0e076187dff6b589857fa72cb5a28418b81348f9ed493a3c8d3a5e
SHA512 (ImageMagick-6.9.10-86.tar.xz) = 6d3362a83168ecc5b710bc020db2fa30495d442ffff72a77a99fb8be56225283660cd00ac2d1f75c5d19b44c64b212221aadda90fc0a0d76cc2e1e32bca62ffa