haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated cal3d patch to fix a couple issues when building with gcc2, note that it's note yet building with gcc2, but this gets it further, gcc4 build should still work ok though.

Browse Source
This commit is contained in:
Scott McCreary
2009-11-02 04:45:52 +00:00
parent a81e7dad3d
commit cd2ae39da4
1 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
media-libs/cal3d/patches/cal3d-0.11.0.patch
View File

@@ -1,6 +1,18 @@
diff -Naur cal3d-0.11.0/src/cal3d/hardwaremodel.cpp cal3d-0.11.0-haiku/src/cal3d/hardwaremodel.cpp
diff -urN cal3d-0.11.0/src/cal3d/buffersource.h cal3d-0.11.0-haiku/src/cal3d/buffersource.h
--- cal3d-0.11.0/src/cal3d/buffersource.h 2003-08-19 02:53:25.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/buffersource.h 2009-11-02 04:24:16.000000000 +0000
@@ -17,7 +17,7 @@
#include "cal3d/global.h"
#include "cal3d/datasource.h"
-#include <istream>
+#include <iostream>
/**
* CalBufferSource class.
diff -urN cal3d-0.11.0/src/cal3d/hardwaremodel.cpp cal3d-0.11.0-haiku/src/cal3d/hardwaremodel.cpp
--- cal3d-0.11.0/src/cal3d/hardwaremodel.cpp 2004-12-01 22:42:18.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/hardwaremodel.cpp 2009-11-01 20:11:19.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/hardwaremodel.cpp 2009-11-02 04:18:44.000000000 +0000
@@ -12,6 +12,7 @@
#include "config.h"
#endif
@@ -9,9 +21,21 @@ diff -Naur cal3d-0.11.0/src/cal3d/hardwaremodel.cpp cal3d-0.11.0-haiku/src/cal3d
#include "cal3d/error.h"
#include "cal3d/hardwaremodel.h"
diff -Naur cal3d-0.11.0/src/cal3d/platform.cpp cal3d-0.11.0-haiku/src/cal3d/platform.cpp
diff -urN cal3d-0.11.0/src/cal3d/loader.h cal3d-0.11.0-haiku/src/cal3d/loader.h
--- cal3d-0.11.0/src/cal3d/loader.h 2006-06-08 15:12:13.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/loader.h 2009-11-02 04:25:29.000000000 +0000
@@ -17,7 +17,7 @@
#include <string>
-#include <istream>
+#include <iostream>
#include "cal3d/global.h"
#include "cal3d/datasource.h"
#include "cal3d/coreanimation.h"
diff -urN cal3d-0.11.0/src/cal3d/platform.cpp cal3d-0.11.0-haiku/src/cal3d/platform.cpp
--- cal3d-0.11.0/src/cal3d/platform.cpp 2003-12-07 18:22:39.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/platform.cpp 2009-11-01 20:11:59.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/platform.cpp 2009-11-02 04:18:44.000000000 +0000
@@ -15,7 +15,7 @@
//****************************************************************************//
// Includes //
@@ -21,9 +45,9 @@ diff -Naur cal3d-0.11.0/src/cal3d/platform.cpp cal3d-0.11.0-haiku/src/cal3d/plat
#include "cal3d/platform.h"
/*****************************************************************************/
diff -Naur cal3d-0.11.0/src/cal3d/renderer.cpp cal3d-0.11.0-haiku/src/cal3d/renderer.cpp
diff -urN cal3d-0.11.0/src/cal3d/renderer.cpp cal3d-0.11.0-haiku/src/cal3d/renderer.cpp
--- cal3d-0.11.0/src/cal3d/renderer.cpp 2004-12-30 19:20:54.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/renderer.cpp 2009-11-01 20:12:13.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/renderer.cpp 2009-11-02 04:18:44.000000000 +0000
@@ -15,7 +15,7 @@
//****************************************************************************//
// Includes //
@@ -33,9 +57,21 @@ diff -Naur cal3d-0.11.0/src/cal3d/renderer.cpp cal3d-0.11.0-haiku/src/cal3d/rend
#include "cal3d/error.h"
#include "cal3d/renderer.h"
#include "cal3d/coremodel.h"
diff -Naur cal3d-0.11.0/src/cal3d/submesh.cpp cal3d-0.11.0-haiku/src/cal3d/submesh.cpp
diff -urN cal3d-0.11.0/src/cal3d/streamsource.h cal3d-0.11.0-haiku/src/cal3d/streamsource.h
--- cal3d-0.11.0/src/cal3d/streamsource.h 2003-08-19 02:53:25.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/streamsource.h 2009-11-02 04:25:03.000000000 +0000
@@ -17,7 +17,7 @@
#include "cal3d/global.h"
#include "cal3d/datasource.h"
-#include <istream>
+#include <iostream>
/**
* CalStreamSource class.
diff -urN cal3d-0.11.0/src/cal3d/submesh.cpp cal3d-0.11.0-haiku/src/cal3d/submesh.cpp
--- cal3d-0.11.0/src/cal3d/submesh.cpp 2004-12-01 22:42:18.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/submesh.cpp 2009-11-01 20:12:36.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d/submesh.cpp 2009-11-02 04:18:44.000000000 +0000
@@ -11,7 +11,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -45,15 +81,3 @@ diff -Naur cal3d-0.11.0/src/cal3d/submesh.cpp cal3d-0.11.0-haiku/src/cal3d/subme
#include "cal3d/submesh.h"
#include "cal3d/error.h"
#include "cal3d/coresubmesh.h"
diff -Naur cal3d-0.11.0/src/cal3d_converter.cpp cal3d-0.11.0-haiku/src/cal3d_converter.cpp
--- cal3d-0.11.0/src/cal3d_converter.cpp 2006-05-28 17:35:09.000000000 +0000
+++ cal3d-0.11.0-haiku/src/cal3d_converter.cpp 2009-11-01 20:13:18.000000000 +0000
@@ -10,7 +10,7 @@
//****************************************************************************//
#include "cal3d/cal3d.h"
-
+#include <cstring>
#define SKELETON 0
#define MESH 1
#define ANIMATION 2