Revert "Work around no ImageMagick on EPEL9"

This reverts commit 7adb835ee9.

ImageMagick is now present in EPEL9.
epel9
Benjamin A. Beasley 3 years ago
parent 7adb835ee9
commit 9d5e1a9839

@ -13,9 +13,6 @@
# library and expect it will not be missed. # library and expect it will not be missed.
%bcond_with stb_include %bcond_with stb_include
# ImageMagick is not currently packaged for EPEL9
%bcond_with imagemagick_test
Name: stb Name: stb
# While the individual header-only libraries are versioned, the overall # While the individual header-only libraries are versioned, the overall
# collection is not, and there are no releases. See: # collection is not, and there are no releases. See:
@ -117,9 +114,7 @@ BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: make BuildRequires: make
%if %{with imagemagick_test}
BuildRequires: /usr/bin/convert BuildRequires: /usr/bin/convert
%endif
# No compiled binaries are installed, so this would be empty. # No compiled binaries are installed, so this would be empty.
%global debug_package %{nil} %global debug_package %{nil}
@ -617,7 +612,6 @@ popd
rm -vf output rm -vf output
mkdir -p output mkdir -p output
./tests/image_write_test ./tests/image_write_test
%if %{with imagemagick_test}
# We assume that if ImageMagick can read the output images, then they are valid. # We assume that if ImageMagick can read the output images, then they are valid.
for img in wr6x5_flip.bmp wr6x5_flip.jpg wr6x5_flip.tga wr6x5_regular.hdr \ for img in wr6x5_flip.bmp wr6x5_flip.jpg wr6x5_flip.tga wr6x5_regular.hdr \
wr6x5_regular.png wr6x5_flip.hdr wr6x5_flip.png wr6x5_regular.bmp \ wr6x5_regular.png wr6x5_flip.hdr wr6x5_flip.png wr6x5_regular.bmp \
@ -625,7 +619,6 @@ for img in wr6x5_flip.bmp wr6x5_flip.jpg wr6x5_flip.tga wr6x5_regular.hdr \
do do
convert "output/${img}" 'output/dummy.bmp' convert "output/${img}" 'output/dummy.bmp'
done done
%endif
# As a sanity check, verify that all of the subpackage version numbers appear # As a sanity check, verify that all of the subpackage version numbers appear
# in the corresponding headers. # in the corresponding headers.

Loading…
Cancel
Save