pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 222224 from graphics

Browse Source 
- modified patches [bnc#843673]:
  * disable_mat_test.patch -- rather than disable the test,
    use upstream solution (increase threshold for mean error)
    -- use this patch also for s390, s390x

OBS-URL: https://build.opensuse.org/request/show/222224
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=103
This commit is contained in:
Stephan Kulow 2014-02-15 16:16:44 +00:00 committed by Git OBS Bridge
commit 27386fbefb
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ImageMagick.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Feb 13 14:03:12 UTC 2014 - pgajdos@suse.com
- modified patches [bnc#843673]:
* disable_mat_test.patch -- rather than disable the test,
use upstream solution (increase threshold for mean error)
-- use this patch also for s390, s390x
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 8 18:01:26 UTC 2014 - pgajdos@suse.com Wed Jan 8 18:01:26 UTC 2014 - pgajdos@suse.com

6
ImageMagick.spec
View File

@ -76,6 +76,7 @@ Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch
# bugs # bugs
# will ask upstream if needed, or if other solution exists # will ask upstream if needed, or if other solution exists
Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch
# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=24957
Patch12: disable_mat_test.patch Patch12: disable_mat_test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -141,8 +142,8 @@ BuildArch: noarch
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch11 -p1 %patch11 -p1
%ifarch ppc ppc64 %ifarch ppc ppc64 s390 s390x
%patch12 -p1 %patch12
%endif %endif
%build %build
@ -407,4 +408,5 @@ HTML documentation for ImageMagick library and scene examples.
%changelog %changelog

27
disable_mat_test.patch
View File

@ -1,24 +1,13 @@
Index: ImageMagick-6.8.6-9/PerlMagick/t/read.t Index: PerlMagick/t/read.t
=================================================================== ===================================================================
--- ImageMagick-6.8.6-9.orig/PerlMagick/t/read.t --- PerlMagick/t/read.t.orig 2013-11-18 14:03:16.000000000 +0100
+++ ImageMagick-6.8.6-9/PerlMagick/t/read.t +++ PerlMagick/t/read.t 2014-02-13 15:03:03.017996724 +0100
@@ -15,7 +15,7 @@ @@ -74,7 +74,7 @@
#
# Test reading formats supported directly by ImageMagick.
#
-BEGIN { $| = 1; $test=1; print "1..47\n"; }
+BEGIN { $| = 1; $test=1; print "1..46\n"; }
END {print "not ok $test\n" unless $loaded;}
use Image::Magick;
$loaded=1;
@@ -72,10 +72,6 @@ print("MAT (MatLab gray 8-bit MSB intege
++$test;
testReadCompare('input_gray_msb_08bit.mat', 'reference/read/input_gray_msb_08bit_mat.miff', q//, 0.2, 1.02);
-print("MAT (MatLab gray 64-bit LSB double) ...\n"); print("MAT (MatLab gray 64-bit LSB double) ...\n");
-++$test; ++$test;
-testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.2, 1.02); -testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.2, 1.02);
- +testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.22, 1.02);
print("MAT (MatLab RGB 8-bit LSB integer) ...\n"); print("MAT (MatLab RGB 8-bit LSB integer) ...\n");
++$test; ++$test;
testReadCompare('input_rgb_lsb_08bit.mat', 'reference/read/input_rgb_lsb_08bit_mat.miff', q//, 0.2, 1.02);