rpms/aqsis/devel aqsis-1.2.0-gcc43.patch, NONE, 1.1 aqsis.spec, 1.3, 1.4

Chauvet (kwizart) fedora-extras-commits at redhat.com
Mon Jan 7 23:02:59 UTC 2008


Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31447

Modified Files:
	aqsis.spec 
Added Files:
	aqsis-1.2.0-gcc43.patch 
Log Message:
- Fix gcc43


aqsis-1.2.0-gcc43.patch:

--- NEW FILE aqsis-1.2.0-gcc43.patch ---
diff -up aqsis-1.2.0/displays/d_xpm/aspXpm.h.gcc43 aqsis-1.2.0/displays/d_xpm/aspXpm.h
--- aqsis-1.2.0/displays/d_xpm/aspXpm.h.gcc43	2008-01-07 23:35:34.000000000 +0100
+++ aqsis-1.2.0/displays/d_xpm/aspXpm.h	2008-01-07 23:32:06.000000000 +0100
@@ -4,6 +4,7 @@
 #include <iomanip>
 #include <iosfwd>
 #include <vector>
+#include <cstring>
 
 #ifndef aspXpm_H
 #define aspXpm_H
diff -up aqsis-1.2.0/displays/display/display.cpp.gcc43 aqsis-1.2.0/displays/display/display.cpp
--- aqsis-1.2.0/displays/display/display.cpp.gcc43	2008-01-07 23:26:13.000000000 +0100
+++ aqsis-1.2.0/displays/display/display.cpp	2008-01-07 23:26:59.000000000 +0100
@@ -44,6 +44,7 @@ using namespace Aqsis;
 #include <algorithm>
 #include <float.h>
 #include <time.h>
+#include <cstring>
 
 #include "ndspy.h"
 
diff -up aqsis-1.2.0/rib/rib2/bdec.h.gcc43 aqsis-1.2.0/rib/rib2/bdec.h
--- aqsis-1.2.0/rib/rib2/bdec.h.gcc43	2007-01-11 14:08:52.000000000 +0100
+++ aqsis-1.2.0/rib/rib2/bdec.h	2008-01-07 19:43:50.000000000 +0100
@@ -28,6 +28,7 @@
 #include <string>
 #include <vector>
 #include <stdio.h>
+#include <cstdlib>
 #include <zlib.h>
 #include "aqsis.h"
 #include "rib2_common.h"
diff -up aqsis-1.2.0/rib/rib2/libribtypes.h.gcc43 aqsis-1.2.0/rib/rib2/libribtypes.h
--- aqsis-1.2.0/rib/rib2/libribtypes.h.gcc43	2008-01-07 20:27:03.000000000 +0100
+++ aqsis-1.2.0/rib/rib2/libribtypes.h	2008-01-07 20:27:37.000000000 +0100
@@ -30,6 +30,7 @@ using namespace librib;
 
 //#include <string>
 #include <vector>
+#include <cstring>
 //#include <cassert>
 
 namespace librib
diff -up aqsis-1.2.0/rib/rib2/librib.h.gcc43 aqsis-1.2.0/rib/rib2/librib.h
--- aqsis-1.2.0/rib/rib2/librib.h.gcc43	2008-01-07 21:49:00.000000000 +0100
+++ aqsis-1.2.0/rib/rib2/librib.h	2008-01-07 21:49:52.000000000 +0100
@@ -3,6 +3,7 @@
 
 #include <iostream>
 #include <string>
+#include <cstring>
 #include <stdio.h>
 
 #include "ri.h"
diff -up aqsis-1.2.0/rib/rib2ri/librib2ri.cpp.gcc43 aqsis-1.2.0/rib/rib2ri/librib2ri.cpp
diff -up aqsis-1.2.0/rib/rib2ri/librib2ri.h.gcc43 aqsis-1.2.0/rib/rib2ri/librib2ri.h
--- aqsis-1.2.0/rib/rib2ri/librib2ri.h.gcc43	2007-01-11 14:08:52.000000000 +0100
+++ aqsis-1.2.0/rib/rib2ri/librib2ri.h	2008-01-07 21:12:58.000000000 +0100
@@ -6,6 +6,8 @@
 namespace librib2ri
 {
 
+#include <cstring>
+
 /// Implements the librib::RendermanInterface interface, and sends data to the Renderman Interface "C" API
 class RIB_SHARE Engine :
 			public librib::RendermanInterface
diff -up aqsis-1.2.0/rib/miqser/miqser.cpp.gcc43 aqsis-1.2.0/rib/miqser/miqser.cpp
--- aqsis-1.2.0/rib/miqser/miqser.cpp.gcc43	2008-01-07 23:14:43.000000000 +0100
+++ aqsis-1.2.0/rib/miqser/miqser.cpp	2008-01-07 23:15:38.000000000 +0100
@@ -43,6 +43,7 @@
 #include <vector>
 #include <stdio.h>
 #include <time.h>
+#include <memory>
 
 #ifdef AQSIS_SYSTEM_WIN32
   #include <windows.h>
diff -up aqsis-1.2.0/rib/ri2rib/context.h.gcc43 aqsis-1.2.0/rib/ri2rib/context.h
--- aqsis-1.2.0/rib/ri2rib/context.h.gcc43	2008-01-07 22:51:54.000000000 +0100
+++ aqsis-1.2.0/rib/ri2rib/context.h	2008-01-07 22:53:05.000000000 +0100
@@ -27,6 +27,7 @@
 #define RI2RIB_CONTEXT_H 1
 
 #include <list>
+#include <cstring>
 #include "ri.h"
 #include "aqsis.h"
 #include "options.h"
diff -up aqsis-1.2.0/texturing/teqser/teqser.cpp.gcc43 aqsis-1.2.0/texturing/teqser/teqser.cpp
--- aqsis-1.2.0/texturing/teqser/teqser.cpp.gcc43	2008-01-07 23:18:46.000000000 +0100
+++ aqsis-1.2.0/texturing/teqser/teqser.cpp	2008-01-07 23:18:21.000000000 +0100
@@ -2,6 +2,8 @@
 //
 
 #include	<stdio.h>
+#include	<memory>
+#include	<cstring>
 
 
 #ifdef	AQSIS_SYSTEM_WIN32
diff -up aqsis-1.2.0/argparse/argparse.h.gcc43 aqsis-1.2.0/argparse/argparse.h
--- aqsis-1.2.0/argparse/argparse.h.gcc43	2005-12-11 21:32:46.000000000 +0100
+++ aqsis-1.2.0/argparse/argparse.h	2008-01-07 19:43:50.000000000 +0100
@@ -24,6 +24,7 @@
 
 #include <string>
 #include <vector>
+#include <cstdlib>
 
 class ArgParseInternalData;	// hide implementation details
 
diff -up aqsis-1.2.0/renderer/render/blobby.cpp.gcc43 aqsis-1.2.0/renderer/render/blobby.cpp
--- aqsis-1.2.0/renderer/render/blobby.cpp.gcc43	2006-10-23 16:23:43.000000000 +0200
+++ aqsis-1.2.0/renderer/render/blobby.cpp	2008-01-07 19:43:50.000000000 +0100
@@ -33,6 +33,7 @@
 #include <vector>
 #include <list>
 #include <limits>
+#include <cstring>
 
 #include "aqsis.h"
 #include "ri.h"
diff -up aqsis-1.2.0/renderer/aqsis/aqsis.cpp.gcc43 aqsis-1.2.0/renderer/aqsis/aqsis.cpp
--- aqsis-1.2.0/renderer/aqsis/aqsis.cpp.gcc43	2008-01-07 23:23:58.000000000 +0100
+++ aqsis-1.2.0/renderer/aqsis/aqsis.cpp	2008-01-07 23:24:06.000000000 +0100
@@ -44,6 +44,7 @@
 #include <vector>
 #include <stdio.h>
 #include <time.h>
+#include <memory>
 
 #ifdef AQSIS_SYSTEM_WIN32
   #include <windows.h>
diff -up aqsis-1.2.0/renderer/ddmanager/ddmanager.h.gcc43 aqsis-1.2.0/renderer/ddmanager/ddmanager.h
--- aqsis-1.2.0/renderer/ddmanager/ddmanager.h.gcc43	2006-06-14 16:39:50.000000000 +0200
+++ aqsis-1.2.0/renderer/ddmanager/ddmanager.h	2008-01-07 19:43:50.000000000 +0100
@@ -28,6 +28,7 @@
 #define ___ddmanager_Loaded___
 
 #include	<vector>
+#include	<cstring>
 
 #include	"aqsis.h"
 #include	"ri.h"
diff -up aqsis-1.2.0/shadercompiler/shaderexecenv/shaderexecenv.h.gcc43 aqsis-1.2.0/shadercompiler/shaderexecenv/shaderexecenv.h
--- aqsis-1.2.0/shadercompiler/shaderexecenv/shaderexecenv.h.gcc43	2008-01-07 20:45:46.000000000 +0100
+++ aqsis-1.2.0/shadercompiler/shaderexecenv/shaderexecenv.h	2008-01-07 20:46:17.000000000 +0100
@@ -32,6 +32,7 @@
 #include	<vector>
 #include	<stack>
 #include	<map>
+#include	<cstring>
 
 #include	"bitvector.h"
 #include	"color.h"
diff -up aqsis-1.2.0/shadercompiler/codegenvm/vmoutput.cpp.gcc43 aqsis-1.2.0/shadercompiler/codegenvm/vmoutput.cpp
--- aqsis-1.2.0/shadercompiler/codegenvm/vmoutput.cpp.gcc43	2008-01-07 22:29:47.000000000 +0100
+++ aqsis-1.2.0/shadercompiler/codegenvm/vmoutput.cpp	2008-01-07 22:31:15.000000000 +0100
@@ -32,7 +32,7 @@
 #include	<deque>
 #include	<string>
 #include	<map>
-
+#include	<cstdlib>
 
 #include	"version.h"
 #include	"vmoutput.h"
diff -up aqsis-1.2.0/shadercompiler/slparse/parsenode.h.gcc43 aqsis-1.2.0/shadercompiler/slparse/parsenode.h
--- aqsis-1.2.0/shadercompiler/slparse/parsenode.h.gcc43	2008-01-07 22:25:27.000000000 +0100
+++ aqsis-1.2.0/shadercompiler/slparse/parsenode.h	2008-01-07 22:25:59.000000000 +0100
@@ -11,6 +11,7 @@
 #define PARSENODE_H_INCLUDED 1
 
 #include	<vector>
+#include	<cstring>
 
 #include	"aqsis.h"
 
diff -up aqsis-1.2.0/shadercompiler/slparse/parser.cpp.gcc43 aqsis-1.2.0/shadercompiler/slparse/parser.cpp
--- aqsis-1.2.0/shadercompiler/slparse/parser.cpp.gcc43	2008-01-07 21:54:44.000000000 +0100
+++ aqsis-1.2.0/shadercompiler/slparse/parser.cpp	2008-01-07 21:57:15.000000000 +0100
@@ -204,6 +204,7 @@ namespace std
 #include <iostream>
 #include <map>
 #include <string>
+#include <cstring>
 #include <vector>
 #include <cassert>
 
diff -up aqsis-1.2.0/shadercompiler/aqsl/aqslcomp.cpp.gcc43 aqsis-1.2.0/shadercompiler/aqsl/aqslcomp.cpp
--- aqsis-1.2.0/shadercompiler/aqsl/aqslcomp.cpp.gcc43	2008-01-07 22:38:24.000000000 +0100
+++ aqsis-1.2.0/shadercompiler/aqsl/aqslcomp.cpp	2008-01-07 22:43:11.000000000 +0100
@@ -32,6 +32,8 @@
 #include	<fstream>
 #include	<sstream>
 #include	<stdio.h>
+#include	<memory>
+#include	<cstring>
 
 #ifdef	AQSIS_SYSTEM_WIN32
 #include	"io.h"
diff -up aqsis-1.2.0/shadercompiler/shadervm/dsoshadeops.h.gcc43 aqsis-1.2.0/shadercompiler/shadervm/dsoshadeops.h
--- aqsis-1.2.0/shadercompiler/shadervm/dsoshadeops.h.gcc43	2008-01-07 20:51:33.000000000 +0100
+++ aqsis-1.2.0/shadercompiler/shadervm/dsoshadeops.h	2008-01-07 20:52:31.000000000 +0100
@@ -27,6 +27,7 @@
 #include	<vector>
 #include	<list>
 #include	<map>
+#include	<cstring>
 
 #include	"vector3d.h"
 #include	"vector4d.h"
diff -up aqsis-1.2.0/shadercompiler/aqsltell/aqsltell.cpp.gcc43 aqsis-1.2.0/shadercompiler/aqsltell/aqsltell.cpp
--- aqsis-1.2.0/shadercompiler/aqsltell/aqsltell.cpp.gcc43	2008-01-07 22:47:52.000000000 +0100
+++ aqsis-1.2.0/shadercompiler/aqsltell/aqsltell.cpp	2008-01-07 22:48:09.000000000 +0100
@@ -45,6 +45,7 @@
 #include <fstream>
 #include <string>
 #include <vector>
+#include <cstring>
 
 #include <stdio.h>
 


Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/aqsis.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aqsis.spec	15 Oct 2007 14:28:00 -0000	1.3
+++ aqsis.spec	7 Jan 2008 23:02:24 -0000	1.4
@@ -1,17 +1,13 @@
-# Title: Aqsis Package for Linux (RPM)
-# Author: Aqsis Team (packages at aqsis.org)
-
-
-
 Name:		aqsis
 Version:	1.2.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Open source RenderMan-compliant 3D rendering solution
 Group:		Applications/Multimedia
 
 License:	GPLv2+
 URL:		http://www.aqsis.org
 Source:		http://download.aqsis.org/stable/source/tar/%{name}-%{version}.tar.gz
+Patch0:         aqsis-1.2.0-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -64,6 +60,7 @@
 sed -i 's/\r//' thirdparty/dbo_plane/implicit.h
 # script-without-shebang
 find shadercompiler/slparse texturing/plugins/png2tif displays thirdparty/dbo_plane aqsistypes rib -type f -name \* -exec chmod 644 {} \;
+%patch0 -p1 -b .gcc43
 
 
 %build
@@ -138,6 +135,9 @@
 
 
 %changelog
+* Mon Jan  7 2008 kwizart < kwizart at gmail.com > - 1.2.0-7
+- Fix gcc43
+
 * Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 1.2.0-6
 - Rebuild
 




More information about the fedora-extras-commits mailing list