diff --git a/ImageMagick-read.t-targa.patch b/ImageMagick-read.t-targa.patch deleted file mode 100644 index 63e1b1a..0000000 --- a/ImageMagick-read.t-targa.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ImageMagick-7.0.9-6/PerlMagick/t/read.t -=================================================================== ---- ImageMagick-7.0.9-6.orig/PerlMagick/t/read.t 2019-11-26 12:55:49.000000000 +0100 -+++ ImageMagick-7.0.9-6/PerlMagick/t/read.t 2019-11-27 11:58:18.210589129 +0100 -@@ -162,7 +162,7 @@ testReadCompare('sun:input.im24', 'refer - - print("Truevision Targa image file ...\n"); - ++$test; --testReadCompare('input.tga', 'reference/read/input_tga.miff', q//, 0.0, 0.0); -+testReadCompare('input.tga', 'reference/read/input_tga.miff', q//, 0.1, 1.0); - - print("PSX TIM file ...\n"); - ++$test; diff --git a/ImageMagick-targa.patch b/ImageMagick-targa.patch new file mode 100644 index 0000000..9b8dd63 --- /dev/null +++ b/ImageMagick-targa.patch @@ -0,0 +1,26 @@ +Index: ImageMagick-7.0.9-6/PerlMagick/t/read.t +=================================================================== +--- ImageMagick-7.0.9-6.orig/PerlMagick/t/read.t 2019-11-26 12:55:49.000000000 +0100 ++++ ImageMagick-7.0.9-6/PerlMagick/t/read.t 2019-11-29 12:46:51.788561500 +0100 +@@ -162,7 +162,7 @@ testReadCompare('sun:input.im24', 'refer + + print("Truevision Targa image file ...\n"); + ++$test; +-testReadCompare('input.tga', 'reference/read/input_tga.miff', q//, 0.0, 0.0); ++testReadCompare('input.tga', 'reference/read/input_tga.miff', q//, 0.1, 1.0); + + print("PSX TIM file ...\n"); + ++$test; +Index: ImageMagick-7.0.9-6/PerlMagick/t/write.t +=================================================================== +--- ImageMagick-7.0.9-6.orig/PerlMagick/t/write.t 2019-11-26 12:55:49.000000000 +0100 ++++ ImageMagick-7.0.9-6/PerlMagick/t/write.t 2019-11-29 12:47:44.072847607 +0100 +@@ -190,7 +190,7 @@ print("Truevision Targa image file ...\n + testReadWrite( 'TGA:input.tga', + 'TGA:output.tga', + q//, +- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e'); ++ '5fd8b14e213578e41bb598825d5a9431f025de653c15896c696063fc3ed472ff'); + + print("Khoros Visualization image file ...\n"); + ++$test; diff --git a/ImageMagick.changes b/ImageMagick.changes index 65f74cc..8a2ebd1 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -15,7 +15,7 @@ Wed Nov 27 11:05:14 UTC 2019 - pgajdos@suse.com * Support dng:use-camera-wb option. - added patches https://github.com/ImageMagick/ImageMagick/issues/1792 - + ImageMagick-read.t-targa.patch + + ImageMagick-targa.patch ------------------------------------------------------------------- Wed Nov 20 08:08:39 UTC 2019 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index a79d200..bd9f424 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -48,9 +48,9 @@ Patch0: ImageMagick-configuration-SUSE.patch Patch2: ImageMagick-library-installable-in-parallel.patch #%%ifarch s390x s390 ppc64 ppc Patch3: ImageMagick-s390-disable-tests.patch -# https://github.com/ImageMagick/ImageMagick/issues/1792 -Patch4: ImageMagick-read.t-targa.patch #%%endif +# https://github.com/ImageMagick/ImageMagick/issues/1792 +Patch4: ImageMagick-targa.patch BuildRequires: chrpath BuildRequires: fdupes BuildRequires: gcc-c++