Hello community, here is the log from the commit of package pfstools for openSUSE:Factory checked in at 2018-10-17 08:42:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pfstools (Old) and /work/SRC/openSUSE:Factory/.pfstools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pfstools" Wed Oct 17 08:42:03 2018 rev:37 rq:642273 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pfstools/pfstools.changes 2017-10-24 22:24:24.945502947 +0200 +++ /work/SRC/openSUSE:Factory/.pfstools.new/pfstools.changes 2018-10-17 08:42:55.977777818 +0200 @@ -1,0 +2,13 @@ +Tue Oct 16 11:50:44 UTC 2018 - Christophe Giboudeaux <[email protected]> + +- Update to 2.1.0: + * Added support for .yuv files encoded as PQ2020 or HLG2020 + * Use Qt5 instead of Qt4 +- Update the URL +- Refresh patches, use %autosetup -p1 +- Drop pfstools-Qt5.patch. Fixed upstream. +- Run spec-cleaner +- Refresh pfstools-1.8.1-fix-return-in-nonvoid.patch to handle more + cases. + +------------------------------------------------------------------- Old: ---- pfstools-2.0.6.tgz pfstools-Qt5.patch New: ---- pfstools-2.1.0.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pfstools.spec ++++++ --- /var/tmp/diff_new_pack.hD3KCU/_old 2018-10-17 08:42:56.405777455 +0200 +++ /var/tmp/diff_new_pack.hD3KCU/_new 2018-10-17 08:42:56.405777455 +0200 @@ -1,7 +1,7 @@ # # spec file for package pfstools # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -12,29 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define _libname libpfs2 Name: pfstools -Version: 2.0.6 +Version: 2.1.0 Release: 0 Summary: High Dynamic Range Image and Video manipulation tools -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Multimedia/Other -Url: http://www.mpi-sb.mpg.de/resources/pfstools/ +URL: http://pfstools.sourceforge.net/ Source: https://sourceforge.net/projects/pfstools/files/pfstools/%{version}/%{name}-%{version}.tgz Patch1: %{name}-gcc.patch -Patch3: pfstools-octinstall.patch -Patch4: pfstools-stdlib.patch -Patch5: pfstools-1.8.1-fix-return-in-nonvoid.patch -Patch6: pfstools-fix-libpfs-linkage.patch +Patch2: pfstools-octinstall.patch +Patch3: pfstools-stdlib.patch +Patch4: pfstools-1.8.1-fix-return-in-nonvoid.patch +Patch5: pfstools-fix-libpfs-linkage.patch # patch derived from https://github.com/pld-linux/pfstools/commit/67bd2304e516545f2b203f975ac5dd30d2b479b3 # I guess it could go upstream as is; sent email to mantiuk at gmail Patch7: pfstools-ImageMagick7.patch -# PATCH-FEATURE-UPSTREAM pfstools-Qt5.patch -- build against Qt5 -Patch8: pfstools-Qt5.patch BuildRequires: Mesa BuildRequires: blas # previous versions of cmake don't support ImageMagick 7 @@ -69,7 +67,7 @@ %package -n %{_libname} Summary: Library for HDR image and video manipulation -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries %description -n %{_libname} @@ -91,7 +89,7 @@ %package -n pfscalibration Summary: Photometric Calibration of HDR and LDR Cameras -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Multimedia/Other Requires: dcraw Requires: jhead @@ -107,7 +105,7 @@ %package -n pfstmo Summary: Tone Mapping Operators for High Dynamic Range Images -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Multimedia/Other %description -n pfstmo @@ -116,7 +114,7 @@ %package -n pfsview Summary: Qt-based viewer for HDR files -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Multimedia/Other %description -n pfsview @@ -124,7 +122,7 @@ %package -n pfsglview Summary: GL-based viewer for HDR files -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Multimedia/Other %description -n pfsglview @@ -132,7 +130,7 @@ %package exr Summary: EXR file import and export for PFS tools -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Multimedia/Other %description exr @@ -141,7 +139,7 @@ %package imgmagick Summary: ImageMagick file import for PFS tools -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Multimedia/Other %description imgmagick @@ -150,7 +148,7 @@ %package octave Summary: Octave interaction with PFS tools -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Multimedia/Other Requires: octave @@ -160,7 +158,7 @@ %package devel Summary: Development files for libpfs, a library for HDR image and video manipulation -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{_libname} = %{version} @@ -173,14 +171,7 @@ applications that want to make use of libpfs. %prep -%setup -q -%patch1 -%patch3 -p1 -%patch4 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%autosetup -p1 chmod -x ChangeLog %build @@ -198,14 +189,16 @@ %postun -n %{_libname} -p /sbin/ldconfig %files -%doc AUTHORS ChangeLog COPYING README doc/faq.txt +%license COPYING +%doc AUTHORS ChangeLog README doc/faq.txt %dir %{_datadir}/%{name} %{_bindir}/pfsabsolute %{_bindir}/pfscat %{_bindir}/pfsclamp +%{_bindir}/pfscolortransform %{_bindir}/pfscut -%{_bindir}/pfsextractchannels %{_bindir}/pfsdisplayfunction +%{_bindir}/pfsextractchannels %{_bindir}/pfsflip %{_bindir}/pfsgamma %{_bindir}/pfsin @@ -214,19 +207,20 @@ %{_bindir}/pfsinppm %{_bindir}/pfsinrgbe %{_bindir}/pfsintiff +%{_bindir}/pfsinyuv %{_bindir}/pfsout %{_bindir}/pfsouthdrhtml %{_bindir}/pfsoutpfm %{_bindir}/pfsoutppm %{_bindir}/pfsoutrgbe %{_bindir}/pfsouttiff +%{_bindir}/pfsoutyuv %{_bindir}/pfspad %{_bindir}/pfspanoramic +%{_bindir}/pfsretime %{_bindir}/pfsrotate %{_bindir}/pfssize %{_bindir}/pfstag -%{_bindir}/pfscolortransform -%{_bindir}/pfsretime %{_datadir}/pfstools/hdrhtml_c_b2.csv %{_datadir}/pfstools/hdrhtml_c_b3.csv %{_datadir}/pfstools/hdrhtml_c_b4.csv @@ -237,33 +231,35 @@ %{_datadir}/pfstools/hdrhtml_t_b3.csv %{_datadir}/pfstools/hdrhtml_t_b4.csv %{_datadir}/pfstools/hdrhtml_t_b5.csv -%{_mandir}/man1/pfsabsolute.1%{ext_man} -%{_mandir}/man1/pfscat.1%{ext_man} -%{_mandir}/man1/pfsclamp.1%{ext_man} -%{_mandir}/man1/pfscut.1%{ext_man} -%{_mandir}/man1/pfsdisplayfunction.1%{ext_man} -%{_mandir}/man1/pfsextractchannels.1%{ext_man} -%{_mandir}/man1/pfsflip.1%{ext_man} -%{_mandir}/man1/pfsgamma.1%{ext_man} -%{_mandir}/man1/pfsin.1%{ext_man} -%{_mandir}/man1/pfsindcraw.1%{ext_man} -%{_mandir}/man1/pfsinpfm.1%{ext_man} -%{_mandir}/man1/pfsinppm.1%{ext_man} -%{_mandir}/man1/pfsinrgbe.1%{ext_man} -%{_mandir}/man1/pfsintiff.1%{ext_man} -%{_mandir}/man1/pfsout.1%{ext_man} -%{_mandir}/man1/pfsouthdrhtml.1%{ext_man} -%{_mandir}/man1/pfsoutpfm.1%{ext_man} -%{_mandir}/man1/pfsoutppm.1%{ext_man} -%{_mandir}/man1/pfsoutrgbe.1%{ext_man} -%{_mandir}/man1/pfsouttiff.1%{ext_man} -%{_mandir}/man1/pfspad.1%{ext_man} -%{_mandir}/man1/pfspanoramic.1%{ext_man} -%{_mandir}/man1/pfsrotate.1%{ext_man} -%{_mandir}/man1/pfssize.1%{ext_man} -%{_mandir}/man1/pfstag.1%{ext_man} -%{_mandir}/man1/pfscolortransform.1%{ext_man} -%{_mandir}/man1/pfsretime.1%{ext_man} +%{_mandir}/man1/pfsabsolute.1%{?ext_man} +%{_mandir}/man1/pfscat.1%{?ext_man} +%{_mandir}/man1/pfsclamp.1%{?ext_man} +%{_mandir}/man1/pfscolortransform.1%{?ext_man} +%{_mandir}/man1/pfscut.1%{?ext_man} +%{_mandir}/man1/pfsdisplayfunction.1%{?ext_man} +%{_mandir}/man1/pfsextractchannels.1%{?ext_man} +%{_mandir}/man1/pfsflip.1%{?ext_man} +%{_mandir}/man1/pfsgamma.1%{?ext_man} +%{_mandir}/man1/pfsin.1%{?ext_man} +%{_mandir}/man1/pfsindcraw.1%{?ext_man} +%{_mandir}/man1/pfsinpfm.1%{?ext_man} +%{_mandir}/man1/pfsinppm.1%{?ext_man} +%{_mandir}/man1/pfsinrgbe.1%{?ext_man} +%{_mandir}/man1/pfsintiff.1%{?ext_man} +%{_mandir}/man1/pfsinyuv.1%{?ext_man} +%{_mandir}/man1/pfsout.1%{?ext_man} +%{_mandir}/man1/pfsouthdrhtml.1%{?ext_man} +%{_mandir}/man1/pfsoutpfm.1%{?ext_man} +%{_mandir}/man1/pfsoutppm.1%{?ext_man} +%{_mandir}/man1/pfsoutrgbe.1%{?ext_man} +%{_mandir}/man1/pfsouttiff.1%{?ext_man} +%{_mandir}/man1/pfsoutyuv.1%{?ext_man} +%{_mandir}/man1/pfspad.1%{?ext_man} +%{_mandir}/man1/pfspanoramic.1%{?ext_man} +%{_mandir}/man1/pfsretime.1%{?ext_man} +%{_mandir}/man1/pfsrotate.1%{?ext_man} +%{_mandir}/man1/pfssize.1%{?ext_man} +%{_mandir}/man1/pfstag.1%{?ext_man} %files -n %{_libname} %{_libdir}/libpfs.so.* @@ -286,67 +282,67 @@ %{_bindir}/pfsinhdrgen %{_bindir}/pfsinme %{_bindir}/pfsplotresponse -%{_mandir}/man1/dcraw2hdrgen.1%{ext_man} -%{_mandir}/man1/jpeg2hdrgen.1%{ext_man} -%{_mandir}/man1/pfshdrcalibrate.1%{ext_man} -%{_mandir}/man1/pfsinhdrgen.1%{ext_man} -%{_mandir}/man1/pfsinme.1%{ext_man} -%{_mandir}/man1/pfsplotresponse.1%{ext_man} +%{_mandir}/man1/dcraw2hdrgen.1%{?ext_man} +%{_mandir}/man1/jpeg2hdrgen.1%{?ext_man} +%{_mandir}/man1/pfshdrcalibrate.1%{?ext_man} +%{_mandir}/man1/pfsinhdrgen.1%{?ext_man} +%{_mandir}/man1/pfsinme.1%{?ext_man} +%{_mandir}/man1/pfsplotresponse.1%{?ext_man} %files -n pfstmo -%{_bindir}/pfstmo_reinhard05 -%{_bindir}/pfstmo_pattanaik00 -%{_bindir}/pfstmo_mantiuk06 -%{_bindir}/pfstmo_fattal02 %{_bindir}/pfstmo_drago03 -%{_bindir}/pfstmo_reinhard02 %{_bindir}/pfstmo_durand02 -%{_bindir}/pfstmo_mantiuk08 +%{_bindir}/pfstmo_fattal02 %{_bindir}/pfstmo_ferradans11 %{_bindir}/pfstmo_mai11 -%{_mandir}/man1/pfstmo_reinhard05.1%{ext_man} -%{_mandir}/man1/pfstmo_pattanaik00.1%{ext_man} -%{_mandir}/man1/pfstmo_mantiuk06.1%{ext_man} -%{_mandir}/man1/pfstmo_fattal02.1%{ext_man} -%{_mandir}/man1/pfstmo_drago03.1%{ext_man} -%{_mandir}/man1/pfstmo_reinhard02.1%{ext_man} -%{_mandir}/man1/pfstmo_durand02.1%{ext_man} -%{_mandir}/man1/pfstmo_mantiuk08.1%{ext_man} -%{_mandir}/man1/pfstmo_ferradans11.1%{ext_man} -%{_mandir}/man1/pfstmo_mai11.1%{ext_man} +%{_bindir}/pfstmo_mantiuk06 +%{_bindir}/pfstmo_mantiuk08 +%{_bindir}/pfstmo_pattanaik00 +%{_bindir}/pfstmo_reinhard02 +%{_bindir}/pfstmo_reinhard05 +%{_mandir}/man1/pfstmo_drago03.1%{?ext_man} +%{_mandir}/man1/pfstmo_durand02.1%{?ext_man} +%{_mandir}/man1/pfstmo_fattal02.1%{?ext_man} +%{_mandir}/man1/pfstmo_ferradans11.1%{?ext_man} +%{_mandir}/man1/pfstmo_mai11.1%{?ext_man} +%{_mandir}/man1/pfstmo_mantiuk06.1%{?ext_man} +%{_mandir}/man1/pfstmo_mantiuk08.1%{?ext_man} +%{_mandir}/man1/pfstmo_pattanaik00.1%{?ext_man} +%{_mandir}/man1/pfstmo_reinhard02.1%{?ext_man} +%{_mandir}/man1/pfstmo_reinhard05.1%{?ext_man} %files -n pfsview %{_bindir}/pfsv %{_bindir}/pfsview -%{_mandir}/man1/pfsview.1%{ext_man} +%{_mandir}/man1/pfsview.1%{?ext_man} %files -n pfsglview %{_bindir}/pfsglview -%{_mandir}/man1/pfsglview.1%{ext_man} +%{_mandir}/man1/pfsglview.1%{?ext_man} %files exr %{_bindir}/pfsinexr %{_bindir}/pfsoutexr -%{_mandir}/man1/pfsinexr.1%{ext_man} -%{_mandir}/man1/pfsoutexr.1%{ext_man} +%{_mandir}/man1/pfsinexr.1%{?ext_man} +%{_mandir}/man1/pfsoutexr.1%{?ext_man} %files imgmagick %{_bindir}/pfsinimgmagick %{_bindir}/pfsoutimgmagick -%{_mandir}/man1/pfsinimgmagick.1%{ext_man} -%{_mandir}/man1/pfsoutimgmagick.1%{ext_man} +%{_mandir}/man1/pfsinimgmagick.1%{?ext_man} +%{_mandir}/man1/pfsoutimgmagick.1%{?ext_man} %files octave -%{_bindir}/pfsoctavelum -%{_bindir}/pfsoctavergb -%{_bindir}/pfsstat %dir %{_libdir}/octave/*/site %dir %{_libdir}/octave/*/site/oct %dir %{_libdir}/octave/*/site/oct/*/ -%{_libdir}/octave/*/site/oct/*/pfstools/ +%{_bindir}/pfsoctavelum +%{_bindir}/pfsoctavergb +%{_bindir}/pfsstat %{_datadir}/octave/*/site/m/pfstools/ -%{_mandir}/man1/pfsoctavelum.1%{ext_man} -%{_mandir}/man1/pfsoctavergb.1%{ext_man} -%{_mandir}/man1/pfsstat.1%{ext_man} +%{_libdir}/octave/*/site/oct/*/pfstools/ +%{_mandir}/man1/pfsoctavelum.1%{?ext_man} +%{_mandir}/man1/pfsoctavergb.1%{?ext_man} +%{_mandir}/man1/pfsstat.1%{?ext_man} %changelog ++++++ pfstools-1.8.1-fix-return-in-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.hD3KCU/_old 2018-10-17 08:42:56.421777441 +0200 +++ /var/tmp/diff_new_pack.hD3KCU/_new 2018-10-17 08:42:56.425777438 +0200 @@ -1,8 +1,8 @@ -Index: pfstools-1.8.1/src/hdrhtml/hdrhtml.cpp +Index: pfstools-2.1.0/src/hdrhtml/hdrhtml.cpp =================================================================== ---- pfstools.orig/src/hdrhtml/hdrhtml.cpp 2009-03-11 22:45:55.000000000 +0100 -+++ pfstools/src/hdrhtml/hdrhtml.cpp 2010-03-02 15:21:24.000000000 +0100 -@@ -197,6 +197,7 @@ +--- pfstools-2.1.0.orig/src/hdrhtml/hdrhtml.cpp ++++ pfstools-2.1.0/src/hdrhtml/hdrhtml.cpp +@@ -197,6 +197,7 @@ public: this->y_i = new float[lut_size]; own_y_i = true; memcpy(this->y_i, other.y_i, lut_size * sizeof(float)); @@ -10,3 +10,29 @@ } ~UniformArrayLUT() +Index: pfstools-2.1.0/src/fileformat/pfsoutyuv.cpp +=================================================================== +--- pfstools-2.1.0.orig/src/fileformat/pfsoutyuv.cpp ++++ pfstools-2.1.0/src/fileformat/pfsoutyuv.cpp +@@ -215,7 +215,7 @@ class YUVWriter { + } + + template<typename T> +- bool writeYuvImage(pfs::Array2D *R, pfs::Array2D *G, pfs::Array2D *B){ ++ void writeYuvImage(pfs::Array2D *R, pfs::Array2D *G, pfs::Array2D *B){ + //writes the entire image to fh R - Luminance, G - Cr, B - Cb + unsigned int width_chroma = R->getCols(); + unsigned int height_chroma = R->getRows(); +Index: pfstools-2.1.0/src/pfs/pfsutils.cpp +=================================================================== +--- pfstools-2.1.0.orig/src/pfs/pfsutils.cpp ++++ pfstools-2.1.0/src/pfs/pfsutils.cpp +@@ -57,6 +57,8 @@ string getColorspaceString(ColorSpace cs + return "HLG YCbCr 2020"; + case CS_RGB2020: + return "RGB2020"; ++ default: ++ __builtin_unreachable(); + } + } + ++++++ pfstools-2.0.6.tgz -> pfstools-2.1.0.tgz ++++++ ++++ 2530 lines of diff (skipped) ++++++ pfstools-ImageMagick7.patch ++++++ --- /var/tmp/diff_new_pack.hD3KCU/_old 2018-10-17 08:42:56.529777349 +0200 +++ /var/tmp/diff_new_pack.hD3KCU/_new 2018-10-17 08:42:56.529777349 +0200 @@ -1,8 +1,7 @@ -https://github.com/pld-linux/pfstools/commit/67bd2304e516545f2b203f975ac5dd30d2b479b3 -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 +diff --git a/src/fileformat/pfsinimgmagick.cpp b/src/fileformat/pfsinimgmagick.cpp +index 5dab440..f4358ce 100644 +--- a/src/fileformat/pfsinimgmagick.cpp ++++ b/src/fileformat/pfsinimgmagick.cpp @@ -35,6 +35,7 @@ #define PROG_NAME "pfsinimgmagick" @@ -11,7 +10,7 @@ class QuietException { -@@ -112,7 +113,11 @@ void readFrames( int argc, char* argv[] +@@ -114,7 +115,11 @@ void readFrames( int argc, char* argv[] ) Magick::Image imImage( ff.fileName ); VERBOSE_STR << "input image gamma: " << imImage.gamma() << std::endl; @@ -23,7 +22,7 @@ if( hasAlpha ) VERBOSE_STR << "alpha channel found" << std::endl; -@@ -127,17 +132,30 @@ void readFrames( int argc, char* argv[] +@@ -129,17 +134,30 @@ void readFrames( int argc, char* argv[] ) // Copy line by line to pfs::Frame int pixInd = 0; ++++++ pfstools-gcc.patch ++++++ --- /var/tmp/diff_new_pack.hD3KCU/_old 2018-10-17 08:42:56.537777343 +0200 +++ /var/tmp/diff_new_pack.hD3KCU/_new 2018-10-17 08:42:56.537777343 +0200 @@ -1,6 +1,8 @@ ---- src/fileformat/exrio.cpp -+++ src/fileformat/exrio.cpp -@@ -87,7 +87,8 @@ +diff --git a/src/fileformat/exrio.cpp b/src/fileformat/exrio.cpp +index 520d4af..16936ab 100644 +--- a/src/fileformat/exrio.cpp ++++ b/src/fileformat/exrio.cpp +@@ -87,7 +87,8 @@ void OpenEXRReader::readImage( pfs::Array2D *R, pfs::Array2D *G, (*B)(x,y) = tmp_img[idx].b; idx++; } @@ -10,7 +12,7 @@ } OpenEXRReader::~OpenEXRReader() -@@ -131,5 +132,6 @@ +@@ -131,5 +132,6 @@ void OpenEXRWriter::writeImage( pfs::Array2D *R, pfs::Array2D *G, throw pfs::Exception( exc.what() ); } @@ -18,9 +20,11 @@ + delete [] tmp_img; + tmp_img = NULL; } ---- src/filter/pfspanoramic.cpp -+++ src/filter/pfspanoramic.cpp -@@ -198,7 +198,7 @@ +diff --git a/src/filter/pfspanoramic.cpp b/src/filter/pfspanoramic.cpp +index b7d7d06..22462c6 100644 +--- a/src/filter/pfspanoramic.cpp ++++ b/src/filter/pfspanoramic.cpp +@@ -198,7 +198,7 @@ class ProjectionFactory { char *opts; @@ -29,7 +33,7 @@ { *opts++ = '\0'; } -@@ -728,7 +728,7 @@ +@@ -731,7 +731,7 @@ void panoramic( int argc, char* argv[] ) { char *destination; ++++++ pfstools-octinstall.patch ++++++ --- /var/tmp/diff_new_pack.hD3KCU/_old 2018-10-17 08:42:56.545777336 +0200 +++ /var/tmp/diff_new_pack.hD3KCU/_new 2018-10-17 08:42:56.545777336 +0200 @@ -1,8 +1,8 @@ -Index: pfstools-2.0.6/CMakeLists.txt -=================================================================== ---- pfstools-2.0.6.orig/CMakeLists.txt -+++ pfstools-2.0.6/CMakeLists.txt -@@ -278,8 +278,6 @@ OPTION(WITH_HDRVC "Compile HDRVC (intern +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cc22e80..ecee7ca 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -281,8 +281,6 @@ OPTION(WITH_HDRVC "Compile HDRVC (internal release only)" OFF) OPTION(WITH_Octave "Compile Octave files" ON) @@ -11,7 +11,7 @@ if( OCTAVE_DEST_DIR ) set( OCTAVE_OCT_DIR ${OCTAVE_DEST_DIR} ) set( OCTAVE_M_DIR ${OCTAVE_DEST_DIR} ) -@@ -299,7 +297,8 @@ if( WITH_Octave ) +@@ -302,7 +300,8 @@ if( WITH_Octave ) if(MKOCTFILE) message(STATUS "mkoctfile found.") endif() @@ -21,10 +21,10 @@ endif( WITH_Octave ) # ======== OpenCV =========== -Index: pfstools-2.0.6/src/octave/CMakeLists.txt -=================================================================== ---- pfstools-2.0.6.orig/src/octave/CMakeLists.txt -+++ pfstools-2.0.6/src/octave/CMakeLists.txt +diff --git a/src/octave/CMakeLists.txt b/src/octave/CMakeLists.txt +index 89d8369..4f75c61 100644 +--- a/src/octave/CMakeLists.txt ++++ b/src/octave/CMakeLists.txt @@ -40,11 +40,11 @@ endforeach(SRC) foreach(SRC ${SRC_OCT}) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SRC}.oct ++++++ pfstools-stdlib.patch ++++++ --- /var/tmp/diff_new_pack.hD3KCU/_old 2018-10-17 08:42:56.549777333 +0200 +++ /var/tmp/diff_new_pack.hD3KCU/_new 2018-10-17 08:42:56.553777329 +0200 @@ -1,5 +1,7 @@ ---- src/fileformat/pfsinexr.cpp -+++ src/fileformat/pfsinexr.cpp +diff --git a/src/fileformat/pfsinexr.cpp b/src/fileformat/pfsinexr.cpp +index 2f535fd..8d55e17 100644 +--- a/src/fileformat/pfsinexr.cpp ++++ b/src/fileformat/pfsinexr.cpp @@ -29,6 +29,8 @@ #include <cstdlib> @@ -9,8 +11,10 @@ #include <iostream> #include <stdio.h> ---- src/fileformat/pfsinppm.cpp -+++ src/fileformat/pfsinppm.cpp +diff --git a/src/fileformat/pfsinppm.cpp b/src/fileformat/pfsinppm.cpp +index c3af50d..3af39dc 100644 +--- a/src/fileformat/pfsinppm.cpp ++++ b/src/fileformat/pfsinppm.cpp @@ -30,6 +30,8 @@ #include <cstdlib> @@ -20,8 +24,10 @@ #include <iostream> #include <getopt.h> ---- src/fileformat/pfsinrgbe.cpp -+++ src/fileformat/pfsinrgbe.cpp +diff --git a/src/fileformat/pfsinrgbe.cpp b/src/fileformat/pfsinrgbe.cpp +index 9e9f0fa..9793048 100644 +--- a/src/fileformat/pfsinrgbe.cpp ++++ b/src/fileformat/pfsinrgbe.cpp @@ -30,6 +30,8 @@ #include <cstdlib> @@ -31,8 +37,10 @@ #include <iostream> #include <getopt.h> ---- src/fileformat/pfsintiff.cpp -+++ src/fileformat/pfsintiff.cpp +diff --git a/src/fileformat/pfsintiff.cpp b/src/fileformat/pfsintiff.cpp +index 3fd3ded..fd65b25 100644 +--- a/src/fileformat/pfsintiff.cpp ++++ b/src/fileformat/pfsintiff.cpp @@ -29,6 +29,8 @@ #include <cstdlib> @@ -42,8 +50,10 @@ #include <iostream> #include <getopt.h> ---- src/fileformat/pfsoutexr.cpp -+++ src/fileformat/pfsoutexr.cpp +diff --git a/src/fileformat/pfsoutexr.cpp b/src/fileformat/pfsoutexr.cpp +index 1712966..a65abb4 100644 +--- a/src/fileformat/pfsoutexr.cpp ++++ b/src/fileformat/pfsoutexr.cpp @@ -33,6 +33,7 @@ #include <iostream> #include <string> @@ -52,8 +62,10 @@ #include <stdio.h> #include <pfs.h> #include <getopt.h> ---- src/fileformat/pfsoutppm.cpp -+++ src/fileformat/pfsoutppm.cpp +diff --git a/src/fileformat/pfsoutppm.cpp b/src/fileformat/pfsoutppm.cpp +index caff241..2d74549 100644 +--- a/src/fileformat/pfsoutppm.cpp ++++ b/src/fileformat/pfsoutppm.cpp @@ -30,6 +30,8 @@ #include <cstdlib> @@ -63,8 +75,10 @@ #include <iostream> #include <getopt.h> ---- src/fileformat/pfsoutrgbe.cpp -+++ src/fileformat/pfsoutrgbe.cpp +diff --git a/src/fileformat/pfsoutrgbe.cpp b/src/fileformat/pfsoutrgbe.cpp +index 9972be6..ff425c8 100644 +--- a/src/fileformat/pfsoutrgbe.cpp ++++ b/src/fileformat/pfsoutrgbe.cpp @@ -30,6 +30,8 @@ #include <cstdlib> @@ -74,8 +88,10 @@ #include <iostream> #include <getopt.h> ---- src/fileformat/pfsouttiff.cpp -+++ src/fileformat/pfsouttiff.cpp +diff --git a/src/fileformat/pfsouttiff.cpp b/src/fileformat/pfsouttiff.cpp +index 3614450..7a11f0b 100644 +--- a/src/fileformat/pfsouttiff.cpp ++++ b/src/fileformat/pfsouttiff.cpp @@ -29,6 +29,8 @@ #include <cstdlib> @@ -85,8 +101,10 @@ #include <iostream> #include <getopt.h> ---- src/filter/pfscat.cpp -+++ src/filter/pfscat.cpp +diff --git a/src/filter/pfscat.cpp b/src/filter/pfscat.cpp +index 09dda09..c40f2a9 100644 +--- a/src/filter/pfscat.cpp ++++ b/src/filter/pfscat.cpp @@ -29,6 +29,7 @@ #include <iostream> #include <getopt.h> @@ -95,8 +113,10 @@ #include <stdlib.h> #define PROG_NAME "pfscat" ---- src/filter/pfscut.cpp -+++ src/filter/pfscut.cpp +diff --git a/src/filter/pfscut.cpp b/src/filter/pfscut.cpp +index 1c2b28b..3ed9b51 100644 +--- a/src/filter/pfscut.cpp ++++ b/src/filter/pfscut.cpp @@ -29,6 +29,8 @@ #include <cstdlib> #include <iostream> @@ -106,8 +126,10 @@ #define PROG_NAME "pfscut" ---- src/filter/pfspad.cpp -+++ src/filter/pfspad.cpp +diff --git a/src/filter/pfspad.cpp b/src/filter/pfspad.cpp +index 5ed8b05..8b9508f 100644 +--- a/src/filter/pfspad.cpp ++++ b/src/filter/pfspad.cpp @@ -30,6 +30,8 @@ #include <cstdlib> #include <iostream> @@ -117,9 +139,11 @@ #define PROG_NAME "pfspad" ---- src/pfs/pfs.cpp -+++ src/pfs/pfs.cpp -@@ -40,6 +40,7 @@ +diff --git a/src/pfs/pfs.cpp b/src/pfs/pfs.cpp +index aa5d8c5..193e8c6 100644 +--- a/src/pfs/pfs.cpp ++++ b/src/pfs/pfs.cpp +@@ -43,6 +43,7 @@ #include <fcntl.h>
