diff options
author | John Marino <marino@FreeBSD.org> | 2014-04-21 13:08:53 +0000 |
---|---|---|
committer | John Marino <marino@FreeBSD.org> | 2014-04-21 13:08:53 +0000 |
commit | dd918e15cfa734f8996aec6adad60e71fd9b6a2e (patch) | |
tree | 48c2682d2eb03b4ea8dccb731283d8eb7efd00fb /graphics/povray37/files/patch-vfe_vfe.cpp | |
parent | - Update to CDuce 0.6.0 (works with modern ocaml) (diff) |
graphics/povray37: Fix build on clang, support stage
The main problem with building this port with clang was the use of
shared_ptr without the boost namespace which clashes with libc++. This
occurs in numerous places but luckly sed can fix most of them save for
a few files that inconsistently used boost names.
It was also missing an explicit link to libboost_system [1]
PR: ports/176172
Submitted by: Oliver Hartmann
Approved by: Maintainer timeout
Stage support: blanket approval
MFH: 2014Q2
Notes
Notes:
svn path=/head/; revision=351680
Diffstat (limited to 'graphics/povray37/files/patch-vfe_vfe.cpp')
-rw-r--r-- | graphics/povray37/files/patch-vfe_vfe.cpp | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/graphics/povray37/files/patch-vfe_vfe.cpp b/graphics/povray37/files/patch-vfe_vfe.cpp new file mode 100644 index 000000000000..e4a536ad7fa2 --- /dev/null +++ b/graphics/povray37/files/patch-vfe_vfe.cpp @@ -0,0 +1,40 @@ +--- vfe/vfe.cpp.orig 2012-06-19 11:29:39.000000000 -0500 ++++ vfe/vfe.cpp +@@ -640,7 +640,7 @@ void vfeProcessRenderOptions::WriteError + // + //////////////////////////////////////////////////////////////////////////////////////// + +-VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr<Console>& console) : ++VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, boost::shared_ptr<Console>& console) : + m_Session(&session), m_PlatformBase(session), renderFrontend (ctx) + { + backendAddress = addr ; +@@ -747,7 +747,7 @@ bool VirtualFrontEnd::Start(POVMS_Object + + if (m_Session->OutputToFileSet()) + { +- imageProcessing = shared_ptr<ImageProcessing> (new ImageProcessing (opts)); ++ imageProcessing = boost::shared_ptr<ImageProcessing> (new ImageProcessing (opts)); + UCS2String filename = imageProcessing->GetOutputFilename (opts, 0, 0); + options.SetUCS2String (kPOVAttrib_OutputFile, filename.c_str()); + +@@ -774,8 +774,8 @@ bool VirtualFrontEnd::Start(POVMS_Object + opts.Set(kPOVAttrib_Declare, declares); + imageProcessing.reset(); + if (m_Session->OutputToFileSet()) +- imageProcessing = shared_ptr<ImageProcessing> (new ImageProcessing (opts)) ; +- animationProcessing = shared_ptr<AnimationProcessing> (new AnimationProcessing (opts)) ; ++ imageProcessing = boost::shared_ptr<ImageProcessing> (new ImageProcessing (opts)) ; ++ animationProcessing = boost::shared_ptr<AnimationProcessing> (new AnimationProcessing (opts)) ; + options = animationProcessing->GetFrameRenderOptions () ; + } + +@@ -1151,7 +1151,7 @@ State VirtualFrontEnd::Process() + } + + // now we display the render window, if enabled +- shared_ptr<Display> display(GetDisplay()); ++ boost::shared_ptr<Display> display(GetDisplay()); + if (display != NULL) + { + vfeDisplay *disp = dynamic_cast<vfeDisplay *>(display.get()); |