The following commit has been merged in the master branch:
commit a87fa156991b093d446f810f95c103ab5541d1bb
Author: Stephen M. Webb <stephen.w...@bregmasoft.ca>
Date: Wed May 30 15:42:14 2012 -0400
pulled patch for #977460 from upstream instead
diff --git a/debian/patches/0008-replace-fastdeletegate-with-boost.patch
b/debian/patches/0008-replace-fastdeletegate-with-boost.patch
index be48d0a..b84f678 100644
--- a/debian/patches/0008-replace-fastdeletegate-with-boost.patch
+++ b/debian/patches/0008-replace-fastdeletegate-with-boost.patch
@@ -1,5 +1,5 @@
Description: replaces FastDelegate with GPL-compatible boost::function
-Author: Stephen M. Webb <stephen.w...@bregmasoft.ca>
+Origin:
https://github.com/worldforge/ember/commit/565fc1dba5cc954e1c2f24dcb23a0b3ed6f047be
Bug: https://bugs.launchpad.net/ember/+bug/977460
---
a/src/components/ogre/SceneManagers/EmberPagingSceneManager/include/OgrePagingLandScapeCallBackEvent.h
@@ -9,7 +9,7 @@ Bug: https://bugs.launchpad.net/ember/+bug/977460
#include "Ogre.h"
-#include "OgrePagingLandScapeCallback.h"
-+#include <boost/function.hpp>
++#include <sigc++/slot.h>
namespace Ogre
{
@@ -18,25 +18,27 @@ Bug: https://bugs.launchpad.net/ember/+bug/977460
};
- typedef fastdelegate::FastDelegate1<PagingLandscapeEvent *>
PagingLandscapeDelegate;
-+ typedef boost::function<void (PagingLandscapeEvent *)>
PagingLandscapeDelegate;
++ typedef sigc::slot<void, PagingLandscapeEvent *>
PagingLandscapeDelegate;
}
#endif //__PagingLandScapeCallBackEvent_H__
---
a/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/EmberPagingSceneManagerAdapter.cpp
+++
b/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/EmberPagingSceneManagerAdapter.cpp
-@@ -35,6 +35,7 @@
- #include "OgrePagingLandScapeRenderableManager.h"
- #include "OgrePagingLandScapeTileManager.h"
- #include "OgrePagingLandScapeListenerManager.h"
-+#include <boost/bind.hpp>
-
- namespace Ember {
- namespace OgreView {
-@@ -225,7 +226,7 @@
+@@ -225,7 +225,7 @@
Terrain::ITerrainObserver*
EmberPagingSceneManagerAdapter::createObserver()
{
EmberPagingTerrainObserver* observer = new
EmberPagingTerrainObserver();
- Ogre::PagingLandscapeDelegate* delegate = new
Ogre::PagingLandscapeDelegate(observer, &EmberPagingTerrainObserver::tileShow);
-+ Ogre::PagingLandscapeDelegate* delegate = new
Ogre::PagingLandscapeDelegate(boost::bind(&EmberPagingTerrainObserver::tileShow,
observer, _1));
++ Ogre::PagingLandscapeDelegate* delegate = new
Ogre::PagingLandscapeDelegate(sigc::mem_fun(observer,
&EmberPagingTerrainObserver::tileShow));
mSceneManager.getListenerManager()->addShowTileListener(delegate);
mTerrainObservers.insert(TerrainObserverStore::value_type(observer, delegate));
return observer;
+---
a/src/components/ogre/SceneManagers/EmberPagingSceneManager/include/Makefile.am
++++
b/src/components/ogre/SceneManagers/EmberPagingSceneManager/include/Makefile.am
+@@ -49,7 +49,6 @@
+ OgrePagingLandScapeOcclusionSorter.h \
+ OgrePagingLandScapePrecompiledHeaders.h \
+ OgrePagingLandScapeCallBackEvent.h \
+- OgrePagingLandScapeCallback.h \
+ OgrePagingLandScapeAABSQ.h \
+ OgrePagingLandScapeMeshDecal.h \
+ \
--
WorldForge 3D client
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
