commit da0dc60e6486d4946100898fefb2f1217ae8c707
Author: Jan Rękorajski <[email protected]>
Date: Sun Dec 25 20:45:02 2016 +0100
- fix building with ImageMagick 7
- rel 12
gtatool.spec | 4 +++-
imagemagick7.patch | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/gtatool.spec b/gtatool.spec
index 283099f..b1b6784 100644
--- a/gtatool.spec
+++ b/gtatool.spec
@@ -24,7 +24,7 @@ Summary: Tools to manipulate Generic Tagged Array (GTA)
files
Summary(pl.UTF-8): Narzędzia do obróbki plików GTA (ogólnych tablic
etykietowanych)
Name: gtatool
Version: 2.0.1
-Release: 11
+Release: 12
License: GPL v3+
Group: Applications/File
Source0:
http://download.savannah.gnu.org/releases/gta/%{name}-%{version}.tar.xz
@@ -34,6 +34,7 @@ Patch1: %{name}-getopt.patch
Patch2: %{name}-bashcomp.patch
Patch3: pfstools2.patch
Patch4: ffmpeg3.patch
+Patch5: imagemagick7.patch
URL: http://gta.nongnu.org/gtatool.html
%{?with_magick:BuildRequires: ImageMagick-c++-devel}
%{?with_openexr:BuildRequires: OpenEXR-devel}
@@ -288,6 +289,7 @@ Bashowe uzupełnianie parametrów programu gtatool.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%{__libtoolize}
diff --git a/imagemagick7.patch b/imagemagick7.patch
new file mode 100644
index 0000000..2d8bf79
--- /dev/null
+++ b/imagemagick7.patch
@@ -0,0 +1,24 @@
+diff -ur gtatool-2.0.1/configure.ac gtatool-2.0.1-im7/configure.ac
+--- gtatool-2.0.1/configure.ac 2016-12-25 20:39:54.318816756 +0100
++++ gtatool-2.0.1-im7/configure.ac 2016-12-25 20:34:09.014766195 +0100
+@@ -368,7 +368,7 @@
+ AC_MSG_WARN([$libmagick_PKG_ERRORS])
+ AC_MSG_WARN([Disabled the from-magick and to-magick commands.])])
+ else
+- PKG_CHECK_MODULES([libmagick], [ImageMagick++ >= 0.0], [],
++ PKG_CHECK_MODULES([libmagick], [Magick++ >= 0.0], [],
+ [magick="no "
+ AC_MSG_WARN([ImageMagick++ library not found:])
+ AC_MSG_WARN([$libmagick_PKG_ERRORS])
+diff -ur gtatool-2.0.1/src/conv-magick/from-magick.cpp
gtatool-2.0.1-im7/src/conv-magick/from-magick.cpp
+--- gtatool-2.0.1/src/conv-magick/from-magick.cpp 2014-09-20
20:16:58.484142786 +0200
++++ gtatool-2.0.1-im7/src/conv-magick/from-magick.cpp 2016-12-25
20:39:28.231335556 +0100
+@@ -102,7 +102,7 @@
+ bool is_graylevel = false;
+ if (format.value().empty())
+ {
+- has_alpha = imgs[i].matte();
++ has_alpha = imgs[i].alpha();
+ is_graylevel = (imgs[i].colorSpace() ==
Magick::GRAYColorspace);
+ }
+ else if (format.value().compare("l") == 0)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtatool.git/commitdiff/da0dc60e6486d4946100898fefb2f1217ae8c707
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
