rpms/pfstmo/devel pfstmo-1.4-auto_ptr.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pfstmo-1.3.2-zd.patch, 1.1, 1.2 pfstmo.spec, 1.6, 1.7 sources, 1.2, 1.3

[Ulrich Drepper]

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24389

Modified Files:
	.cvsignore pfstmo-1.3.2-zd.patch pfstmo.spec sources 
Added Files:
	pfstmo-1.4-auto_ptr.patch 
Log Message:
New upstream release 1.4.


pfstmo-1.4-auto_ptr.patch:
 display_adaptive_tmo.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE pfstmo-1.4-auto_ptr.patch ---
--- pfstmo-1.4/src/mantiuk08/display_adaptive_tmo.h-s	2009-10-26 00:42:43.246689347 -0700
+++ pfstmo-1.4/src/mantiuk08/display_adaptive_tmo.h	2009-10-26 00:43:29.517453268 -0700
@@ -33,6 +33,7 @@
 #include "display_size.h"
 
 #include "pfstmo.h"
+#include <backward/auto_ptr.h>
 
 class datmoToneCurve
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jan 2009 06:28:45 -0000	1.2
+++ .cvsignore	26 Oct 2009 07:48:08 -0000	1.3
@@ -1 +1 @@
-pfstmo-1.3.2.tar.gz
+pfstmo-1.4.tar.gz

pfstmo-1.3.2-zd.patch:
 cqp/mg_pdip.c            |   12 ++++++------
 display_adaptive_tmo.cpp |    2 +-
 pfstmo_mantiuk08.cpp     |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

Index: pfstmo-1.3.2-zd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/pfstmo-1.3.2-zd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pfstmo-1.3.2-zd.patch	9 Jan 2009 06:28:45 -0000	1.1
+++ pfstmo-1.3.2-zd.patch	26 Oct 2009 07:48:08 -0000	1.2
@@ -51,7 +51,7 @@ diff -up pfstmo-1.3.2/src/mantiuk08/cqp/
 diff -up pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp
 --- pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd	2009-01-06 11:20:13.000000000 -0800
 +++ pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp	2009-01-06 11:20:41.000000000 -0800
-@@ -537,7 +537,7 @@ int solve( gsl_matrix *Q, gsl_vector *q,
+@@ -586,7 +586,7 @@ int solve( gsl_matrix *Q, gsl_vector *q,
      status = gsl_cqpminimizer_iterate(s);
      status = gsl_cqpminimizer_test_convergence(s, 1e-10, 1e-10);
  		  
@@ -72,7 +72,7 @@ diff -up pfstmo-1.3.2/src/mantiuk08/pfst
      else {
        int len = strlen( file_name );
        if( len > FRAME_NAME_MAX ) // In case file name is too long
-@@ -281,7 +281,7 @@ void tmo_mantiuk08(int argc, char * argv
+@@ -279,7 +279,7 @@ void tmo_mantiuk08(int argc, char * argv
        if( temporal_filter == 1 ) {
          // First pass of the temporal filter - store tone-curves, do not tone-map
          
@@ -81,7 +81,7 @@ diff -up pfstmo-1.3.2/src/mantiuk08/pfst
          for( int i=0; i < tc.size; i++ )
            fprintf( tp_FH, "%g,%g\n", tc.x_i[i], tc.y_i[i] );
  
-@@ -297,7 +297,7 @@ void tmo_mantiuk08(int argc, char * argv
+@@ -295,7 +295,7 @@ void tmo_mantiuk08(int argc, char * argv
  
          if( tc_FH != NULL ) {
            for( int i=0; i < tc.size; i++ )


Index: pfstmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/pfstmo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pfstmo.spec	26 Jul 2009 17:52:49 -0000	1.6
+++ pfstmo.spec	26 Oct 2009 07:48:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		pfstmo
-Version:	1.3.2
-Release:	7%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 Summary:	PFS tone mapping operators
 
 Group:		Applications/Multimedia
@@ -9,6 +9,7 @@ URL:		http://pfstools.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
 Patch1:		pfstmo-1.3.2-zd.patch
 Patch2:		pfstmo-CXXFLAGS.patch
+Patch3:		pfstmo-1.4-auto_ptr.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libtool
@@ -28,6 +29,7 @@ images and animations. 
 
 %patch1 -p1 -b .zd
 %patch2 -p1 -b .cxxflags
+%patch3 -p1 -b .auto_ptr
 
 autoreconf
 libtoolize --automake
@@ -69,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 26 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-1
+- Update to upstream release 1.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jan 2009 06:28:47 -0000	1.2
+++ sources	26 Oct 2009 07:48:09 -0000	1.3
@@ -1 +1 @@
-cd51b176ba228051304a8676861b6d0c  pfstmo-1.3.2.tar.gz
+90409a9adda70f59001c04cafcdab8d6  pfstmo-1.4.tar.gz