rpms/pfstmo/F-9 import.log, NONE, 1.1 pfstmo-1.3.2-zd.patch, NONE, 1.1 pfstmo-CXXFLAGS.patch, NONE, 1.1 pfstmo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Ulrich Drepper]

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20529/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pfstmo-1.3.2-zd.patch pfstmo-CXXFLAGS.patch 
	pfstmo.spec 
Log Message:
pfstmo for F9.



--- NEW FILE import.log ---
pfstmo-1_3_2-3_fc10:F-9:pfstmo-1.3.2-3.fc10.src.rpm:1231482605

pfstmo-1.3.2-zd.patch:

--- NEW FILE pfstmo-1.3.2-zd.patch ---
diff -up pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c.zd pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c
--- pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c.zd	2009-01-06 11:17:15.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c	2009-01-06 11:19:04.000000000 -0800
@@ -307,7 +307,7 @@ mg_pdip_iterate (void *vstate, const gsl
 		printf("\n *** Predictor Step ***\n");
 		printf("\nthe right-hand side of the KKT-system:\n");
 		for(i=0; i<state->r->size; i++)
-			printf("r[%d]=%f ",i,gsl_vector_get(state->r,i));
+			printf("r[%zd]=%f ",i,gsl_vector_get(state->r,i));
 		printf("\n");	
 		printf("\nsolution (delta_x,-delta_y,-delta_z):\n");
 		for(i=0; i<delta->size; i++)
@@ -369,7 +369,7 @@ mg_pdip_iterate (void *vstate, const gsl
 		printf("\n *** Corrector Step ***\n");
 		printf("the right-hand side:\n");
 		for(i=0; i<state->r->size; i++)
-			printf("r[%d]=%f ",i,gsl_vector_get(state->r,i));
+			printf("r[%zd]=%f ",i,gsl_vector_get(state->r,i));
 		printf("\n");
 		for(i=0; i<delta->size; i++)
 			printf("%6.3f ",gsl_vector_get(delta,i));
@@ -671,24 +671,24 @@ print_vectors(const gsl_vector * x, cons
 {
 	size_t i;
 	
-	printf("\nx[1 x %d]:\n",x->size);
+	printf("\nx[1 x %zd]:\n",x->size);
 	for(i=0; i<x->size; i++)
 		printf("%f  ",gsl_vector_get(x,i));
 	printf("\n");
 
         if( y != NULL ) {
-          printf("\ny[1 x %d]: (LM zu Ax=b)\n",y->size);
+          printf("\ny[1 x %zd]: (LM zu Ax=b)\n",y->size);
           for(i=0; i<y->size; i++)
             printf("%f  ",gsl_vector_get(y,i));
           printf("\n");
         }
 	
-	printf("\nz[1 x %d]: (LM zu Cx>=d)\n",z->size);
+	printf("\nz[1 x %zd]: (LM zu Cx>=d)\n",z->size);
 	for(i=0; i<z->size; i++)
 		printf("%f  ",gsl_vector_get(z,i));		
 	printf("\n");
 	
-	printf("\ns[1 x %d]: (Slack zu Cx>=d)\n",s->size);
+	printf("\ns[1 x %zd]: (Slack zu Cx>=d)\n",s->size);
 	for(i=0; i<s->size; i++)
 		printf("%f  ",gsl_vector_get(s,i));
 	printf("\n");	
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,
     status = gsl_cqpminimizer_iterate(s);
     status = gsl_cqpminimizer_test_convergence(s, 1e-10, 1e-10);
 		  
-    if( verbose ) fprintf( stderr, "%4d   %14.8f  %13.6e  %13.6e\n", iter, gsl_cqpminimizer_f(s), gsl_cqpminimizer_gap(s), gsl_cqpminimizer_residuals_norm(s));
+    if( verbose ) fprintf( stderr, "%4zd   %14.8f  %13.6e  %13.6e\n", iter, gsl_cqpminimizer_f(s), gsl_cqpminimizer_gap(s), gsl_cqpminimizer_residuals_norm(s));
 		  
     if(status == GSL_SUCCESS)
     {
diff -up pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp.zd pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp
--- pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp.zd	2009-01-06 11:21:03.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp	2009-01-06 11:21:43.000000000 -0800
@@ -220,7 +220,7 @@ void tmo_mantiuk08(int argc, char * argv
 
     const char *file_name = frame->getTags()->getString( "FILE_NAME" );
     if( file_name == NULL )
-      sprintf( frame_name, "frame #%d", frame_no );
+      sprintf( frame_name, "frame #%zd", frame_no );
     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
       if( temporal_filter == 1 ) {
         // First pass of the temporal filter - store tone-curves, do not tone-map
         
-        fprintf( tp_FH, "%d,%d\n", frame_no, tc.size );          
+        fprintf( tp_FH, "%zd,%zd\n", frame_no, tc.size );          
         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
 
         if( tc_FH != NULL ) {
           for( int i=0; i < tc.size; i++ )
-            fprintf( tc_FH, "%d,%g,%g,%g\n", frame_no, tc.x_i[i], tc.y_i[i], df->inv_display( (float)pow( 10, tc.y_i[i] ) ) );
+            fprintf( tc_FH, "%zd,%g,%g,%g\n", frame_no, tc.x_i[i], tc.y_i[i], df->inv_display( (float)pow( 10, tc.y_i[i] ) ) );
         }      
     
 //    int res;

pfstmo-CXXFLAGS.patch:

--- NEW FILE pfstmo-CXXFLAGS.patch ---
diff -up pfstmo-1.3.2/configure.ac-save pfstmo-1.3.2/configure.ac
--- pfstmo-1.3.2/configure.ac-save	2009-01-07 23:08:20.000000000 -0800
+++ pfstmo-1.3.2/configure.ac	2009-01-07 23:08:40.000000000 -0800
@@ -36,7 +36,7 @@ AC_ARG_ENABLE(debug,
 		     AC_DEFINE([DEBUG])
 		  fi],
                   [enable_debug="no"
-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
+                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /"`
    	             CXXFLAGS="-O3 $temp_CXXFLAGS"
                      AC_DEFINE(NDEBUG, 1, [Disable assertion checks])
 


--- NEW FILE pfstmo.spec ---
Name:		pfstmo
Version:	1.3.2
Release:	3%{?dist}
Summary:	PFS tone mapping operators

Group:		Applications/Multimedia
License:	GPLv2+
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
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libtool
BuildRequires:	pfstools-devel
BuildRequires:	fftw-devel
BuildRequires:	gsl-devel

%description
The 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. 

%prep
%setup -q

%patch1 -p1 -b .zd
%patch2 -p1 -b .cxxflags

autoreconf

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog README COPYING TODO NEWS AUTHORS
%{_bindir}/pfstmo_reinhard05
%{_bindir}/pfstmo_pattanaik00
%{_bindir}/pfstmo_mantiuk06
%{_bindir}/pfstmo_fattal02
%{_bindir}/pfstmo_drago03
%{_bindir}/pfstmo_reinhard02
%{_bindir}/pfstmo_durand02
%{_bindir}/pfstmo_mantiuk08
%{_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


%changelog
* Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-3
- Make sure debug information is generated

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-2
- Add INSTALL to make install call

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-1
- New upstream release 1.3.2
- Fix some packaging issues
- Minor bug fix patch added

* Tue Aug 19 2008 Ulrich Drepper <drepper at redhat.com> - 1.3-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:43:39 -0000	1.1
+++ .cvsignore	9 Jan 2009 06:30:42 -0000	1.2
@@ -0,0 +1 @@
+pfstmo-1.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:43:39 -0000	1.1
+++ sources	9 Jan 2009 06:30:42 -0000	1.2
@@ -0,0 +1 @@
+cd51b176ba228051304a8676861b6d0c  pfstmo-1.3.2.tar.gz