Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev

2 files changed, 84 insertions, 1 deletions

diff --git a/recipes/povray/povray-3.6.1+3.7.0-beta25b/boost.patch b/recipes/povray/povray-3.6.1+3.7.0-beta25b/boost.patch
new file mode 100644
index 0000000000..bd2ba46d2f
--- /dev/null
+++ b/recipes/povray/povray-3.6.1+3.7.0-beta25b/boost.patch
@@ -0,0 +1,82 @@
+Index: povray-3.7.0.beta.25b/source/backend/support/taskqueue.h
+===================================================================
+--- povray-3.7.0.beta.25b.orig/source/backend/support/taskqueue.h	2009-11-11 21:18:50.066527987 +0100
++++ povray-3.7.0.beta.25b/source/backend/support/taskqueue.h	2009-11-11 21:20:14.249441749 +0100
+@@ -98,6 +98,7 @@
+ 
+ #include <boost/thread.hpp>
+ #include <boost/shared_ptr.hpp>
++#include <boost/thread/condition.hpp>
+ 
+ #include "base/povmscpp.h"
+ #include "backend/support/task.h"
+Index: povray-3.7.0.beta.25b/source/backend/support/task.cpp
+===================================================================
+--- povray-3.7.0.beta.25b.orig/source/backend/support/task.cpp	2009-11-11 21:21:32.645269202 +0100
++++ povray-3.7.0.beta.25b/source/backend/support/task.cpp	2009-11-11 21:22:52.322759257 +0100
+@@ -241,7 +241,7 @@
+ 			FatalErrorHandler(e);
+ 			failed = e.code(kUncategorizedError);
+ 		}
+-		catch(exception& e)
++		catch(std::exception& e)
+ 		{
+ 			FatalErrorHandler(POV_EXCEPTION_STRING(e.what()));
+ 			failed = kUncategorizedError;
+@@ -266,7 +266,7 @@
+ 		FatalErrorHandler(e);
+ 		failed = e.code(kUncategorizedError);
+ 	}
+-	catch(exception& e)
++	catch(std::exception& e)
+ 	{
+ 		FatalErrorHandler(POV_EXCEPTION_STRING(e.what()));
+ 		failed = kUncategorizedError;
+@@ -291,7 +291,7 @@
+ 	{
+ 		FatalErrorHandler(e);
+ 	}
+-	catch(exception& e)
++	catch(std::exception& e)
+ 	{
+ 		FatalErrorHandler(POV_EXCEPTION_STRING(e.what()));
+ 	}
+Index: povray-3.7.0.beta.25b/vfe/vfesession.h
+===================================================================
+--- povray-3.7.0.beta.25b.orig/vfe/vfesession.h	2009-11-11 21:24:05.381913997 +0100
++++ povray-3.7.0.beta.25b/vfe/vfesession.h	2009-11-11 21:27:19.715316358 +0100
+@@ -94,6 +94,8 @@
+ #ifndef __VFESESSION_H__
+ #define __VFESESSION_H__
+ 
++#include <boost/thread/condition.hpp>
++
+ namespace vfe
+ {
+   using namespace pov_frontend;
+Index: povray-3.7.0.beta.25b/vfe/vfecontrol.cpp
+===================================================================
+--- povray-3.7.0.beta.25b.orig/vfe/vfecontrol.cpp	2009-11-11 21:27:33.098560840 +0100
++++ povray-3.7.0.beta.25b/vfe/vfecontrol.cpp	2009-11-11 21:28:18.396060074 +0100
+@@ -430,7 +430,7 @@
+     if (!m_Frontend->Start (m_RenderOptions.m_Options))
+       return (m_LastError = vfeFailedToSendRenderStart) ;
+   }
+-  catch (exception& e)
++  catch (std::exception& e)
+   {
+     if (dynamic_cast<pov_base::Exception *> (&e) != NULL)
+       m_RenderErrorCode = dynamic_cast<pov_base::Exception *> (&e)->code() ;
+Index: povray-3.7.0.beta.25b/vfe/vfesession.cpp
+===================================================================
+--- povray-3.7.0.beta.25b.orig/vfe/vfesession.cpp	2009-11-11 21:29:12.798555641 +0100
++++ povray-3.7.0.beta.25b/vfe/vfesession.cpp	2009-11-11 21:30:29.119796942 +0100
+@@ -695,7 +695,7 @@
+     m_Failed = true;
+     m_LastError = vfeCaughtException;
+   }
+-  catch (exception&)
++  catch (std::exception&)
+   {
+     m_Failed = true;
+     m_LastError = vfeCaughtException;
diff --git a/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb b/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb
index 5ca797cef6..82eacaee7c 100644
--- a/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb
+++ b/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb
@@ -4,12 +4,13 @@ SECTION = "console/graphics"
 LICENSE = "povray"
 DEPENDS = "virtual/libx11 boost zlib jpeg libpng tiff"
 
-PR = "r1"
+PR = "r2"
 
 #We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack.
 SRC_URI = "http://www.povray.org/redirect/www.povray.org/beta/source/povray-src-3.7.0.beta.25b.tar.bz2 \
            file://configure-cross-hack.patch;patch=1 \
 	   file://gcc43.diff;patch=1 \
+           file://boost.patch;patch=1 \
 	   "
 
 S = "${WORKDIR}/povray-3.7.0.beta.25b"