Hello community,
here is the log from the commit of package pfstools for openSUSE:Factory checked in at 2016-01-01 19:47:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pfstools (Old)
and /work/SRC/openSUSE:Factory/.pfstools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pfstools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pfstools/pfstools.changes 2013-04-24 09:47:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pfstools.new/pfstools.changes 2016-01-01 19:49:37.000000000 +0100
@@ -1,0 +2,54 @@
+Thu Dec 17 21:49:15 UTC 2015 - p.drouand@gmail.com
+
+- Fix octave dependency
+
+-------------------------------------------------------------------
+Thu Sep 17 15:09:12 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 2.0.4
+ * fixed: added installation of octave-based scripts: pfsoctavelum
+ pfsoctavergb pfsstat
+ * fixed: libraries installed in lib64 if needed
+ * fixed: added "so" version to the pfs.so library
+ * fixed: Replaced depreciated OctaveMap for compatibility with octave 4.0.0
+- Changes from version 2.0.0
+ * added: Starting from pfstools 2.0.0, pfstmo and pfscalibration
+ are included in the pfstools source package
+ * changed: support for automake dropped in favour of cmake
+ * fixed: pfsinpfm and pfsoutpfm now handle both big and little endian
+ files correctly
+ * fixed: pfsinpfm and pfsoutpfm do not flip images (top-bottom)
+ * added: new tone-mapping operator: pfstmo_mai11
+ * changed: Thoroughly updated README files
+ * fixed: several issues with octave scripts (compatibility with newer
+ Octave releases), in particular pfs_write_rgb
+- Add dependencies following upstream changes
+ * cmake
+ * doxygen
+ * gsl-devel
+ * hdf5-devel
+ * opencv-devel
+ * fftw3-threads-devel instead of fftw3-devel
+ * opencv-devel
+ * pkgconfig(libexif)
+- Re-enable building against octave
+- Split out some tools into their own packages
+ * libpfs-2
+ * pfscalign
+ * pfscalibration
+ * pfstmo
+ * pfsview
+ * pfsglview
+ * pfstools-exr
+ * pfstools-imgmagick
+ * pfstools-octave
+- Remove obsolete patches
+ * pfstools-octave.patch
+ * pfstools-stringcompare.patch
+ * pfstools-no-debug-mangling.patch
+- Added patches
+ * pfstools-maptype.patch
+ * pfstools-octinstall.patch
+ * pfstools-fix-libpfs-linkage.patch
+
+-------------------------------------------------------------------
Old:
----
pfstools-1.8.4.tar.bz2
pfstools-no-debug-mangling.patch
pfstools-octave.patch
pfstools-stringcompare.patch
New:
----
pfstools-2.0.4.tgz
pfstools-fix-libpfs-linkage.patch
pfstools-maptype.patch
pfstools-octinstall.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pfstools.spec ++++++
--- /var/tmp/diff_new_pack.OfXC7U/_old 2016-01-01 19:49:38.000000000 +0100
+++ /var/tmp/diff_new_pack.OfXC7U/_new 2016-01-01 19:49:38.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pfstools
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,34 +15,41 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+%define _libname libpfs2
Name: pfstools
-Version: 1.8.4
+Version: 2.0.4
Release: 0
-Source: %{name}-%{version}.tar.bz2
-Patch: %{name}-octave.patch
+Source: http://sourceforge.net/projects/pfstools/files/pfstools/%{version}/%{name}-%{version}.tgz
Patch1: %{name}-gcc.patch
-Patch2: pfstools-stringcompare.patch
+Patch2: pfstools-maptype.patch
+Patch3: pfstools-octinstall.patch
Patch4: pfstools-stdlib.patch
Patch5: pfstools-1.8.1-fix-return-in-nonvoid.patch
-Patch6: pfstools-no-debug-mangling.patch
+Patch6: pfstools-fix-libpfs-linkage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.mpi-sb.mpg.de/resources/pfstools/
BuildRequires: Mesa
BuildRequires: OpenEXR-devel
BuildRequires: blas
-BuildRequires: fftw3-devel
+BuildRequires: cmake
+BuildRequires: doxygen
+BuildRequires: fftw3-threads-devel
BuildRequires: freeglut-devel
+BuildRequires: gsl-devel
+BuildRequires: hdf5-devel
BuildRequires: lapack
BuildRequires: libMagick++-devel
BuildRequires: libnetpbm-devel
BuildRequires: libqt4-devel
BuildRequires: libtiff-devel
BuildRequires: libtool
+BuildRequires: opencv-devel
BuildRequires: pkgconfig
BuildRequires: readline-devel
+BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(glu)
-#BuildRequires: octave-devel
+BuildRequires: octave-devel
Requires: dcraw
Summary: High Dynamic Range Images and Video manipulation tools
License: GPL-2.0+ and LGPL-2.1+
@@ -55,8 +62,92 @@
using a simple generic file format (pfs) for HDR data. The concept of
the pfstools is similar to netpbm package for low-dynamic range images.
+%package -n %{_libname}
+Summary: pfstools shared libraries
+Group: System/Libraries
+
+%description -n %{_libname}
+pfstools package is a set of command line (and one GUI) programs for
+reading, writing, manipulating and viewing high-dynamic range (HDR)
+images and video frames. All programs in the package exchange data
+using a simple generic file format (pfs) for HDR data. The concept of
+the pfstools is similar to netpbm package for low-dynamic range images.
+
+%package -n pfscalign
+Summary: Align image stack
+Group: Productivity/Multimedia/Other
+
+%description -n pfscalign
+Align multiple exposures using homographic transformation. The command
+uses a similar feature-point based method as most panorama stitching software.
+
+%package -n pfscalibration
+Summary: Photometric Calibration of HDR and LDR Cameras
+Group: Productivity/Multimedia/Other
+Requires: dcraw
+Requires: jhead
+%{perl_requires}
+%{?libperl_requires}
+
+%description -n pfscalibration
+A photographic camera with a standard CCD sensor is able to acquire an
+image with simultaneous dynamic range of not more than 1:1000. The
+basic idea to create an image with a higher dynamic range is to combine
+multiple images with different exposure settings, thus making use of
+available sequential dynamic range.
+
+%package -n pfstmo
+Summary: Tone Mapping Operators for High Dynamic Range Images
+Group: Productivity/Multimedia/Other
+
+%description -n pfstmo
+pfstmo package contains the implementation of state-of-the-art tone
+mapping operators. The motivation here is to provide an implementation
+of tone mapping operators suitable for convenient processing of both
+static images and animations.
+
+%package -n pfsview
+Summary: Qt-based viewer for HDR files
+Group: Productivity/Multimedia/Other
+
+%description -n pfsview
+pfsview is a viewer programs based on qt4 for viewing HDR graphics files.
+
+%package -n pfsglview
+Summary: GL-based viewer for HDR files
+Group: Productivity/Multimedia/Other
+
+%description -n pfsglview
+pfsglview is aviewer programs based on OpenGL for viewing HDR graphics files.
+
+%package exr
+Summary: EXR file import and export for PFS tools
+Group: Productivity/Multimedia/Other
+
+%description exr
+This package contains input and output filters for EXR files
+to and from the HDR graphics file format used in pfstools.
+
+%package imgmagick
+Summary: ImageMagick file import for PFS tools
+Group: Productivity/Multimedia/Other
+
+%description imgmagick
+This package contains input and output filters based in
+ImageMagick to and from the HDR graphics file format used in pfstools.
+
+%package octave
+Summary: Octave interaction with PFS tools
+Group: Productivity/Multimedia/Other
+Requires: octave
+
+%description octave
+The pfstools-octave package contains programs to process red, green and blue
+channels or luminance channels in pfs stream using Octave.
+
+
%package devel
-Requires: %{name} = %{version}
+Requires: %{_libname} = %{version}
Summary: High Dynamic Range Images and Video manipulation tools
License: GPL-2.0+
Group: Development/Libraries/C and C++
@@ -70,46 +161,187 @@
%prep
%setup -q
-%patch
%patch1
-%patch2
+%patch2 -p1
+%patch3 -p1
%patch4
%patch5 -p1
%patch6 -p1
%build
-autoreconf -f -i
-%configure --disable-static --with-pic --disable-octave --with-qtdir=/usr
-make %{?jobs:-j%jobs}
+%cmake
+make %{?_smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+cd build
+%make_install
%{__rm} -f %{buildroot}%{_libdir}/*.la
grep -r include %{buildroot}%{_includedir} | awk -F: '{print $2}'
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-%post -p /sbin/ldconfig
+%post -n %{_libname} -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun -n %{_libname} -p /sbin/ldconfig
%files
%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%{_bindir}/*
-%{_mandir}/man?/*
-%{_libdir}/*.so.*
-/usr/share/%{name}
-# temporary removed
-#%{_libdir}/octave/*/site/oct/*/pfstools
-#%_datadir/octave/*/site/m/pfstools
+%doc AUTHORS ChangeLog COPYING README TODO doc/faq.txt
+%dir %{_datadir}/%{name}
+%{_bindir}/pfsabsolute
+%{_bindir}/pfscat
+%{_bindir}/pfsclamp
+%{_bindir}/pfscut
+%{_bindir}/pfsextractchannels
+%{_bindir}/pfsdisplayfunction
+%{_bindir}/pfsflip
+%{_bindir}/pfsgamma
+%{_bindir}/pfsin
+%{_bindir}/pfsindcraw
+%{_bindir}/pfsinpfm
+%{_bindir}/pfsinppm
+%{_bindir}/pfsinrgbe
+%{_bindir}/pfsintiff
+%{_bindir}/pfsout
+%{_bindir}/pfsouthdrhtml
+%{_bindir}/pfsoutpfm
+%{_bindir}/pfsoutppm
+%{_bindir}/pfsoutrgbe
+%{_bindir}/pfsouttiff
+%{_bindir}/pfspad
+%{_bindir}/pfspanoramic
+%{_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
+%{_datadir}/pfstools/hdrhtml_c_b5.csv
+%{_datadir}/pfstools/hdrhtml_default_templ/
+%{_datadir}/pfstools/hdrhtml_hdrlabs_templ/
+%{_datadir}/pfstools/hdrhtml_t_b2.csv
+%{_datadir}/pfstools/hdrhtml_t_b3.csv
+%{_datadir}/pfstools/hdrhtml_t_b4.csv
+%{_datadir}/pfstools/hdrhtml_t_b5.csv
+%{_mandir}/man1/pfsabsolute.1.gz
+%{_mandir}/man1/pfscat.1.gz
+%{_mandir}/man1/pfsclamp.1.gz
+%{_mandir}/man1/pfscut.1.gz
+%{_mandir}/man1/pfsdisplayfunction.1.gz
+%{_mandir}/man1/pfsextractchannels.1.gz
+%{_mandir}/man1/pfsflip.1.gz
+%{_mandir}/man1/pfsgamma.1.gz
+%{_mandir}/man1/pfsin.1.gz
+%{_mandir}/man1/pfsindcraw.1.gz
+%{_mandir}/man1/pfsinpfm.1.gz
+%{_mandir}/man1/pfsinppm.1.gz
+%{_mandir}/man1/pfsinrgbe.1.gz
+%{_mandir}/man1/pfsintiff.1.gz
+%{_mandir}/man1/pfsout.1.gz
+%{_mandir}/man1/pfsouthdrhtml.1.gz
+%{_mandir}/man1/pfsoutpfm.1.gz
+%{_mandir}/man1/pfsoutppm.1.gz
+%{_mandir}/man1/pfsoutrgbe.1.gz
+%{_mandir}/man1/pfsouttiff.1.gz
+%{_mandir}/man1/pfspad.1.gz
+%{_mandir}/man1/pfspanoramic.1.gz
+%{_mandir}/man1/pfsrotate.1.gz
+%{_mandir}/man1/pfssize.1.gz
+%{_mandir}/man1/pfstag.1.gz
+%{_mandir}/man1/pfscolortransform.1.gz
+%{_mandir}/man1/pfsretime.1.gz
+
+%files -n %{_libname}
+%defattr(-,root,root)
+%{_libdir}/libpfs.so.*
%files devel
%defattr(-,root,root)
-%doc doc/{pfs_format_spec.pdf,faq.txt}
+%doc doc/faq.txt
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.so
+%{_libdir}/libpfs.so
+
+%files -n pfscalign
+%defattr(-,root,root)
+%{_bindir}/pfsalign
+%{_mandir}/man1/pfsalign.1.gz
+
+%files -n pfscalibration
+%defattr(-,root,root)
+%{_bindir}/dcraw2hdrgen
+%{_bindir}/jpeg2hdrgen
+%{_bindir}/pfshdrcalibrate
+%{_bindir}/pfsinhdrgen
+%{_bindir}/pfsinme
+%{_bindir}/pfsplotresponse
+%{_mandir}/man1/dcraw2hdrgen.1.gz
+%{_mandir}/man1/jpeg2hdrgen.1.gz
+%{_mandir}/man1/pfshdrcalibrate.1.gz
+%{_mandir}/man1/pfsinhdrgen.1.gz
+%{_mandir}/man1/pfsinme.1.gz
+%{_mandir}/man1/pfsplotresponse.1.gz
+
+%files -n pfstmo
+%defattr(-,root,root)
+%{_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_ferradans11
+%{_bindir}/pfstmo_mai11
+%{_mandir}/man1/pfstmo_reinhard05.1.gz
+%{_mandir}/man1/pfstmo_pattanaik00.1.gz
+%{_mandir}/man1/pfstmo_mantiuk06.1.gz
+%{_mandir}/man1/pfstmo_fattal02.1.gz
+%{_mandir}/man1/pfstmo_drago03.1.gz
+%{_mandir}/man1/pfstmo_reinhard02.1.gz
+%{_mandir}/man1/pfstmo_durand02.1.gz
+%{_mandir}/man1/pfstmo_mantiuk08.1.gz
+%{_mandir}/man1/pfstmo_ferradans11.1.gz
+%{_mandir}/man1/pfstmo_mai11.1.gz
+
+%files -n pfsview
+%defattr(-,root,root)
+%{_bindir}/pfsv
+%{_bindir}/pfsview
+%{_mandir}/man1/pfsview.1.gz
+
+%files -n pfsglview
+%defattr(-,root,root)
+%{_bindir}/pfsglview
+%{_mandir}/man1/pfsglview.1.gz
+
+%files exr
+%defattr(-,root,root)
+%{_bindir}/pfsinexr
+%{_bindir}/pfsoutexr
+%{_mandir}/man1/pfsinexr.1.gz
+%{_mandir}/man1/pfsoutexr.1.gz
+
+%files imgmagick
+%defattr(-,root,root)
+%{_bindir}/pfsinimgmagick
+%{_bindir}/pfsoutimgmagick
+%{_mandir}/man1/pfsinimgmagick.1.gz
+%{_mandir}/man1/pfsoutimgmagick.1.gz
+
+%files octave
+%defattr(-,root,root)
+%{_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/
+%{_datadir}/octave/*/site/m/pfstools/
+%{_mandir}/man1/pfsoctavelum.1.gz
+%{_mandir}/man1/pfsoctavergb.1.gz
+%{_mandir}/man1/pfsstat.1.gz
%changelog
++++++ pfstools-1.8.1-fix-return-in-nonvoid.patch ++++++
--- /var/tmp/diff_new_pack.OfXC7U/_old 2016-01-01 19:49:38.000000000 +0100
+++ /var/tmp/diff_new_pack.OfXC7U/_new 2016-01-01 19:49:38.000000000 +0100
@@ -1,12 +1,12 @@
Index: pfstools-1.8.1/src/hdrhtml/hdrhtml.cpp
===================================================================
---- pfstools-1.8.1.orig/src/hdrhtml/hdrhtml.cpp 2009-03-11 22:45:55.000000000 +0100
-+++ pfstools-1.8.1/src/hdrhtml/hdrhtml.cpp 2010-03-02 15:21:24.000000000 +0100
-@@ -195,6 +195,7 @@ public:
+--- 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 @@
this->y_i = new float[lut_size];
own_y_i = true;
memcpy(this->y_i, other.y_i, lut_size * sizeof(float));
-+ return *this;
++ return *this;
}
~UniformArrayLUT()
++++++ pfstools-fix-libpfs-linkage.patch ++++++
--- a/src/octave/CMakeLists.txt 2014-12-06 19:08:38.000000000 +0100
+++ b/src/octave/CMakeLists.txt 2015-03-10 12:06:05.052688361 +0100
@@ -22,11 +22,12 @@
#Building phase
foreach(SRC ${SRC_OCT})
get_filename_component(OCT_NAME ${SRC} NAME)
+ target_link_libraries(pfs)
add_custom_command(
OUTPUT ${OCT_NAME}.oct
COMMAND ${MKOCTFILE} "${CMAKE_CURRENT_SOURCE_DIR}/${OCT_NAME}.cpp"
ARGS -I${HEADERS} -I${CMAKE_CURRENT_SOURCE_DIR}/help_files
- -L${PROJECT_BINARY_DIR}/src/pfs -lpfs
+ -L${PROJECT_BINARY_DIR}/src/pfs
DEPENDS ${OCT_NAME}.cpp
COMMENT "Generating ${OCT_NAME}.oct"
VERBATIM)
++++++ pfstools-gcc.patch ++++++
--- /var/tmp/diff_new_pack.OfXC7U/_old 2016-01-01 19:49:38.000000000 +0100
+++ /var/tmp/diff_new_pack.OfXC7U/_new 2016-01-01 19:49:38.000000000 +0100
@@ -20,39 +20,12 @@
}
--- src/filter/pfspanoramic.cpp
+++ src/filter/pfspanoramic.cpp
-@@ -93,7 +93,7 @@
- }
-
- //TODO: optimize rotations by precomputing sines and cosines
-- Vector3D rotateX(double angle)
-+ void rotateX(double angle)
- {
- angle *= (M_PI / 180);
-
-@@ -107,7 +107,7 @@
- z = z2;
- }
-
-- Vector3D rotateY(double angle)
-+ void rotateY(double angle)
- {
- angle *= (M_PI / 180);
-
-@@ -121,7 +121,7 @@
- z = z2;
- }
-
-- Vector3D rotateZ(double angle)
-+ void rotateZ(double angle)
- {
- angle *= (M_PI / 180);
-
-@@ -195,7 +195,7 @@
+@@ -198,7 +198,7 @@
{
char *opts;
-- if(opts = strchr(name, '/'))
-+ if(opts = (char*)strchr(name, '/'))
+- if( (opts = strchr(name, '/')) )
++ if( (opts = (char*)strchr(name, '/')) )
{
*opts++ = '\0';
}
++++++ pfstools-maptype.patch ++++++
diff -up pfstools-2.0.4/src/octave/pfsput.cpp.maptype pfstools-2.0.4/src/octave/pfsput.cpp
--- pfstools-2.0.4/src/octave/pfsput.cpp.maptype 2015-07-15 11:58:23.000000000 +0200
+++ pfstools-2.0.4/src/octave/pfsput.cpp 2015-07-20 11:49:05.445680473 +0200
@@ -52,9 +52,9 @@ DEFUN_DLD( pfsput, args, , helpString)
return retval;
}
- octave_scalar_map pfsStream = args(0).map_value();
+ octave_map pfsStream = args(0).map_value();
- octave_scalar_map::const_iterator itFH = pfsStream.seek( "FH" );
+ octave_map::const_iterator itFH = pfsStream.seek( "FH" );
if( itFH == pfsStream.end() ||
!pfsStream.contents( itFH )(0).is_real_scalar() )
{
@@ -65,7 +65,7 @@ DEFUN_DLD( pfsput, args, , helpString)
// Check mode
{
- octave_scalar_map::const_iterator itMode = pfsStream.seek( "MODE" );
+ octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
if( itMode == pfsStream.end() || !pfsStream.contents( itMode )(0).is_string() )
{
error( SCRIPT_NAME ": MODE field missing in the structure or it has wrong type");
@@ -80,8 +80,8 @@ DEFUN_DLD( pfsput, args, , helpString)
// Get width & height
int width, height;
{
- octave_scalar_map::const_iterator itCols = pfsStream.seek( "columns" );
- octave_scalar_map::const_iterator itRows = pfsStream.seek( "rows" );
+ octave_map::const_iterator itCols = pfsStream.seek( "columns" );
+ octave_map::const_iterator itRows = pfsStream.seek( "rows" );
if( itCols == pfsStream.end() || itRows == pfsStream.end() ||
!pfsStream.contents( itCols )(0).is_real_scalar() ||
!pfsStream.contents( itRows )(0).is_real_scalar() )
@@ -94,9 +94,9 @@ DEFUN_DLD( pfsput, args, , helpString)
}
// Get channels
- octave_scalar_map channels;
+ octave_map channels;
{
- octave_scalar_map::const_iterator itChannels = pfsStream.seek( "channels" );
+ octave_map::const_iterator itChannels = pfsStream.seek( "channels" );
if( itChannels == pfsStream.end() ||
!pfsStream.contents( itChannels )(0).is_map() )
{
@@ -111,7 +111,7 @@ DEFUN_DLD( pfsput, args, , helpString)
pfs::Frame *frame = ctx.createFrame( width, height );
// For each channel in the 'channels' map
- for( octave_scalar_map::iterator itCh = channels.begin(); itCh != channels.end(); itCh++ ) {
+ for( octave_map::iterator itCh = channels.begin(); itCh != channels.end(); itCh++ ) {
std::string channelName = channels.key(itCh);
if( !channels.contents( itCh )(0).is_real_matrix() ) {
@@ -135,15 +135,15 @@ DEFUN_DLD( pfsput, args, , helpString)
// Copy frame tags
{
- octave_scalar_map::const_iterator itTags = pfsStream.seek( "tags" );
+ octave_map::const_iterator itTags = pfsStream.seek( "tags" );
if( itTags != pfsStream.end() ) {
if( !pfsStream.contents( itTags )(0).is_map() )
{
throw pfs::Exception( "'tags' field must be a structure" );
}
- octave_scalar_map_map tags = pfsStream.contents( itTags )(0).map_value();
- for( octave_scalar_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
+ octave_map tags = pfsStream.contents( itTags )(0).map_value();
+ for( octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
std::string tagName = tags.key(itTag);
if( !tags.contents( itTag )(0).is_string() )
@@ -156,14 +156,14 @@ DEFUN_DLD( pfsput, args, , helpString)
// Copy channel tags
{
- octave_scalar_map::const_iterator itChTags = pfsStream.seek( "channelTags" );
+ octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" );
if( itChTags != pfsStream.end() ) {
if( !pfsStream.contents( itChTags )(0).is_map() )
{
throw pfs::Exception( "'channelTags' field must be a structure" );
}
- octave_scalar_map tagChannels = pfsStream.contents( itChTags )(0).map_value();
- for( octave_scalar_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) {
+ octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value();
+ for( octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) {
std::string channelName = tagChannels.key(itCh);
if( !tagChannels.contents( itCh )(0).is_map() ) {
throw pfs::Exception( "each channelTags file must be a structure" );
@@ -173,8 +173,8 @@ DEFUN_DLD( pfsput, args, , helpString)
throw pfs::Exception( "can not set channel tag if channel is missing" );
}
- octave_scalar_map tags = tagChannels.contents( itCh )(0).map_value();
- for( octave_scalar_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
+ octave_map tags = tagChannels.contents( itCh )(0).map_value();
+ for( octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
std::string tagName = tags.key(itTag);
if( !tags.contents( itTag )(0).is_string() )
throw pfs::Exception( "all channel tags must be given as strings" );
++++++ pfstools-octinstall.patch ++++++
diff -up pfstools-2.0.4/CMakeLists.txt.octinstall pfstools-2.0.4/CMakeLists.txt
--- pfstools-2.0.4/CMakeLists.txt.octinstall 2015-07-20 13:06:32.533996797 +0200
+++ pfstools-2.0.4/CMakeLists.txt 2015-07-20 13:11:35.728808062 +0200
@@ -277,8 +277,6 @@ OPTION(WITH_HDRVC "Compile HDRVC (intern
# ======== MKOCTFILE/OCTAVE ===========
OPTION(WITH_Octave "Compile Octave files" ON)
-SET (OCTAVE_DEST_DIR "${CMAKE_INSTALL_PREFIX}/share/pfstools/octave"
-CACHE PATH "Copy octave functions to this directory")
if( WITH_Octave )
@@ -289,7 +287,8 @@ if( WITH_Octave )
if(MKOCTFILE)
message(STATUS "mkoctfile found.")
endif()
-
+ execute_process(COMMAND octave-config --oct-site-dir OUTPUT_VARIABLE OCTAVE_OCT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND octave-config --m-site-dir OUTPUT_VARIABLE OCTAVE_M_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
endif( WITH_Octave )
# ======== OpenCV ===========
diff -up pfstools-2.0.4/src/octave/CMakeLists.txt.octinstall pfstools-2.0.4/src/octave/CMakeLists.txt
--- pfstools-2.0.4/src/octave/CMakeLists.txt.octinstall 2015-07-20 13:03:30.448679088 +0200
+++ pfstools-2.0.4/src/octave/CMakeLists.txt 2015-07-20 13:12:42.873544809 +0200
@@ -40,11 +40,11 @@ endforeach(SRC)
foreach(SRC ${SRC_OCT})
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SRC}.oct
PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_WRITE WORLD_READ GROUP_READ OWNER_READ
- DESTINATION ${OCTAVE_DEST_DIR})
+ DESTINATION "${OCTAVE_OCT_DIR}/pfstools")
endforeach(SRC)
foreach(SRC ${SRC_M})
- install (FILES ${SRC} DESTINATION ${OCTAVE_DEST_DIR})
+ install (FILES ${SRC} DESTINATION "${OCTAVE_M_DIR}/pfstools")
endforeach(SRC)
install (FILES ${OCT_SCRIPTS}
++++++ pfstools-stdlib.patch ++++++
--- /var/tmp/diff_new_pack.OfXC7U/_old 2016-01-01 19:49:38.000000000 +0100
+++ /var/tmp/diff_new_pack.OfXC7U/_new 2016-01-01 19:49:38.000000000 +0100
@@ -44,9 +44,9 @@
#include