Author: sparky Date: Sat Mar 5 17:27:53 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- new
---- Files affected:
SOURCES:
poker3d-cal3d.patch (NONE -> 1.1) (NEW), poker3d-namespace.patch (NONE ->
1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/poker3d-cal3d.patch
diff -u /dev/null SOURCES/poker3d-cal3d.patch:1.1
--- /dev/null Sat Mar 5 18:27:53 2005
+++ SOURCES/poker3d-cal3d.patch Sat Mar 5 18:27:48 2005
@@ -0,0 +1,51 @@
+--- poker3d-0.2.12.orig/cal3d/ucal3d_export.h
++++ poker3d-0.2.12/cal3d/ucal3d_export.h
+@@ -0,0 +1,48 @@
++/*
++*
++* Copyright (C) 2004 Mekensleep
++*
++* Mekensleep
++* 24 rue vieille du temple
++* 75004 Paris
++* [EMAIL PROTECTED]
++*
++* This program is free software; you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation; either version 2 of the License, or
++* (at your option) any later version.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with this program; if not, write to the Free Software
++* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++*
++* Authors:
++* Igor Kravtchenko <[EMAIL PROTECTED]>
++*
++*/
++
++#ifndef UCAL3D_H
++#define UCAL3D_H
++
++#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
++
++#ifndef UCAL3D_API
++#ifdef UCAL3D_EXPORTS
++#define UCAL3D_API __declspec(dllexport)
++#else
++#define UCAL3D_API __declspec(dllimport)
++#endif
++#endif
++
++#else
++
++#define UCAL3D_API
++
++#endif
++
++#endif
================================================================
Index: SOURCES/poker3d-namespace.patch
diff -u /dev/null SOURCES/poker3d-namespace.patch:1.1
--- /dev/null Sat Mar 5 18:27:53 2005
+++ SOURCES/poker3d-namespace.patch Sat Mar 5 18:27:48 2005
@@ -0,0 +1,44 @@
+diff -Nur poker3d-0.2.12.orig/include/osgchips/Stacks
poker3d-0.2.12.new/include/osgchips/Stacks
+--- poker3d-0.2.12.orig/include/osgchips/Stacks 2004-12-16
11:23:37.000000000 +0100
++++ poker3d-0.2.12.new/include/osgchips/Stacks 2005-03-03 21:28:20.791848784
+0100
+@@ -304,11 +304,11 @@
+ virtual bool supports(osg::Drawable::ConstAttributeFunctor&) const {
return true; }
+ virtual void accept(osg::Drawable::ConstAttributeFunctor& af) const {}
+
+- virtual bool supports(PrimitiveIndexFunctor&) const { return false; }
+- virtual void accept(PrimitiveIndexFunctor&) const {}
++ virtual bool supports(osg::PrimitiveIndexFunctor&) const { return false; }
++ virtual void accept(osg::PrimitiveIndexFunctor&) const {}
+
+- virtual bool supports(osg::Drawable::PrimitiveFunctor&) const { return
false; }
+- virtual void accept(osg::Drawable::PrimitiveFunctor& pf) const {}
++ virtual bool supports(osg::PrimitiveFunctor&) const { return false; }
++ virtual void accept(osg::PrimitiveFunctor& pf) const {}
+
+ private:
+ void setMesh(ChipBank* chipBank);
+diff -Nur poker3d-0.2.12.orig/src/ugame/Stacks.cpp
poker3d-0.2.12.new/src/ugame/Stacks.cpp
+--- poker3d-0.2.12.orig/src/ugame/Stacks.cpp 2004-12-16 13:09:59.000000000
+0100
++++ poker3d-0.2.12.new/src/ugame/Stacks.cpp 2005-03-03 21:27:12.435240568
+0100
+@@ -490,16 +490,16 @@
+ virtual bool supports(osg::Drawable::ConstAttributeFunctor&) const { return
true; }
+ virtual void accept(osg::Drawable::ConstAttributeFunctor& af) const {}
+
+- virtual bool supports(PrimitiveIndexFunctor&) const { return false; }
+- virtual void accept(PrimitiveIndexFunctor&) const {}
++ virtual bool supports(osg::PrimitiveIndexFunctor&) const { return false; }
++ virtual void accept(osg::PrimitiveIndexFunctor&) const {}
+
+- virtual bool supports(osg::Drawable::PrimitiveFunctor&) const { return
true; }
+- virtual void accept(osg::Drawable::PrimitiveFunctor& functor) const;
++ virtual bool supports(osg::PrimitiveFunctor&) const { return true; }
++ virtual void accept(osg::PrimitiveFunctor& functor) const;
+
+ osg::ref_ptr<osg::Vec3Array> _box;
+ };
+
+-void Box::accept(osg::Drawable::PrimitiveFunctor& functor) const {
++void Box::accept(osg::PrimitiveFunctor& functor) const {
+ for(osg::Drawable::ParentList::const_iterator i = _parents.begin(); i !=
_parents.end(); i++) {
+ (*i)->getBound();
+ }
================================================================
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
