Hello community,
here is the log from the commit of package pfstools for openSUSE:Factory checked in at 2017-04-07 14:20:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pfstools (Old)
and /work/SRC/openSUSE:Factory/.pfstools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pfstools"
Fri Apr 7 14:20:36 2017 rev:34 rq:483254 version:2.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/pfstools/pfstools.changes 2016-03-17 16:47:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pfstools.new/pfstools.changes 2017-04-07 14:20:36.764077608 +0200
@@ -1,0 +2,6 @@
+Tue Mar 28 13:26:05 UTC 2017 - pgajdos@suse.com
+
+- build also with ImageMagick-7
+ + pfstools-ImageMagick7.patch
+
+-------------------------------------------------------------------
New:
----
pfstools-ImageMagick7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pfstools.spec ++++++
--- /var/tmp/diff_new_pack.AHljBX/_old 2017-04-07 14:20:37.495974250 +0200
+++ /var/tmp/diff_new_pack.AHljBX/_new 2017-04-07 14:20:37.499973685 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pfstools
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,9 @@
Patch4: pfstools-stdlib.patch
Patch5: pfstools-1.8.1-fix-return-in-nonvoid.patch
Patch6: pfstools-fix-libpfs-linkage.patch
+# patch derived from https://github.com/pld-linux/pfstools/commit/67bd2304e516545f2b203f975ac5dd3...
+# I guess it could go upstream as is; sent email to mantiuk at gmail
+Patch7: pfstools-ImageMagick7.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.mpi-sb.mpg.de/resources/pfstools/
BuildRequires: Mesa
@@ -178,6 +181,7 @@
%patch4
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
%cmake
++++++ pfstools-ImageMagick7.patch ++++++
https://github.com/pld-linux/pfstools/commit/67bd2304e516545f2b203f975ac5dd3...
Index: pfstools-2.0.4/src/fileformat/pfsinimgmagick.cpp
===================================================================
--- pfstools-2.0.4.orig/src/fileformat/pfsinimgmagick.cpp 2015-07-15 11:58:19.000000000 +0200
+++ pfstools-2.0.4/src/fileformat/pfsinimgmagick.cpp 2017-03-28 15:14:56.124621175 +0200
@@ -35,6 +35,7 @@
#define PROG_NAME "pfsinimgmagick"
+using namespace Magick;
class QuietException
{
@@ -112,7 +113,11 @@ void readFrames( int argc, char* argv[]
Magick::Image imImage( ff.fileName );
VERBOSE_STR << "input image gamma: " << imImage.gamma() << std::endl;
+#if MagickLibVersion >= 0x700
+ bool hasAlpha = imImage.alpha();
+#else
bool hasAlpha = imImage.matte();
+#endif
if( hasAlpha )
VERBOSE_STR << "alpha channel found" << std::endl;
@@ -127,17 +132,30 @@ void readFrames( int argc, char* argv[]
// Copy line by line to pfs::Frame
int pixInd = 0;
- const float maxValue = (float)(1<