From cd2ae39da4ef7a100115742c821b75a0eaeec430 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 2 Nov 2009 04:45:52 +0000 Subject: [PATCH] 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. --- media-libs/cal3d/patches/cal3d-0.11.0.patch | 64 ++++++++++++++------- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/media-libs/cal3d/patches/cal3d-0.11.0.patch b/media-libs/cal3d/patches/cal3d-0.11.0.patch index 67aa109dc..c41a71b0e 100644 --- a/media-libs/cal3d/patches/cal3d-0.11.0.patch +++ b/media-libs/cal3d/patches/cal3d-0.11.0.patch @@ -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 ++#include + + /** + * 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 +-#include ++#include + #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 ++#include + + /** + * 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 - #define SKELETON 0 - #define MESH 1 - #define ANIMATION 2