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

update

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=191
This commit is contained in:
Dirk Stoecker 2014-02-26 20:41:49 +00:00 committed by Git OBS Bridge
parent 00a306ae73
commit f1340e34e7
5 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ImageMagick-6.7.6.1-no-dist-lzip.patch
View File

@ -2,7 +2,7 @@ Index: ImageMagick-6.7.6-1/configure.ac
=================================================================== ===================================================================
--- ImageMagick-6.7.6-1.orig/configure.ac --- ImageMagick-6.7.6-1.orig/configure.ac
+++ ImageMagick-6.7.6-1/configure.ac +++ ImageMagick-6.7.6-1/configure.ac
@@ -128,7 +128,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl @@ -160,7 +160,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl
# Ensure that make can run correctly # Ensure that make can run correctly
AM_SANITY_CHECK AM_SANITY_CHECK

2
ImageMagick-6.8.5.7-no-XPMCompliance.patch
View File

@ -2,7 +2,7 @@ Index: ImageMagick-6.8.5-7/coders/xpm.c
=================================================================== ===================================================================
--- ImageMagick-6.8.5-7.orig/coders/xpm.c --- ImageMagick-6.8.5-7.orig/coders/xpm.c
+++ ImageMagick-6.8.5-7/coders/xpm.c +++ ImageMagick-6.8.5-7/coders/xpm.c
@@ -382,7 +382,7 @@ static Image *ReadXPMImage(const ImageIn @@ -386,7 +386,7 @@ static Image *ReadXPMImage(const ImageIn
image->storage_class=DirectClass; image->storage_class=DirectClass;
image->matte=MagickTrue; image->matte=MagickTrue;
} }

6
ImageMagick.changes
View File

@ -2,11 +2,7 @@
Wed Feb 26 20:17:35 UTC 2014 - opensuse@dstoecker.de Wed Feb 26 20:17:35 UTC 2014 - opensuse@dstoecker.de
- update to 6.8.8-7 - update to 6.8.8-7
- remove disable_mat_test.patch (fixed upstream)
-------------------------------------------------------------------
Wed Feb 26 15:59:07 UTC 2014 - schwab@suse.de
- Apply disable_mat_test.patch also on m68k
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 18 07:28:51 UTC 2014 - pgajdos@suse.com Tue Feb 18 07:28:51 UTC 2014 - pgajdos@suse.com

5
ImageMagick.spec
View File

@ -78,7 +78,6 @@ Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch
# 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 # http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=24957
Patch12: disable_mat_test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n perl-PerlMagick %package -n perl-PerlMagick
@ -143,9 +142,6 @@ BuildArch: noarch
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch11 -p1 %patch11 -p1
%ifarch ppc ppc64 s390 s390x m68k
%patch12
%endif
%build %build
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS"
@ -397,4 +393,5 @@ support multiple generations of an image in memory at one time.
%description doc %description doc
HTML documentation for ImageMagick library and scene examples. HTML documentation for ImageMagick library and scene examples.
%changelog %changelog

13
disable_mat_test.patch
View File

@ -1,13 +0,0 @@
Index: PerlMagick/t/read.t
===================================================================
--- PerlMagick/t/read.t.orig 2013-11-18 14:03:16.000000000 +0100
+++ PerlMagick/t/read.t 2014-02-13 15:03:03.017996724 +0100
@@ -74,7 +74,7 @@
print("MAT (MatLab gray 64-bit LSB double) ...\n");
++$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.22, 1.02);
print("MAT (MatLab RGB 8-bit LSB integer) ...\n");
++$test;