rpms/pfstools
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase to upstream 2.2.0 verison, drop upstreamed patches

Browse Source
This commit is contained in:
Tomas Smetana 2021-10-20 17:30:38 +02:00
parent 090b614acd
commit 723bf2c4d9
5 changed files with 11 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ pfstools-1.8.1.tar.gz
/pfstools-2.0.5.tgz
/pfstools-2.0.6.tgz
/pfstools-2.1.0.tgz
/pfstools-2.2.0.tgz

121
pfstools-Fix-build-with-Octave-6.patch
View File

@ -1,121 +0,0 @@
From aa9682ef1630a31524b2a48d5648aaf109eb91c2 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Thu, 25 Mar 2021 09:28:55 +0100
Subject: [PATCH] Fix build with Octave 6
https://hg.savannah.gnu.org/hgweb/octave/rev/f23f27e78aa2 removes a
number of functions obsoleted in 4.4.
is_map was defined as alias to isstruct so use isstruct instead.
OCTAVE_DEPRECATED (4.4, "use 'isstruct' instead")
bool is_map (void) const
{ return rep->isstruct (); }
Fixes: https://sourceforge.net/p/pfstools/bugs/49/
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
src/matlab/pfsput.cpp | 4 ++--
src/octave/pfsclose.cpp | 2 +-
src/octave/pfsget.cpp | 2 +-
src/octave/pfsput.cpp | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/matlab/pfsput.cpp b/src/matlab/pfsput.cpp
index 3adc54b..fe5edcf 100644
--- a/src/matlab/pfsput.cpp
+++ b/src/matlab/pfsput.cpp
@@ -148,14 +148,14 @@ void mexFunction(int nlhs, mxArray *plhs[],
{
Octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" );
if( itChTags != pfsStream.end() ) {
- if( !pfsStream.contents( itChTags )(0).is_map() )
+ if( !pfsStream.contents( itChTags )(0).isstruct() )
{
throw pfs::Exception( "'channelTags' field must be a structure" );
}
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() ) {
+ if( !tagChannels.contents( itCh )(0).isstruct() ) {
throw pfs::Exception( "each channelTags file must be a structure" );
}
pfs::Channel *pfsChannel = frame->getChannel( channelName.c_str() );
diff --git a/src/octave/pfsclose.cpp b/src/octave/pfsclose.cpp
index d5b767c..bdb5909 100644
--- a/src/octave/pfsclose.cpp
+++ b/src/octave/pfsclose.cpp
@@ -47,7 +47,7 @@ DEFUN_DLD( pfsclose, args, , helpString )
// Get arguments and check if they are legal
- if( nargin != 1 || !args(0).is_map() )
+ if( nargin != 1 || !args(0).isstruct() )
{
error( SCRIPT_NAME ": Improper usage!");
return retval;
diff --git a/src/octave/pfsget.cpp b/src/octave/pfsget.cpp
index 29e5e2d..4d144eb 100644
--- a/src/octave/pfsget.cpp
+++ b/src/octave/pfsget.cpp
@@ -46,7 +46,7 @@ DEFUN_DLD( pfsget, args, , helpString)
int nargin = args.length();
- if( nargin != 1 || !args(0).is_map() )
+ if( nargin != 1 || !args(0).isstruct() )
{
error( SCRIPT_NAME ": Improper usage!");
return retval;
diff --git a/src/octave/pfsput.cpp b/src/octave/pfsput.cpp
index 8c043c9..ecce9f4 100644
--- a/src/octave/pfsput.cpp
+++ b/src/octave/pfsput.cpp
@@ -46,7 +46,7 @@ DEFUN_DLD( pfsput, args, , helpString)
int nargin = args.length();
- if( nargin != 1 || !args(0).is_map() )
+ if( nargin != 1 || !args(0).isstruct() )
{
error( SCRIPT_NAME ": Improper usage!");
return retval;
@@ -98,7 +98,7 @@ DEFUN_DLD( pfsput, args, , helpString)
{
octave_scalar_map::const_iterator itChannels = pfsStream.seek( "channels" );
if( itChannels == pfsStream.end() ||
- !pfsStream.contents( itChannels )(0).is_map() )
+ !pfsStream.contents( itChannels )(0).isstruct() )
{
error( SCRIPT_NAME ": 'channels' field missing in the structure or it has wrong type");
return retval;
@@ -137,7 +137,7 @@ DEFUN_DLD( pfsput, args, , helpString)
{
octave_scalar_map::const_iterator itTags = pfsStream.seek( "tags" );
if( itTags != pfsStream.end() ) {
- if( !pfsStream.contents( itTags )(0).is_map() )
+ if( !pfsStream.contents( itTags )(0).isstruct() )
{
throw pfs::Exception( "'tags' field must be a structure" );
}
@@ -158,14 +158,14 @@ DEFUN_DLD( pfsput, args, , helpString)
{
octave_scalar_map::const_iterator itChTags = pfsStream.seek( "channelTags" );
if( itChTags != pfsStream.end() ) {
- if( !pfsStream.contents( itChTags )(0).is_map() )
+ if( !pfsStream.contents( itChTags )(0).isstruct() )
{
throw pfs::Exception( "'channelTags' field must be a structure" );
}
octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value();
for( octave_scalar_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) {
std::string channelName = tagChannels.key(itCh);
- if( !tagChannels.contents( itCh )(0).is_map() ) {
+ if( !tagChannels.contents( itCh )(0).isstruct() ) {
throw pfs::Exception( "each channelTags file must be a structure" );
}
pfs::Channel *pfsChannel = frame->getChannel( channelName.c_str() );
--
2.30.1

75
pfstools-octave5.1.patch
View File

@ -1,75 +0,0 @@
diff --git a/src/octave/pfsget.cpp b/src/octave/pfsget.cpp
index 2c0853b..29e5e2d 100644
--- a/src/octave/pfsget.cpp
+++ b/src/octave/pfsget.cpp
@@ -155,9 +155,7 @@ DEFUN_DLD( pfsget, args, , helpString)
}
catch( pfs::Exception ex )
{
- char error_message[100];
- sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
- error( error_message );
+ error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
}
// if( fh != stdin ) fclose( fh );
diff --git a/src/octave/pfsput.cpp b/src/octave/pfsput.cpp
index 97fd94a..8c043c9 100644
--- a/src/octave/pfsput.cpp
+++ b/src/octave/pfsput.cpp
@@ -191,9 +191,7 @@ DEFUN_DLD( pfsput, args, , helpString)
}
catch( pfs::Exception ex )
{
- char error_message[100];
- sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
- error( error_message );
+ error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
}
return retval;
diff --git a/src/octave/pfsread.cpp b/src/octave/pfsread.cpp
index 137d1c6..f393136 100644
--- a/src/octave/pfsread.cpp
+++ b/src/octave/pfsread.cpp
@@ -105,9 +105,7 @@ DEFUN_DLD( pfsread, args, , helpString)
}
catch( pfs::Exception ex )
{
- char error_message[100];
- sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
- error( error_message );
+ error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
}
if( fh != stdin ) fclose( fh );
diff --git a/src/octave/pfstransform_colorspace.cpp b/src/octave/pfstransform_colorspace.cpp
index 64b7e42..fd8413b 100644
--- a/src/octave/pfstransform_colorspace.cpp
+++ b/src/octave/pfstransform_colorspace.cpp
@@ -86,9 +86,7 @@ DEFUN_DLD( pfstransform_colorspace, args, , helpString)
}
catch( pfs::Exception ex )
{
- char error_message[100];
- sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
- error( error_message );
+ error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
}
return retval;
diff --git a/src/octave/pfswrite.cpp b/src/octave/pfswrite.cpp
index 8475c3b..bc15a28 100644
--- a/src/octave/pfswrite.cpp
+++ b/src/octave/pfswrite.cpp
@@ -109,9 +109,7 @@ DEFUN_DLD( pfswrite, args, , helpString)
}
catch( pfs::Exception ex )
{
- char error_message[100];
- sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
- error( error_message );
+ error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
}
if( fh != stdout ) fclose( fh );

18
pfstools.spec
View File

@ -1,18 +1,12 @@
Name: pfstools
Version: 2.1.0
Release: 20%{?dist}
Version: 2.2.0
Release: 1%{?dist}
Summary: Programs for handling high-dynamic range images
License: GPLv2+
URL: http://pfstools.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
# Fix build with octave 5.1
# https://sourceforge.net/p/pfstools/git/merge-requests/1/
Patch0: pfstools-octave5.1.patch
Patch1: pfstools-freeglut.patch
# Fix build with otave 6+
# https://sourceforge.net/p/pfstools/bugs/49/
Patch2: https://sourceforge.net/p/pfstools/bugs/_discuss/thread/7209efcaac/18f1/attachment/pfstools-Fix-build-with-Octave-6.patch
Patch0: pfstools-freeglut.patch
BuildRequires: make
BuildRequires: cmake
@ -196,6 +190,8 @@ make -C %{_target_platform}
%{_bindir}/pfstag
%{_bindir}/pfscolortransform
%{_bindir}/pfsretime
%{_bindir}/pfs_automerge
%{_bindir}/pfs_split_exposures.py
%{_datadir}/pfstools/hdrhtml_c_b2.csv
%{_datadir}/pfstools/hdrhtml_c_b3.csv
%{_datadir}/pfstools/hdrhtml_c_b4.csv
@ -235,6 +231,7 @@ make -C %{_target_platform}
%{_mandir}/man1/pfstag.1.gz
%{_mandir}/man1/pfscolortransform.1.gz
%{_mandir}/man1/pfsretime.1.gz
%{_mandir}/man1/pfs_automerge.1.gz
%doc
%files -n pfscalibration
@ -315,6 +312,9 @@ make -C %{_target_platform}
%{_includedir}/pfs
%changelog
* Wed Oct 20 2021 Tomas Smetana <tsmetana@redhat.com> - 2.2.0-1
- Rebase to upstream 2.2.0 verison, drop upstreamed patches
* Wed Aug 11 2021 Orion Poplawski <orion@nwra.com> - 2.1.0-20
- Rebuild for octave 6.3.0

2
sources
View File

@ -1 +1 @@
SHA512 (pfstools-2.1.0.tgz) = 2117d638a807ec803fec0e8a2d1478f2771cc39fb349b582ab2727762379dc52c9b2a50c276d123c2c7456cdc7518ae60bdaa6d2e3ff179f9f43df63f2b57012
SHA512 (pfstools-2.2.0.tgz) = 3a82fa44f6f67ba45203db9c5108df78176f1ad375042fe14e9108f4c9b5d46798e4a1544d842b50e4e326c1063808e095b46d35f374cb5ee5fb2fa1d93bcf8c