[113814] trunk/dports/graphics/povray
ryandesign at macports.org
ryandesign at macports.org
Sat Nov 23 20:24:24 PST 2013
Revision: 113814
https://trac.macports.org/changeset/113814
Author: ryandesign at macports.org
Date: 2013-11-23 20:24:24 -0800 (Sat, 23 Nov 2013)
Log Message:
-----------
povray: update to 3.7.0.0 and fix build on Mavericks (#40919)
Modified Paths:
--------------
trunk/dports/graphics/povray/Portfile
Added Paths:
-----------
trunk/dports/graphics/povray/files/patch-unix-configure.ac.diff
trunk/dports/graphics/povray/files/patch-unix-prebuild.sh.diff
Removed Paths:
-------------
trunk/dports/graphics/povray/files/patch-configure-stat.diff
trunk/dports/graphics/povray/files/patch-shared_ptr.diff
Modified: trunk/dports/graphics/povray/Portfile
===================================================================
--- trunk/dports/graphics/povray/Portfile 2013-11-24 03:43:11 UTC (rev 113813)
+++ trunk/dports/graphics/povray/Portfile 2013-11-24 04:24:24 UTC (rev 113814)
@@ -2,11 +2,10 @@
# $Id$
PortSystem 1.0
+PortGroup github 1.0
PortGroup muniversal 1.0
-name povray
-version 3.7.0.RC7
-revision 1
+github.setup POV-Ray povray 3.7.0.0 v
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
platforms darwin
@@ -19,13 +18,13 @@
UNIX version, not the graphical Mac OS X version.
homepage http://www.povray.org/
-master_sites ${homepage}beta/source/
-use_bzip2 yes
-checksums rmd160 e75db88beb10360de917f22e182c7918f017b995 \
- sha256 fd2fdf8673bb20e66d77f550eca7b6052cce971731d11a1f96edd950641c09fd
+checksums rmd160 e60baea42f8041b4647bc874021e2ff1f9c3300d \
+ sha256 33335f90394d3a3e2e108a69ac367ec7a75b2699ea48bb59fa197be5c22f4810
-depends_build port:pkgconfig
+depends_build port:autoconf \
+ port:automake \
+ port:pkgconfig
depends_lib port:boost \
port:openexr \
@@ -37,32 +36,50 @@
port:zlib \
port:tiff
-# patch-shared_ptr.diff:
-# gsed -i 's/\([ (]\)shared_ptr/\1boost::shared_ptr/g' "${@}"
-# gsed -i 's/^shared_ptr/boost::shared_ptr/g' "${@}"
+post-patch {
+ fs-traverse item ${worksrcpath} {
+ if {[file isfile ${item}]} {
+ switch [file extension ${item}] {
+ .cpp -
+ .h -
+ .hpp {
+ # Replace shared_ptr with boost::shared_ptr.
+ # https://github.com/POV-Ray/povray/issues/8
+ reinplace -locale en_US.ISO8859-1 -E {/^[ ]*\/\//! s%([ (]|^)(shared_ptr)%\1boost::\2%g} ${item}
+ }
+ }
+ }
+ }
+}
-patchfiles patch-shared_ptr.diff
+pre-configure {
+ # There is no pre-generated configure script included in the download.
+ # https://github.com/POV-Ray/povray/issues/1
+ system -W ${worksrcpath}/unix "./prebuild.sh"
+}
-configure.env COMPILED_BY="MacPorts"
+configure.env COMPILED_BY="MacPorts <https://www.macports.org/>"
configure.libs -lboost_system-mt
configure.args --with-boost=${prefix} \
--with-boost-thread \
- --with-libjpeg=${prefix} \
- --with-libpng=${prefix} \
- --with-libsdl=${prefix} \
- --with-libtiff=${prefix} \
- --with-openexr=${prefix} \
- --with-zlib=${prefix}
+ --with-libjpeg=${prefix}/lib \
+ --with-libpng=${prefix}/lib \
+ --with-libsdl=${prefix}/lib \
+ --with-libtiff=${prefix}/lib \
+ --with-openexr=${prefix}/lib \
+ --with-zlib=${prefix}/lib
+set conf_files {povray.conf povray.ini}
+
post-destroot {
- foreach f {povray.conf povray.ini} {
+ foreach f ${conf_files} {
move ${destroot}${prefix}/etc/povray/${branch}/${f} \
${destroot}${prefix}/etc/povray/${branch}/${f}.sample
}
}
post-activate {
- foreach f {povray.conf povray.ini} {
+ foreach f ${conf_files} {
if {![file exists ${prefix}/etc/povray/${branch}/${f}]} {
copy ${prefix}/etc/povray/${branch}/${f}.sample \
${prefix}/etc/povray/${branch}/${f}
@@ -74,16 +91,16 @@
test.target check
# Unable to cross compile, so we need to be able to run the built code
-if {${os.arch} == "i386" && ${os.major} >= 11} {
+if {${os.arch} eq "i386" && ${os.major} >= 11} {
supported_archs i386 x86_64
set universal_archs_supported {i386 x86_64}
-} elseif {${os.arch} == "i386" && ${configure.build_arch} == "x86_64"} {
+} elseif {${os.arch} eq "i386" && ${configure.build_arch} eq "x86_64"} {
supported_archs i386 x86_64 ppc
set universal_archs_supported {i386 x86_64 ppc}
-} elseif {${os.arch} == "i386"} {
+} elseif {${os.arch} eq "i386"} {
supported_archs i386 ppc
set universal_archs_supported {i386 ppc}
-} elseif {${configure.build_arch} == "ppc64"} {
+} elseif {${configure.build_arch} eq "ppc64"} {
supported_archs ppc ppc64
set universal_archs_supported {ppc ppc64}
} else {
@@ -92,7 +109,8 @@
}
platform darwin {
- patchfiles-append patch-configure-stat.diff \
+ patchfiles-append patch-unix-configure.ac.diff \
+ patch-unix-prebuild.sh.diff \
patch-lseek64.diff \
patch-vfe-uint.diff
@@ -105,15 +123,6 @@
}
}
- if {${os.major} >= 13} {
- depends_build
- depends_lib
- pre-fetch {
- ui_error "${name} @${version} does not build on OS X 10.9 Mavericks or later."
- return -code error "unsupported OS X version"
- }
- }
-
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major}
@@ -125,7 +134,3 @@
configure.args-append --host=$merger_host(${configure.build_arch}) $merger_configure_args(${configure.build_arch})
}
}
-
-livecheck.type regex
-livecheck.url ${homepage}ftp/pub/povray/Official/Unix/
-livecheck.regex {CURRENT-VERSION-IS-([0-9.]+)}
Deleted: trunk/dports/graphics/povray/files/patch-configure-stat.diff
===================================================================
--- trunk/dports/graphics/povray/files/patch-configure-stat.diff 2013-11-24 03:43:11 UTC (rev 113813)
+++ trunk/dports/graphics/povray/files/patch-configure-stat.diff 2013-11-24 04:24:24 UTC (rev 113814)
@@ -1,13 +0,0 @@
---- configure.orig 2012-09-05 08:30:51.000000000 -0500
-+++ configure 2012-09-05 08:39:33.000000000 -0500
-@@ -14043,8 +14043,8 @@
- _ACEOF
-
-
--povowner=`stat -c %u ${HOME}`
--povgroup=`stat -c %g ${HOME}`
-+povowner=`stat -f %u ${HOME}`
-+povgroup=`stat -f %g ${HOME}`
-
-
-
Deleted: trunk/dports/graphics/povray/files/patch-shared_ptr.diff
===================================================================
--- trunk/dports/graphics/povray/files/patch-shared_ptr.diff 2013-11-24 03:43:11 UTC (rev 113813)
+++ trunk/dports/graphics/povray/files/patch-shared_ptr.diff 2013-11-24 04:24:24 UTC (rev 113814)
@@ -1,1165 +0,0 @@
---- source/backend/bounding/boundingtask.cpp 2012-02-05 14:53:40.000000000 -0600
-+++ source/backend/bounding/boundingtask.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -187,7 +187,7 @@
- BSPProgress();
- };
-
--BoundingTask::BoundingTask(shared_ptr<SceneData> sd, unsigned int bt) :
-+BoundingTask::BoundingTask(boost::shared_ptr<SceneData> sd, unsigned int bt) :
- Task(new SceneThreadData(sd), boost::bind(&BoundingTask::SendFatalError, this, _1)),
- sceneData(sd),
- boundingThreshold(bt)
---- source/backend/bounding/boundingtask.h 2012-02-05 14:53:40.000000000 -0600
-+++ source/backend/bounding/boundingtask.h 2013-02-28 04:20:36.000000000 -0600
-@@ -112,7 +112,7 @@
- class BoundingTask : public Task
- {
- public:
-- BoundingTask(shared_ptr<SceneData> sd, unsigned int bt);
-+ BoundingTask(boost::shared_ptr<SceneData> sd, unsigned int bt);
- virtual ~BoundingTask();
-
- virtual void Run();
---- source/backend/control/renderbackend.cpp 2012-02-05 14:53:41.000000000 -0600
-+++ source/backend/control/renderbackend.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -399,7 +399,7 @@
- {
- SceneId sid = msg.GetInt(kPOVAttrib_SceneId);
-
-- map<SceneId, shared_ptr<Scene> >::iterator i(scenes.find(sid));
-+ map<SceneId, boost::shared_ptr<Scene> >::iterator i(scenes.find(sid));
-
- if(i == scenes.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
-@@ -435,7 +435,7 @@
- {
- SceneId sid = msg.GetInt(kPOVAttrib_SceneId);
-
-- map<SceneId, shared_ptr<Scene> >::iterator i(scenes.find(sid));
-+ map<SceneId, boost::shared_ptr<Scene> >::iterator i(scenes.find(sid));
-
- if(i == scenes.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
-@@ -475,7 +475,7 @@
- {
- ViewId vid = msg.GetInt(kPOVAttrib_ViewId);
-
-- map<ViewId, shared_ptr<View> >::iterator i(views.find(vid));
-+ map<ViewId, boost::shared_ptr<View> >::iterator i(views.find(vid));
-
- if(i == views.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
-@@ -511,7 +511,7 @@
- if(validateFrontendAddress(msg.GetSourceAddress()) == false)
- throw POV_EXCEPTION_CODE(kAuthorisationErr);
-
-- map<SceneId, shared_ptr<Scene> >::iterator i(scenes.find(sid));
-+ map<SceneId, boost::shared_ptr<Scene> >::iterator i(scenes.find(sid));
-
- if(i == scenes.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
-@@ -546,7 +546,7 @@
- {
- SceneId sid = msg.GetInt(kPOVAttrib_SceneId);
-
-- map<SceneId, shared_ptr<Scene> >::iterator i(scenes.find(sid));
-+ map<SceneId, boost::shared_ptr<Scene> >::iterator i(scenes.find(sid));
-
- if(i == scenes.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
-@@ -581,7 +581,7 @@
- {
- SceneId sid = msg.GetInt(kPOVAttrib_SceneId);
-
-- map<SceneId, shared_ptr<Scene> >::iterator i(scenes.find(sid));
-+ map<SceneId, boost::shared_ptr<Scene> >::iterator i(scenes.find(sid));
-
- if(i == scenes.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
-@@ -616,7 +616,7 @@
- {
- SceneId sid = msg.GetInt(kPOVAttrib_SceneId);
-
-- map<SceneId, shared_ptr<Scene> >::iterator i(scenes.find(sid));
-+ map<SceneId, boost::shared_ptr<Scene> >::iterator i(scenes.find(sid));
-
- if(i == scenes.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
-@@ -653,7 +653,7 @@
- if(validateFrontendAddress(msg.GetSourceAddress()) == false)
- throw POV_EXCEPTION_CODE(kAuthorisationErr);
-
-- map<ViewId, shared_ptr<View> >::iterator i(views.find(vid));
-+ map<ViewId, boost::shared_ptr<View> >::iterator i(views.find(vid));
-
- if(i == views.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
-@@ -691,7 +691,7 @@
- {
- ViewId vid = msg.GetInt(kPOVAttrib_ViewId);
-
-- map<ViewId, shared_ptr<View> >::iterator i(views.find(vid));
-+ map<ViewId, boost::shared_ptr<View> >::iterator i(views.find(vid));
-
- if(i == views.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
-@@ -726,7 +726,7 @@
- {
- ViewId vid = msg.GetInt(kPOVAttrib_ViewId);
-
-- map<ViewId, shared_ptr<View> >::iterator i(views.find(vid));
-+ map<ViewId, boost::shared_ptr<View> >::iterator i(views.find(vid));
-
- if(i == views.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
-@@ -761,7 +761,7 @@
- {
- ViewId vid = msg.GetInt(kPOVAttrib_ViewId);
-
-- map<ViewId, shared_ptr<View> >::iterator i(views.find(vid));
-+ map<ViewId, boost::shared_ptr<View> >::iterator i(views.find(vid));
-
- if(i == views.end())
- throw POV_EXCEPTION_CODE(kInvalidIdentifierErr);
---- source/backend/control/renderbackend.h 2012-02-05 14:53:41.000000000 -0600
-+++ source/backend/control/renderbackend.h 2013-02-28 04:20:36.000000000 -0600
-@@ -170,8 +170,8 @@
- SceneId scenecounter;
- ViewId viewcounter;
-
-- map<SceneId, shared_ptr<Scene> > scenes;
-- map<ViewId, shared_ptr<View> > views;
-+ map<SceneId, boost::shared_ptr<Scene> > scenes;
-+ map<ViewId, boost::shared_ptr<View> > views;
- map<SceneId, set<ViewId> > scene2views;
- map<ViewId, SceneId> view2scene;
-
---- source/backend/interior/interior.cpp 2013-01-31 03:14:15.000000000 -0600
-+++ source/backend/interior/interior.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -122,7 +122,7 @@
-
- hollow = false;
-
-- subsurface = shared_ptr<SubsurfaceInterior>();
-+ subsurface = boost::shared_ptr<SubsurfaceInterior>();
- }
-
- Interior::Interior(const Interior& source)
-@@ -137,7 +137,7 @@
- media = source.media;
- hollow = source.hollow;
- IOR = source.IOR;
-- subsurface = shared_ptr<SubsurfaceInterior>(source.subsurface);
-+ subsurface = boost::shared_ptr<SubsurfaceInterior>(source.subsurface);
- Caustics = source.Caustics;
- }
-
---- source/backend/lighting/photons.cpp 2013-02-05 19:27:09.000000000 -0600
-+++ source/backend/lighting/photons.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -165,7 +165,7 @@
- const int INITIAL_BASE_ARRAY_SIZE = 100;
-
-
--PhotonTrace::PhotonTrace(shared_ptr<SceneData> sd, TraceThreadData *td, unsigned int mtl, DBL adcb, unsigned int qf, Trace::CooperateFunctor& cf) :
-+PhotonTrace::PhotonTrace(boost::shared_ptr<SceneData> sd, TraceThreadData *td, unsigned int mtl, DBL adcb, unsigned int qf, Trace::CooperateFunctor& cf) :
- Trace(sd, td, qf, cf, mediaPhotons, noRadiosity),
- mediaPhotons(sd, td, this, new PhotonGatherer(&sd->mediaPhotonMap, sd->photonSettings))
- {
-@@ -1020,7 +1020,7 @@
-
- }
-
--PhotonMediaFunction::PhotonMediaFunction(shared_ptr<SceneData> sd, TraceThreadData *td, Trace *t, PhotonGatherer *pg) :
-+PhotonMediaFunction::PhotonMediaFunction(boost::shared_ptr<SceneData> sd, TraceThreadData *td, Trace *t, PhotonGatherer *pg) :
- MediaFunction(td, t, pg),
- sceneData(sd)
- {
-@@ -2808,7 +2808,7 @@
- }
-
-
--void LightTargetCombo::computeAnglesAndDeltas(shared_ptr<SceneData> sceneData)
-+void LightTargetCombo::computeAnglesAndDeltas(boost::shared_ptr<SceneData> sceneData)
- {
- shootingDirection.compute();
-
---- source/backend/lighting/photons.h 2013-02-05 19:27:09.000000000 -0600
-+++ source/backend/lighting/photons.h 2013-02-28 04:20:36.000000000 -0600
-@@ -354,7 +354,7 @@
- class PhotonMediaFunction : public MediaFunction
- {
- public:
-- PhotonMediaFunction(shared_ptr<SceneData> sd, TraceThreadData *td, Trace *t, PhotonGatherer *pg);
-+ PhotonMediaFunction(boost::shared_ptr<SceneData> sd, TraceThreadData *td, Trace *t, PhotonGatherer *pg);
-
- void ComputeMediaAndDepositPhotons(MediaVector& medias, const Ray& ray, const Intersection& isect, Colour& colour, Trace::TraceTicket& ticket);
- protected:
-@@ -369,7 +369,7 @@
- class PhotonTrace : public Trace
- {
- public:
-- PhotonTrace(shared_ptr<SceneData> sd, TraceThreadData *td, unsigned int mtl, DBL adcb, unsigned int qf, Trace::CooperateFunctor& cf);
-+ PhotonTrace(boost::shared_ptr<SceneData> sd, TraceThreadData *td, unsigned int mtl, DBL adcb, unsigned int qf, Trace::CooperateFunctor& cf);
- ~PhotonTrace();
-
- virtual DBL TraceRay(const Ray& ray, Colour& colour, COLC weight, Trace::TraceTicket& ticket, bool continuedRay, DBL maxDepth = 0.0);
-@@ -422,7 +422,7 @@
- ShootingDirection shootingDirection;
-
- int computeMergedFlags();
-- void computeAnglesAndDeltas(shared_ptr<SceneData> sceneData);
-+ void computeAnglesAndDeltas(boost::shared_ptr<SceneData> sceneData);
- };
-
-
---- source/backend/lighting/photonshootingstrategy.cpp 2013-02-05 19:27:09.000000000 -0600
-+++ source/backend/lighting/photonshootingstrategy.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -137,7 +137,7 @@
- return unit;
- }
-
--void PhotonShootingStrategy::createUnitsForCombo(ObjectPtr obj, LightSource* light, shared_ptr<SceneData> sceneData)
-+void PhotonShootingStrategy::createUnitsForCombo(ObjectPtr obj, LightSource* light, boost::shared_ptr<SceneData> sceneData)
- {
- PhotonShootingUnit* unit = new PhotonShootingUnit(light, obj);
- unit->lightAndObject.computeAnglesAndDeltas(sceneData);
---- source/backend/lighting/photonshootingstrategy.h 2013-01-31 03:14:16.000000000 -0600
-+++ source/backend/lighting/photonshootingstrategy.h 2013-02-28 04:20:36.000000000 -0600
-@@ -113,7 +113,7 @@
-
- vector<PhotonShootingUnit*> units;
-
-- void createUnitsForCombo(ObjectPtr obj, LightSource* light, shared_ptr<SceneData> sceneData);
-+ void createUnitsForCombo(ObjectPtr obj, LightSource* light, boost::shared_ptr<SceneData> sceneData);
- void start();
- PhotonShootingUnit* getNextUnit();
-
---- source/backend/lighting/radiosity.cpp 2013-01-31 03:14:17.000000000 -0600
-+++ source/backend/lighting/radiosity.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -328,7 +328,7 @@
- return recSettings;
- }
-
--RadiosityFunction::RadiosityFunction(shared_ptr<SceneData> sd, TraceThreadData *td, const SceneRadiositySettings& rs,
-+RadiosityFunction::RadiosityFunction(boost::shared_ptr<SceneData> sd, TraceThreadData *td, const SceneRadiositySettings& rs,
- RadiosityCache& rc, Trace::CooperateFunctor& cf, bool ft, const Vector3d& camera) :
- threadData(td),
- trace(sd, td, GetRadiosityQualityFlags(rs, QUALITY_9), cf, media, *this), // TODO FIXME - we can only use hard-coded QUALITY_9 because Radiosity happens to be disabled at lower settings!
---- source/backend/lighting/radiosity.h 2013-01-31 03:14:17.000000000 -0600
-+++ source/backend/lighting/radiosity.h 2013-02-28 04:20:36.000000000 -0600
-@@ -314,7 +314,7 @@
- // cf - the cooperate functor (whatever that is - some thing that handles inter-thread communication?)
- // pts - number of the current pretrace step (PRETRACE_FIRST to PRETRACE_MAX, or FINAL_TRACE for main render)
- // camera - position of the camera
-- RadiosityFunction(shared_ptr<SceneData> sd, TraceThreadData *td,
-+ RadiosityFunction(boost::shared_ptr<SceneData> sd, TraceThreadData *td,
- const SceneRadiositySettings& rs, RadiosityCache& rc, Trace::CooperateFunctor& cf, bool ft, const Vector3d& camera);
- virtual ~RadiosityFunction();
-
---- source/backend/parser/parse.cpp 2013-01-31 03:14:20.000000000 -0600
-+++ source/backend/parser/parse.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -181,7 +181,7 @@
- *
- ******************************************************************************/
-
--Parser::Parser(shared_ptr<SceneData> sd, bool useclk, DBL clk) :
-+Parser::Parser(boost::shared_ptr<SceneData> sd, bool useclk, DBL clk) :
- Task(new SceneThreadData(sd), boost::bind(&Parser::SendFatalError, this, _1)),
- sceneData(sd),
- clockValue(clk),
-@@ -9587,7 +9587,7 @@
- /* if(!Object->Texture->Finish->SubsurfaceTranslucency.isZero()) */
- if (sceneData->useSubsurface)
- {
-- Object->interior->subsurface = shared_ptr<SubsurfaceInterior>(new SubsurfaceInterior(Object->interior->IOR));
-+ Object->interior->subsurface = boost::shared_ptr<SubsurfaceInterior>(new SubsurfaceInterior(Object->interior->IOR));
- }
- }
-
---- source/backend/parser/parse.h 2013-01-31 03:14:20.000000000 -0600
-+++ source/backend/parser/parse.h 2013-02-28 04:20:36.000000000 -0600
-@@ -321,7 +321,7 @@
- };
-
- // constructor
-- Parser(shared_ptr<SceneData> sd, bool useclock, DBL clock);
-+ Parser(boost::shared_ptr<SceneData> sd, bool useclock, DBL clock);
-
- void Run();
- void Stopped();
---- source/backend/render/rendertask.cpp 2012-02-05 14:53:52.000000000 -0600
-+++ source/backend/render/rendertask.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -120,7 +120,7 @@
- {
- }
-
--shared_ptr<SceneData>& RenderTask::GetSceneData()
-+boost::shared_ptr<SceneData>& RenderTask::GetSceneData()
- {
- return viewData->GetSceneData();
- }
---- source/backend/render/trace.cpp 2013-02-05 19:27:10.000000000 -0600
-+++ source/backend/render/trace.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -126,7 +126,7 @@
-
- #define MEDIA_AFTER_TEXTURE_INTERPOLATION 1
-
--Trace::Trace(shared_ptr<SceneData> sd, TraceThreadData *td, unsigned int qf,
-+Trace::Trace(boost::shared_ptr<SceneData> sd, TraceThreadData *td, unsigned int qf,
- CooperateFunctor& cf, MediaFunctor& mf, RadiosityFunctor& rf) :
- threadData(td),
- sceneData(sd),
---- source/backend/render/trace.h 2013-02-05 19:27:11.000000000 -0600
-+++ source/backend/render/trace.h 2013-02-28 04:20:36.000000000 -0600
-@@ -261,7 +261,7 @@
- virtual bool CheckRadiosityTraceLevel(const Trace::TraceTicket& ticket) { return false; }
- };
-
-- Trace(shared_ptr<SceneData> sd, TraceThreadData *td, unsigned int qf,
-+ Trace(boost::shared_ptr<SceneData> sd, TraceThreadData *td, unsigned int qf,
- CooperateFunctor& cf, MediaFunctor& mf, RadiosityFunctor& af);
- virtual ~Trace();
-
---- source/backend/scene/scene.cpp 2012-02-05 14:53:54.000000000 -0600
-+++ source/backend/scene/scene.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -627,7 +627,7 @@
- return parserTasks.Failed();
- }
-
--shared_ptr<View> Scene::NewView(unsigned int width, unsigned int height, RenderBackend::ViewId vid)
-+boost::shared_ptr<View> Scene::NewView(unsigned int width, unsigned int height, RenderBackend::ViewId vid)
- {
- if(parserTasks.IsDone() == false)
- throw POV_EXCEPTION_CODE(kNotNowErr);
-@@ -635,7 +635,7 @@
- if((parserTasks.IsDone() == false) || (parserTasks.Failed() == true))
- throw POV_EXCEPTION_CODE(kNotNowErr);
-
-- return shared_ptr<View>(new View(sceneData, width, height, vid));
-+ return boost::shared_ptr<View>(new View(sceneData, width, height, vid));
- }
-
- void Scene::GetStatistics(POVMS_Object& parserStats)
---- source/backend/scene/threaddata.cpp 2012-03-15 18:19:39.000000000 -0500
-+++ source/backend/scene/threaddata.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -108,7 +108,7 @@
- namespace pov
- {
-
--SceneThreadData::SceneThreadData(shared_ptr<SceneData> sd): sceneData(sd)
-+SceneThreadData::SceneThreadData(boost::shared_ptr<SceneData> sd): sceneData(sd)
- {
- for(int i = 0 ; i < 4 ; i++)
- Fractal_IStack[i] = NULL;
---- source/backend/scene/threaddata.h 2012-02-05 14:53:55.000000000 -0600
-+++ source/backend/scene/threaddata.h 2013-02-28 04:20:36.000000000 -0600
-@@ -130,7 +130,7 @@
- * Create thread local data.
- * @param sd Scene data defining scene attributes.
- */
-- SceneThreadData(shared_ptr<SceneData> sd);
-+ SceneThreadData(boost::shared_ptr<SceneData> sd);
-
- /**
- * Get the statistics.
-@@ -214,7 +214,7 @@
- POV_LONG realTime;
- unsigned int qualityFlags; // TODO FIXME - remove again
-
-- inline shared_ptr<const SceneData> GetSceneData() const { return sceneData; }
-+ inline boost::shared_ptr<const SceneData> GetSceneData() const { return sceneData; }
-
- protected:
- /// scene data
---- source/backend/scene/view.cpp 2012-11-21 13:30:02.000000000 -0600
-+++ source/backend/scene/view.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -140,7 +140,7 @@
- return 1 << ii;
- }
-
--ViewData::ViewData(shared_ptr<SceneData> sd) :
-+ViewData::ViewData(boost::shared_ptr<SceneData> sd) :
- nextBlock(0),
- completedFirstPass(false),
- highestTraceLevel(0),
-@@ -628,7 +628,7 @@
- return radiosityCache;
- }
-
--View::View(shared_ptr<SceneData> sd, unsigned int width, unsigned int height, RenderBackend::ViewId vid) :
-+View::View(boost::shared_ptr<SceneData> sd, unsigned int width, unsigned int height, RenderBackend::ViewId vid) :
- viewData(sd),
- stopRequsted(false),
- mailbox(0),
-@@ -1441,7 +1441,7 @@
- viewThreadData.clear();
- }
-
--void View::SetNextRectangle(TaskQueue&, shared_ptr<set<unsigned int> > bsl, unsigned int fs)
-+void View::SetNextRectangle(TaskQueue&, boost::shared_ptr<set<unsigned int> > bsl, unsigned int fs)
- {
- viewData.SetNextRectangle(*bsl, fs);
- }
---- source/backend/scene/view.h 2013-01-19 07:50:04.000000000 -0600
-+++ source/backend/scene/view.h 2013-02-28 04:20:36.000000000 -0600
-@@ -284,7 +284,7 @@
- * Get the scene data for this view.
- * @return Scene data.
- */
-- inline shared_ptr<SceneData>& GetSceneData() { return sceneData; }
-+ inline boost::shared_ptr<SceneData>& GetSceneData() { return sceneData; }
-
- /**
- * Get the view id for this view.
-@@ -407,7 +407,7 @@
- * Create view data.
- * @param sd Scene data associated with the view data.
- */
-- ViewData(shared_ptr<SceneData> sd);
-+ ViewData(boost::shared_ptr<SceneData> sd);
-
- /**
- * Destructor.
-@@ -522,7 +522,7 @@
- * @param vid Id of this view to include with
- * POVMS messages sent to the frontend.
- */
-- explicit View(shared_ptr<SceneData> sd, unsigned int width, unsigned int height, RenderBackend::ViewId vid);
-+ explicit View(boost::shared_ptr<SceneData> sd, unsigned int width, unsigned int height, RenderBackend::ViewId vid);
-
- /// not available
- View& operator=(const View&);
-@@ -546,7 +546,7 @@
- * @param bsl Block serial numbers to skip.
- * @param fs First block to start with checking with serial number.
- */
-- void SetNextRectangle(TaskQueue& taskq, shared_ptr<set<unsigned int> > bsl, unsigned int fs);
-+ void SetNextRectangle(TaskQueue& taskq, boost::shared_ptr<set<unsigned int> > bsl, unsigned int fs);
-
- /**
- * Thread controlling the render task queue.
---- source/backend/shape/truetype.cpp 2013-01-31 03:14:27.000000000 -0600
-+++ source/backend/shape/truetype.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -395,8 +395,8 @@
- int compare_tag4(BYTE *ttf_tag, BYTE *known_tag);
-
- /* Internal TTF input routines */
--FontFileInfo *ProcessFontFile(const char *fontfilename, const int font_id, Parser *parser, shared_ptr<SceneData>& sceneData);
--FontFileInfo *OpenFontFile(const char *filename, const int font_id, Parser *parser, shared_ptr<SceneData>& sceneData);
-+FontFileInfo *ProcessFontFile(const char *fontfilename, const int font_id, Parser *parser, boost::shared_ptr<SceneData>& sceneData);
-+FontFileInfo *OpenFontFile(const char *filename, const int font_id, Parser *parser, boost::shared_ptr<SceneData>& sceneData);
- void ProcessHeadTable(FontFileInfo *ffile, int head_table_offset);
- void ProcessLocaTable(FontFileInfo *ffile, int loca_table_offset);
- void ProcessMaxpTable(FontFileInfo *ffile, int maxp_table_offset);
-@@ -510,7 +510,7 @@
- * (triggered when filename is null) - Oct 2012 [JG]
- *
- ******************************************************************************/
--void TrueType::ProcessNewTTF(CSG *Object, const char *filename, const int font_id, const UCS2 *text_string, DBL depth, const VECTOR offset, Parser *parser, shared_ptr<SceneData>& sceneData)
-+void TrueType::ProcessNewTTF(CSG *Object, const char *filename, const int font_id, const UCS2 *text_string, DBL depth, const VECTOR offset, Parser *parser, boost::shared_ptr<SceneData>& sceneData)
- {
- FontFileInfo *ffile;
- VECTOR local_offset, total_offset;
-@@ -770,7 +770,7 @@
- * Added builtin fonts when fontfilename is nullptr - Oct 2012 [JG]
- *
- ******************************************************************************/
--FontFileInfo *ProcessFontFile(const char *fontfilename, const int font_id, Parser *parser, shared_ptr<SceneData>& sceneData)
-+FontFileInfo *ProcessFontFile(const char *fontfilename, const int font_id, Parser *parser, boost::shared_ptr<SceneData>& sceneData)
- {
- unsigned i;
- int head_table_offset = 0;
-@@ -939,7 +939,7 @@
- * Added support for builtin fonts - Oct 2012 [JG]
- *
- ******************************************************************************/
--FontFileInfo *OpenFontFile(const char *asciifn, const int font_id, Parser *parser, shared_ptr<SceneData>& sceneData)
-+FontFileInfo *OpenFontFile(const char *asciifn, const int font_id, Parser *parser, boost::shared_ptr<SceneData>& sceneData)
- {
- /* int i; */ /* tw, mtg */
- FontFileInfo *fontlist = NULL;
---- source/backend/shape/truetype.h 2013-01-31 03:14:27.000000000 -0600
-+++ source/backend/shape/truetype.h 2013-02-28 04:20:36.000000000 -0600
-@@ -137,7 +137,7 @@
- virtual void Invert();
- virtual void Compute_BBox();
-
-- static void ProcessNewTTF(CSG *Object, const char *filename, const int font_id, const UCS2 *text_string, DBL depth, const VECTOR offset, Parser *parser, shared_ptr<SceneData>& sceneData);
-+ static void ProcessNewTTF(CSG *Object, const char *filename, const int font_id, const UCS2 *text_string, DBL depth, const VECTOR offset, Parser *parser, boost::shared_ptr<SceneData>& sceneData);
- protected:
- bool Inside_Glyph(double x, double y, const GlyphStruct* glyph) const;
- int solve_quad(double *x, double *y, double mindist, DBL maxdist) const;
---- source/backend/support/fileutil.cpp 2012-12-16 07:32:00.000000000 -0600
-+++ source/backend/support/fileutil.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -263,7 +263,7 @@
- *
- ******************************************************************************/
-
--IStream *Locate_File(Parser *p, shared_ptr<SceneData>& sd, const UCS2String& filename, unsigned int stype, UCS2String& buffer, bool err_flag)
-+IStream *Locate_File(Parser *p, boost::shared_ptr<SceneData>& sd, const UCS2String& filename, unsigned int stype, UCS2String& buffer, bool err_flag)
- {
- UCS2String fn(filename);
- UCS2String foundfile(sd->FindFile(p->GetPOVMSContext(), fn, stype));
-@@ -298,7 +298,7 @@
- return result;
- }
- /* TODO FIXME - code above should not be there, this is how it should work but this has bugs [trf]
--IStream *Locate_File(Parser *p, shared_ptr<SceneData>& sd, const UCS2String& filename, unsigned int stype, UCS2String& buffer, bool err_flag)
-+IStream *Locate_File(Parser *p, boost::shared_ptr<SceneData>& sd, const UCS2String& filename, unsigned int stype, UCS2String& buffer, bool err_flag)
- {
- UCS2String foundfile(sd->FindFile(p->GetPOVMSContext(), filename, stype));
-
---- source/backend/support/fileutil.h 2012-10-08 08:15:18.000000000 -0500
-+++ source/backend/support/fileutil.h 2013-02-28 04:20:36.000000000 -0600
-@@ -104,7 +104,7 @@
-
- using namespace pov_base;
-
--IStream *Locate_File(Parser *p, shared_ptr<SceneData>& sd, const UCS2String& filename, unsigned int stype, UCS2String& buffer, bool err_flag = false);
-+IStream *Locate_File(Parser *p, boost::shared_ptr<SceneData>& sd, const UCS2String& filename, unsigned int stype, UCS2String& buffer, bool err_flag = false);
- IMemStream *Internal_Font_File(const int font_id, UCS2String& buffer);
-
- }
---- source/backend/support/imageutil.cpp 2012-06-25 18:36:41.000000000 -0500
-+++ source/backend/support/imageutil.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -1434,7 +1434,7 @@
- }
-
-
--Image *Read_Image(Parser *p, shared_ptr<SceneData>& sd, int filetype, const UCS2 *filename, const Image::ReadOptions& options)
-+Image *Read_Image(Parser *p, boost::shared_ptr<SceneData>& sd, int filetype, const UCS2 *filename, const Image::ReadOptions& options)
- {
- unsigned int stype;
- Image::ImageFileType type;
---- source/backend/support/imageutil.h 2012-02-05 14:54:03.000000000 -0600
-+++ source/backend/support/imageutil.h 2013-02-28 04:20:36.000000000 -0600
-@@ -176,7 +176,7 @@
- ImageData *Copy_Image(ImageData *old);
- ImageData *Create_Image(void);
- void Destroy_Image(ImageData *image);
--Image *Read_Image(Parser *p, shared_ptr<SceneData>& sd, int filetype, const UCS2 *filename, const Image::ReadOptions& options);
-+Image *Read_Image(Parser *p, boost::shared_ptr<SceneData>& sd, int filetype, const UCS2 *filename, const Image::ReadOptions& options);
-
- }
-
---- source/backend/support/randomsequences.cpp 2013-02-06 16:19:22.000000000 -0600
-+++ source/backend/support/randomsequences.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -287,7 +287,7 @@
-
- HybridNumberGenerator(size_t size = 0);
- virtual Type operator()();
-- virtual shared_ptr<vector<Type> > GetSequence(size_t count);
-+ virtual boost::shared_ptr<vector<Type> > GetSequence(size_t count);
- virtual size_t MaxIndex() const;
- virtual size_t CycleLength() const;
- virtual void Seed(size_t seed);
-@@ -484,11 +484,11 @@
- public:
-
- /// Sets up the factory to use a given sequence.
-- NumberSequenceFactory(shared_ptr<vector<Type> const> masterSequence);
-+ NumberSequenceFactory(boost::shared_ptr<vector<Type> const> masterSequence);
- /// Sets up the factory to use a given number source.
-- NumberSequenceFactory(shared_ptr<SequentialNumberGenerator<Type> > master);
-+ NumberSequenceFactory(boost::shared_ptr<SequentialNumberGenerator<Type> > master);
- /// Sets up the factory to use a given number source, pre-computing a given number of elements.
-- NumberSequenceFactory(shared_ptr<SequentialNumberGenerator<Type> > master, size_t count);
-+ NumberSequenceFactory(boost::shared_ptr<SequentialNumberGenerator<Type> > master, size_t count);
- /// Gets a reference to a table of pre-computed numbers having at least the given size.
- /// @note The vector returned may contain more elements than requested.
- shared_ptr<vector<Type> const> operator()(size_t count);
-@@ -496,10 +496,10 @@
- protected:
-
- typedef SequentialNumberGenerator<Type> Generator;
-- typedef shared_ptr<Generator> GeneratorPtr;
-+ typedef boost::shared_ptr<Generator> GeneratorPtr;
- typedef vector<Type> Sequence;
-- typedef shared_ptr<Sequence> SequencePtr;
-- typedef shared_ptr<Sequence const> SequenceConstPtr;
-+ typedef boost::shared_ptr<Sequence> SequencePtr;
-+ typedef boost::shared_ptr<Sequence const> SequenceConstPtr;
-
- GeneratorPtr master;
- SequenceConstPtr masterSequence;
-@@ -519,12 +519,12 @@
- {
- public:
-
-- static shared_ptr<NumberSequenceFactory<ValueType> > GetFactory(const typename GeneratorType::ParameterStruct& param);
-+ static boost::shared_ptr<NumberSequenceFactory<ValueType> > GetFactory(const typename GeneratorType::ParameterStruct& param);
-
- protected:
-
- typedef NumberSequenceFactory<ValueType> Factory;
-- typedef shared_ptr<Factory> FactoryPtr;
-+ typedef boost::shared_ptr<Factory> FactoryPtr;
- typedef weak_ptr<Factory> FactoryWeakPtr;
- typedef std::map<typename GeneratorType::ParameterStruct, FactoryWeakPtr> FactoryTable;
-
-@@ -551,7 +551,7 @@
- public:
-
- /// Construct from a sequence factory.
-- PrecomputedNumberGenerator(shared_ptr<NumberSequenceFactory<Type> > master, size_t size) :
-+ PrecomputedNumberGenerator(boost::shared_ptr<NumberSequenceFactory<Type> > master, size_t size) :
- HybridNumberGenerator<Type>(size),
- values((*master)(size))
- {}
-@@ -564,7 +564,7 @@
- return (*values)[i % size];
- }
- /// Returns a particular subset from the sequence.
-- virtual shared_ptr<vector<Type> > GetSequence(size_t index, size_t count) const
-+ virtual boost::shared_ptr<vector<Type> > GetSequence(size_t index, size_t count) const
- {
- // According to C++ standard, template classes cannot refer to parent template classes' members by unqualified name
- const size_t& size = HybridNumberGenerator<Type>::size;
-@@ -612,7 +612,7 @@
- }
-
- template<class Type>
--shared_ptr<vector<Type> > HybridNumberGenerator<Type>::GetSequence(size_t count)
-+boost::shared_ptr<vector<Type> > HybridNumberGenerator<Type>::GetSequence(size_t count)
- {
- shared_ptr<vector<Type> > data(IndexedNumberGenerator<Type>::GetSequence(index, count));
- index += count;
-@@ -743,24 +743,24 @@
- *********************************************************************************/
-
- template<class Type>
--NumberSequenceFactory<Type>::NumberSequenceFactory(shared_ptr<vector<Type> const> masterSequence) :
-+NumberSequenceFactory<Type>::NumberSequenceFactory(boost::shared_ptr<vector<Type> const> masterSequence) :
- masterSequence(masterSequence)
- {}
-
- template<class Type>
--NumberSequenceFactory<Type>::NumberSequenceFactory(shared_ptr<SequentialNumberGenerator<Type> > master) :
-+NumberSequenceFactory<Type>::NumberSequenceFactory(boost::shared_ptr<SequentialNumberGenerator<Type> > master) :
- master(master)
- {}
-
- template<class Type>
--NumberSequenceFactory<Type>::NumberSequenceFactory(shared_ptr<SequentialNumberGenerator<Type> > master, size_t count) :
-+NumberSequenceFactory<Type>::NumberSequenceFactory(boost::shared_ptr<SequentialNumberGenerator<Type> > master, size_t count) :
- master(master)
- {
- (*this)(count); // force initial sequence to be generated
- }
-
- template<class Type>
--shared_ptr<vector<Type> const> NumberSequenceFactory<Type>::operator()(size_t count)
-+boost::shared_ptr<vector<Type> const> NumberSequenceFactory<Type>::operator()(size_t count)
- {
- boost::mutex::scoped_lock lock(masterMutex);
- if (!masterSequence)
-@@ -806,7 +806,7 @@
- boost::mutex NumberSequenceMetaFactory<ValueType, GeneratorType>::lookupMutex;
-
- template<class ValueType, class GeneratorType>
--shared_ptr<NumberSequenceFactory<ValueType> > NumberSequenceMetaFactory<ValueType, GeneratorType>::GetFactory(const typename GeneratorType::ParameterStruct& param)
-+boost::shared_ptr<NumberSequenceFactory<ValueType> > NumberSequenceMetaFactory<ValueType, GeneratorType>::GetFactory(const typename GeneratorType::ParameterStruct& param)
- {
- boost::mutex::scoped_lock lock(lookupMutex);
- if (!lookupTable)
-@@ -815,7 +815,7 @@
- if (!factory)
- {
- shared_ptr<GeneratorType> masterGenerator(new GeneratorType(param));
-- factory = FactoryPtr(new Factory(shared_ptr<SequentialNumberGenerator<ValueType> >(masterGenerator)));
-+ factory = FactoryPtr(new Factory(boost::shared_ptr<SequentialNumberGenerator<ValueType> >(masterGenerator)));
- (*lookupTable)[param] = factory;
- }
- return factory;
---- source/backend/support/randomsequences.h 2013-01-31 03:14:28.000000000 -0600
-+++ source/backend/support/randomsequences.h 2013-02-28 04:20:36.000000000 -0600
-@@ -179,7 +179,7 @@
- /// Returns the next number from the sequence.
- virtual Type operator()() = 0;
- /// Returns the next N numbers from the sequence.
-- virtual shared_ptr<vector<Type> > GetSequence(size_t count)
-+ virtual boost::shared_ptr<vector<Type> > GetSequence(size_t count)
- {
- shared_ptr<vector<Type> > data(new vector<Type>);
- data->reserve(count);
-@@ -208,7 +208,7 @@
- /// Returns a particular number from the sequence.
- virtual Type operator[](size_t index) const = 0;
- /// Returns a particular subsequence from the sequence.
-- virtual shared_ptr<vector<Type> > GetSequence(size_t index, size_t count) const
-+ virtual boost::shared_ptr<vector<Type> > GetSequence(size_t index, size_t count) const
- {
- shared_ptr<vector<Type> > data(new vector<Type>);
- data->reserve(count);
-@@ -233,20 +233,20 @@
- * @{
- */
-
--typedef shared_ptr<SequentialNumberGenerator<int> > SequentialIntGeneratorPtr;
--typedef shared_ptr<SequentialNumberGenerator<double> > SequentialDoubleGeneratorPtr;
--typedef shared_ptr<SequentialNumberGenerator<Vector3d> > SequentialVectorGeneratorPtr;
--typedef shared_ptr<SequentialNumberGenerator<Vector2d> > SequentialVector2dGeneratorPtr;
--
--typedef shared_ptr<SeedableNumberGenerator<int> > SeedableIntGeneratorPtr;
--typedef shared_ptr<SeedableNumberGenerator<double> > SeedableDoubleGeneratorPtr;
--typedef shared_ptr<SeedableNumberGenerator<Vector3d> > SeedableVectorGeneratorPtr;
--typedef shared_ptr<SeedableNumberGenerator<Vector2d> > SeedableVector2dGeneratorPtr;
--
--typedef shared_ptr<IndexedNumberGenerator<int> const> IndexedIntGeneratorPtr;
--typedef shared_ptr<IndexedNumberGenerator<double> const> IndexedDoubleGeneratorPtr;
--typedef shared_ptr<IndexedNumberGenerator<Vector3d> const> IndexedVectorGeneratorPtr;
--typedef shared_ptr<IndexedNumberGenerator<Vector2d> const> IndexedVector2dGeneratorPtr;
-+typedef boost::shared_ptr<SequentialNumberGenerator<int> > SequentialIntGeneratorPtr;
-+typedef boost::shared_ptr<SequentialNumberGenerator<double> > SequentialDoubleGeneratorPtr;
-+typedef boost::shared_ptr<SequentialNumberGenerator<Vector3d> > SequentialVectorGeneratorPtr;
-+typedef boost::shared_ptr<SequentialNumberGenerator<Vector2d> > SequentialVector2dGeneratorPtr;
-+
-+typedef boost::shared_ptr<SeedableNumberGenerator<int> > SeedableIntGeneratorPtr;
-+typedef boost::shared_ptr<SeedableNumberGenerator<double> > SeedableDoubleGeneratorPtr;
-+typedef boost::shared_ptr<SeedableNumberGenerator<Vector3d> > SeedableVectorGeneratorPtr;
-+typedef boost::shared_ptr<SeedableNumberGenerator<Vector2d> > SeedableVector2dGeneratorPtr;
-+
-+typedef boost::shared_ptr<IndexedNumberGenerator<int> const> IndexedIntGeneratorPtr;
-+typedef boost::shared_ptr<IndexedNumberGenerator<double> const> IndexedDoubleGeneratorPtr;
-+typedef boost::shared_ptr<IndexedNumberGenerator<Vector3d> const> IndexedVectorGeneratorPtr;
-+typedef boost::shared_ptr<IndexedNumberGenerator<Vector2d> const> IndexedVector2dGeneratorPtr;
-
- /**
- * @}
---- source/backend/support/taskqueue.cpp 2012-02-05 14:54:04.000000000 -0600
-+++ source/backend/support/taskqueue.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -208,7 +208,7 @@
-
- failed = false;
-
-- queuedTasks.push(TaskEntry(shared_ptr<Task>(task)));
-+ queuedTasks.push(TaskEntry(boost::shared_ptr<Task>(task)));
-
- Notify();
-
---- source/backend/support/taskqueue.h 2012-02-05 14:54:04.000000000 -0600
-+++ source/backend/support/taskqueue.h 2013-02-28 04:20:36.000000000 -0600
-@@ -118,7 +118,7 @@
- };
-
- TaskEntry(EntryType et) : entryType(et) { }
-- TaskEntry(shared_ptr<Task> rt) : entryType(kTask), task(rt) { }
-+ TaskEntry(boost::shared_ptr<Task> rt) : entryType(kTask), task(rt) { }
- TaskEntry(POVMS_Message& m) : entryType(kMessage), msg(m) { }
- TaskEntry(const boost::function1<void, TaskQueue&>& f) : entryType(kFunction), fn(f) { }
- ~TaskEntry() { }
---- source/base/image/colourspace.cpp 2013-02-05 19:27:12.000000000 -0600
-+++ source/base/image/colourspace.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -169,7 +169,7 @@
- else if (oldInstance->Matches(newInstance))
- {
- // Found a matching curve in the cache, so use that instead, and (as far as we're concerned)
-- // just forget that the new instance ever existed (allowing the shared_ptr mechanism to garbage-collect it)
-+ // just forget that the new instance ever existed (allowing the boost::shared_ptr mechanism to garbage-collect it)
- return oldInstance;
- }
- }
---- source/frontend/imageprocessing.cpp 2012-02-05 14:54:16.000000000 -0600
-+++ source/frontend/imageprocessing.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -121,7 +121,7 @@
-
- ImageProcessing::ImageProcessing(unsigned int width, unsigned int height)
- {
-- image = shared_ptr<Image>(Image::Create(width, height, Image::RGBFT_Float));
-+ image = boost::shared_ptr<Image>(Image::Create(width, height, Image::RGBFT_Float));
- toStderr = toStdout = false;
-
- // TODO FIXME - find a better place for this
-@@ -135,7 +135,7 @@
- unsigned int blockSize(ropts.TryGetInt(kPOVAttrib_RenderBlockSize, 32));
- unsigned int maxBufferMem(ropts.TryGetInt(kPOVAttrib_MaxImageBufferMem, 128)); // number is megabytes
-
-- image = shared_ptr<Image>(Image::Create(width, height, Image::RGBFT_Float, maxBufferMem, blockSize * blockSize));
-+ image = boost::shared_ptr<Image>(Image::Create(width, height, Image::RGBFT_Float, maxBufferMem, blockSize * blockSize));
- toStdout = OutputIsStdout(ropts);
- toStderr = OutputIsStderr(ropts);
-
-@@ -143,7 +143,7 @@
- image->SetPremultiplied(true); // POV-Ray uses premultiplied opacity for its math, so that's what will end up in the image container
- }
-
--ImageProcessing::ImageProcessing(shared_ptr<Image>& img)
-+ImageProcessing::ImageProcessing(boost::shared_ptr<Image>& img)
- {
- image = img;
- toStderr = toStdout = false;
-@@ -246,7 +246,7 @@
- return UCS2String();
- }
-
--shared_ptr<Image>& ImageProcessing::GetImage()
-+boost::shared_ptr<Image>& ImageProcessing::GetImage()
- {
- return image;
- }
---- source/frontend/imageprocessing.h 2012-02-05 14:54:16.000000000 -0600
-+++ source/frontend/imageprocessing.h 2013-02-28 04:20:36.000000000 -0600
-@@ -114,7 +114,7 @@
- public:
- ImageProcessing(unsigned int width, unsigned int height);
- ImageProcessing(POVMS_Object& ropts);
-- ImageProcessing(shared_ptr<Image>& img);
-+ ImageProcessing(boost::shared_ptr<Image>& img);
- virtual ~ImageProcessing();
-
- UCS2String WriteImage(POVMS_Object& ropts, POVMSInt frame = 0, int digits = 0);
---- source/frontend/renderfrontend.cpp 2013-02-09 06:24:07.000000000 -0600
-+++ source/frontend/renderfrontend.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -202,7 +202,7 @@
- // nothing to do
- }
-
--void RenderFrontendBase::ConnectToBackend(POVMSAddress backendaddress, POVMS_Object& obj, POVMS_Object *resultobj, shared_ptr<Console>& console)
-+void RenderFrontendBase::ConnectToBackend(POVMSAddress backendaddress, POVMS_Object& obj, POVMS_Object *resultobj, boost::shared_ptr<Console>& console)
- {
- POVMS_Message msg(obj, kPOVMsgClass_BackendControl, kPOVMsgIdent_InitInfo);
- POVMS_Message result(kPOVObjectClass_ResultData);
-@@ -664,7 +664,7 @@
- MakeBackupPath(ropts, vd, outputpath);
- if(POV_ALLOW_FILE_WRITE(vd.imageBackupFile().c_str(), POV_File_Data_Backup) == false)
- throw POV_EXCEPTION(kCannotOpenFileErr, "Permission denied to create render state output file.");
-- vd.imageBackup = shared_ptr<OStream>(POV_PLATFORM_BASE.CreateOStream(POV_File_Data_Backup));
-+ vd.imageBackup = boost::shared_ptr<OStream>(POV_PLATFORM_BASE.CreateOStream(POV_File_Data_Backup));
- if(vd.imageBackup != NULL)
- {
- Backup_File_Header hdr;
-@@ -779,7 +779,7 @@
- // if there isn't going to be an output file, we don't write to the state file
- if(outputToFile == true)
- {
-- vd.imageBackup = shared_ptr<OStream>(POV_PLATFORM_BASE.CreateOStream(POV_File_Data_Backup));
-+ vd.imageBackup = boost::shared_ptr<OStream>(POV_PLATFORM_BASE.CreateOStream(POV_File_Data_Backup));
- if(vd.imageBackup != NULL)
- {
- if(vd.imageBackup->open(vd.imageBackupFile().c_str(), IOBase::append) == false)
---- source/frontend/renderfrontend.h 2012-12-16 07:32:02.000000000 -0600
-+++ source/frontend/renderfrontend.h 2013-02-28 04:20:36.000000000 -0600
-@@ -154,7 +154,7 @@
-
- SceneState state;
-
-- mutable shared_ptr<Console> console;
-+ mutable boost::shared_ptr<Console> console;
-
- mutable list<POVMS_Object> readfiles;
- mutable list<POVMS_Object> createdfiles;
-@@ -197,9 +197,9 @@
-
- ViewState state;
-
-- mutable shared_ptr<Image> image;
-- mutable shared_ptr<Display> display;
-- mutable shared_ptr<OStream> imageBackup;
-+ mutable boost::shared_ptr<Image> image;
-+ mutable boost::shared_ptr<Display> display;
-+ mutable boost::shared_ptr<OStream> imageBackup;
-
- Path imageBackupFile;
- };
-@@ -280,12 +280,12 @@
- RenderFrontendBase(POVMSContext);
- virtual ~RenderFrontendBase();
-
-- void ConnectToBackend(POVMSAddress, POVMS_Object&, POVMS_Object *, shared_ptr<Console>&);
-+ void ConnectToBackend(POVMSAddress, POVMS_Object&, POVMS_Object *, boost::shared_ptr<Console>&);
- void DisconnectFromBackend(POVMSAddress);
-
-- virtual shared_ptr<Console> GetConsole(SceneId) = 0;
-- virtual shared_ptr<Image> GetImage(ViewId) = 0;
-- virtual shared_ptr<Display> GetDisplay(ViewId) = 0;
-+ virtual boost::shared_ptr<Console> GetConsole(SceneId) = 0;
-+ virtual boost::shared_ptr<Image> GetImage(ViewId) = 0;
-+ virtual boost::shared_ptr<Display> GetDisplay(ViewId) = 0;
- protected:
- set<POVMSAddress> backendaddresses;
- POVMSContext context;
-@@ -352,7 +352,7 @@
- void ResumeParser(SceneId sid);
- void StopParser(SceneId sid);
-
-- ViewId CreateView(SceneId sid, POVMS_Object& obj, shared_ptr<ImageProcessing>& imageProcessing, boost::function<Display *(unsigned int, unsigned int, GammaCurvePtr)> fn);
-+ ViewId CreateView(SceneId sid, POVMS_Object& obj, boost::shared_ptr<ImageProcessing>& imageProcessing, boost::function<Display *(unsigned int, unsigned int, GammaCurvePtr)> fn);
- void CloseView(ViewId vid);
-
- ViewData::ViewState GetViewState(ViewId vid);
-@@ -362,9 +362,9 @@
- void ResumeRender(ViewId vid);
- void StopRender(ViewId vid);
-
-- virtual shared_ptr<Console> GetConsole(SceneId sid);
-- virtual shared_ptr<Image> GetImage(ViewId vid);
-- virtual shared_ptr<Display> GetDisplay(ViewId vid);
-+ virtual boost::shared_ptr<Console> GetConsole(SceneId sid);
-+ virtual boost::shared_ptr<Image> GetImage(ViewId vid);
-+ virtual boost::shared_ptr<Display> GetDisplay(ViewId vid);
- protected:
- virtual void HandleParserMessage(SceneId sid, POVMSType ident, POVMS_Object& msg);
- virtual void HandleFileMessage(SceneId sid, POVMSType ident, POVMS_Object& msg, POVMS_Object& result);
-@@ -405,7 +405,7 @@
-
- sid = RenderFrontendBase::CreateScene(sh.data, backendaddress, obj);
-
-- sh.data.console = shared_ptr<Console>(fn());
-+ sh.data.console = boost::shared_ptr<Console>(fn());
-
- scenehandler[sid] = sh;
- scene2views[sid] = set<ViewId>();
-@@ -495,7 +495,7 @@
- }
-
- template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH>
--RenderFrontendBase::ViewId RenderFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::CreateView(SceneId sid, POVMS_Object& obj, shared_ptr<ImageProcessing>& imageProcessing, boost::function<Display *(unsigned int,unsigned int,GammaCurvePtr)> fn)
-+RenderFrontendBase::ViewId RenderFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::CreateView(SceneId sid, POVMS_Object& obj, boost::shared_ptr<ImageProcessing>& imageProcessing, boost::function<Display *(unsigned int,unsigned int,GammaCurvePtr)> fn)
- {
- typename map<SceneId, SceneHandler>::iterator shi(scenehandler.find(sid));
-
-@@ -600,11 +600,11 @@
- vh.data.image = img;
- }
- else
-- vh.data.image = shared_ptr<Image>(Image::Create(width, height, Image::RGBFT_Float));
-+ vh.data.image = boost::shared_ptr<Image>(Image::Create(width, height, Image::RGBFT_Float));
- }
-
- if(obj.TryGetBool(kPOVAttrib_Display, true) == true)
-- vh.data.display = shared_ptr<Display>(fn(width, height, gamma));
-+ vh.data.display = boost::shared_ptr<Display>(fn(width, height, gamma));
-
- viewhandler[vid] = vh;
- view2scene[vid] = sid;
-@@ -778,33 +778,33 @@
- }
-
- template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH>
--shared_ptr<Console> RenderFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetConsole(SceneId sid)
-+boost::shared_ptr<Console> RenderFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetConsole(SceneId sid)
- {
- typename map<SceneId, SceneHandler>::iterator shi(scenehandler.find(sid));
- if(shi != scenehandler.end())
- return shi->second.data.console;
- else
-- return shared_ptr<Console>();
-+ return boost::shared_ptr<Console>();
- }
-
- template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH>
--shared_ptr<Image> RenderFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetImage(ViewId vid)
-+boost::shared_ptr<Image> RenderFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetImage(ViewId vid)
- {
- typename map<ViewId, ViewHandler>::iterator vhi(viewhandler.find(vid));
- if(vhi != viewhandler.end())
- return vhi->second.data.image;
- else
-- return shared_ptr<Image>();
-+ return boost::shared_ptr<Image>();
- }
-
- template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH>
--shared_ptr<Display> RenderFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetDisplay(ViewId vid)
-+boost::shared_ptr<Display> RenderFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetDisplay(ViewId vid)
- {
- typename map<ViewId, ViewHandler>::iterator vhi(viewhandler.find(vid));
- if(vhi != viewhandler.end())
- return vhi->second.data.display;
- else
-- return shared_ptr<Display>();
-+ return boost::shared_ptr<Display>();
- }
-
- template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH>
---- source/frontend/simplefrontend.h 2012-02-05 14:54:18.000000000 -0600
-+++ source/frontend/simplefrontend.h 2013-02-28 04:20:36.000000000 -0600
-@@ -134,10 +134,10 @@
- SimpleFrontend(POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg,
- boost::function<Console *()> cfn,
- boost::function<Display *(unsigned int, unsigned int, GammaCurvePtr)> dfn,
-- POVMS_Object *result = NULL, shared_ptr<Console> console = shared_ptr<Console>());
-+ POVMS_Object *result = NULL, boost::shared_ptr<Console> console = boost::shared_ptr<Console>());
- ~SimpleFrontend();
-
-- bool Start(POVMS_Object& opts, shared_ptr<Image> img = shared_ptr<Image>());
-+ bool Start(POVMS_Object& opts, boost::shared_ptr<Image> img = boost::shared_ptr<Image>());
- bool Stop();
- bool Pause();
- bool Resume();
-@@ -167,7 +167,7 @@
- SimpleFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::SimpleFrontend(POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg,
- boost::function<Console *()> cfn,
- boost::function<Display *(unsigned int, unsigned int, GammaCurvePtr)> dfn,
-- POVMS_Object *result, shared_ptr<Console> console) :
-+ POVMS_Object *result, boost::shared_ptr<Console> console) :
- renderFrontend(ctx),
- backendAddress(addr),
- state(kReady),
-@@ -185,7 +185,7 @@
- }
-
- template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH>
--bool SimpleFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::Start(POVMS_Object& opts, shared_ptr<Image> img)
-+bool SimpleFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::Start(POVMS_Object& opts, boost::shared_ptr<Image> img)
- {
- int width;
- int height;
-@@ -212,16 +212,16 @@
- opts.Set(kPOVAttrib_Declare, declares);
-
- if(opts.TryGetInt(kPOVAttrib_FinalFrame, 0) > 0)
-- animationProcessing = shared_ptr<AnimationProcessing>(new AnimationProcessing(opts));
-+ animationProcessing = boost::shared_ptr<AnimationProcessing>(new AnimationProcessing(opts));
-
- options = opts;
-
- if(opts.TryGetBool(kPOVAttrib_OutputToFile, true))
- {
- if(img != NULL)
-- imageProcessing = shared_ptr<ImageProcessing>(new ImageProcessing(img));
-+ imageProcessing = boost::shared_ptr<ImageProcessing>(new ImageProcessing(img));
- else
-- imageProcessing = shared_ptr<ImageProcessing>(new ImageProcessing(options));
-+ imageProcessing = boost::shared_ptr<ImageProcessing>(new ImageProcessing(options));
- }
-
- Path ip (opts.TryGetString(kPOVAttrib_InputFile, ""));
-@@ -493,19 +493,19 @@
- }
-
- template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH>
--shared_ptr<Console> SimpleFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetConsole()
-+boost::shared_ptr<Console> SimpleFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetConsole()
- {
- return renderFrontend.GetConsole(sceneId);
- }
-
- template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH>
--shared_ptr<Image> SimpleFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetImage()
-+boost::shared_ptr<Image> SimpleFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetImage()
- {
- return renderFrontend.GetImage(viewId);
- }
-
- template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH>
--shared_ptr<Display> SimpleFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetDisplay()
-+boost::shared_ptr<Display> SimpleFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::GetDisplay()
- {
- return renderFrontend.GetDisplay(viewId);
- }
---- vfe/unix/syspovconfig.h 2012-06-19 11:29:38.000000000 -0500
-+++ vfe/unix/syspovconfig.h 2013-02-28 04:20:36.000000000 -0600
-@@ -139,7 +139,7 @@
- // to in a few other places.
- using std::runtime_error;
-
--// C++0x has a shared_ptr, but we currently use the boost one.
-+// C++0x has a boost::shared_ptr, but we currently use the boost one.
- using boost::shared_ptr;
-
- #endif // STD_POV_TYPES_DECLARED
---- vfe/vfe.cpp 2013-01-29 08:16:06.000000000 -0600
-+++ vfe/vfe.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -640,7 +640,7 @@
- //
- ////////////////////////////////////////////////////////////////////////////////////////
-
--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 ;
-@@ -656,7 +656,7 @@
- {
- // file-backed images may require a reference to PlatformBase to delete temporary files
- // we need to explicitly delete it here since otherwise PlatformBase will have been destroyed
-- // before the shared_ptr does its cleanup
-+ // before the boost::shared_ptr does its cleanup
- imageProcessing.reset();
- if (backendAddress != POVMSInvalidAddress)
- renderFrontend.DisconnectFromBackend(backendAddress);
-@@ -747,7 +747,7 @@
-
- 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 @@
- 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 () ;
- }
-
-@@ -1183,7 +1183,7 @@
- }
-
- // 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());
---- vfe/vfe.h 2012-06-19 11:29:39.000000000 -0500
-+++ vfe/vfe.h 2013-02-28 04:20:36.000000000 -0600
-@@ -267,7 +267,7 @@
- class VirtualFrontEnd
- {
- public:
-- VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr<Console>& console) ;
-+ VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, boost::shared_ptr<Console>& console) ;
- virtual ~VirtualFrontEnd() ;
-
- virtual bool Start(POVMS_Object& opts) ;
-@@ -298,9 +298,9 @@
- POVMS_Object options;
- RenderFrontendBase::SceneId sceneId;
- RenderFrontendBase::ViewId viewId;
-- shared_ptr<AnimationProcessing> animationProcessing ;
-- shared_ptr<ImageProcessing> imageProcessing ;
-- shared_ptr<ShelloutProcessing> shelloutProcessing;
-+ boost::shared_ptr<AnimationProcessing> animationProcessing ;
-+ boost::shared_ptr<ImageProcessing> imageProcessing ;
-+ boost::shared_ptr<ShelloutProcessing> shelloutProcessing;
- Console **consoleResult;
- Display **displayResult;
- vfeSession* m_Session;
---- vfe/vfesession.cpp 2012-11-21 13:30:03.000000000 -0600
-+++ vfe/vfesession.cpp 2013-02-28 04:20:36.000000000 -0600
-@@ -601,7 +601,7 @@
- boost::shared_ptr<Display> vfeSession::GetDisplay() const
- {
- if (m_Frontend == NULL)
-- return (shared_ptr<Display>());
-+ return (boost::shared_ptr<Display>());
- return m_Frontend->GetDisplay();
- }
-
-@@ -639,7 +639,7 @@
- m_BackendThread = povray_init (boost::bind(&vfeSession::BackendThreadNotify, this), const_cast<void **>(&pov::RenderThreadAddr)) ;
- POVMS_Output_Context = pov::POVMS_GUI_Context ;
-
-- m_Console = shared_ptr<vfeConsole> (new vfeConsole(this, m_ConsoleWidth)) ;
-+ m_Console = boost::shared_ptr<vfeConsole> (new vfeConsole(this, m_ConsoleWidth)) ;
-
- POVMS_Object obj ;
- m_Frontend = new VirtualFrontEnd (*this, POVMS_Output_Context, (POVMSAddress) pov::RenderThreadAddr, obj, NULL, m_Console) ;
---- vfe/vfesession.h 2012-06-19 11:29:40.000000000 -0500
-+++ vfe/vfesession.h 2013-02-28 04:20:36.000000000 -0600
-@@ -1294,7 +1294,7 @@
-
- static bool m_Initialized;
- static vfeSession *m_CurrentSessionTemporaryHack;
-- shared_ptr<Console> m_Console;
-+ boost::shared_ptr<Console> m_Console;
-
- virtual vfeDisplay *DefaultDisplayCreator (unsigned int width, unsigned int height, GammaCurvePtr gamma, vfeSession *session, bool visible);
- DisplayCreator m_DisplayCreator;
Copied: trunk/dports/graphics/povray/files/patch-unix-configure.ac.diff (from rev 113811, trunk/dports/graphics/povray/files/patch-configure-stat.diff)
===================================================================
--- trunk/dports/graphics/povray/files/patch-unix-configure.ac.diff (rev 0)
+++ trunk/dports/graphics/povray/files/patch-unix-configure.ac.diff 2013-11-24 04:24:24 UTC (rev 113814)
@@ -0,0 +1,24 @@
+https://github.com/POV-Ray/povray/issues/6
+https://github.com/POV-Ray/povray/issues/7
+--- unix/configure.ac.orig 2013-11-06 14:28:15.000000000 -0600
++++ unix/configure.ac 2013-11-23 20:25:41.000000000 -0600
+@@ -166,7 +166,7 @@
+ AC_CANONICAL_BUILD
+ AC_CANONICAL_HOST
+
+-AM_INIT_AUTOMAKE([1.9 dist-bzip2])
++AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects])
+ AM_MAINTAINER_MODE
+
+ AX_FIX_INCORRECT_PATH(C_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path C_INCLUDE_PATH"])
+@@ -986,8 +986,8 @@
+ AC_DEFINE_UNQUOTED([BUILTIN_IMG_FORMATS], ["$pov_img_fmt_builtin $pov_img_fmt_enabled"], [Supported image formats.])
+ AC_DEFINE_UNQUOTED([MISSING_IMG_FORMATS], ["$pov_img_fmt_disabled"], [Unsupported image formats.])
+
+-povowner=`stat -c %u ${HOME}`
+-povgroup=`stat -c %g ${HOME}`
++povowner=`stat -f %u ${HOME}`
++povgroup=`stat -f %g ${HOME}`
+ AC_SUBST([povowner])
+ AC_SUBST([povgroup])
+
Added: trunk/dports/graphics/povray/files/patch-unix-prebuild.sh.diff
===================================================================
--- trunk/dports/graphics/povray/files/patch-unix-prebuild.sh.diff (rev 0)
+++ trunk/dports/graphics/povray/files/patch-unix-prebuild.sh.diff 2013-11-24 04:24:24 UTC (rev 113814)
@@ -0,0 +1,22 @@
+https://github.com/POV-Ray/povray/issues/5
+https://github.com/POV-Ray/povray/issues/6
+--- unix/prebuild.sh.orig 2013-11-06 14:28:15.000000000 -0600
++++ unix/prebuild.sh 2013-11-23 19:25:18.000000000 -0600
+@@ -358,7 +358,7 @@
+ do
+ out=`basename $file`
+ echo "Create ../$out`test -d $file && echo /`"
+- $cp_u -f -R $file ../ || echo "$file not copied !"
++ $cp_u -f -R $file ../$out || echo "$file not copied !"
+ chmod -f -R u+rw ../$out
+ done
+
+@@ -724,7 +724,7 @@
+ autoheader --warnings=all
+
+ # Create all Makefile.in's from Makefile.am's
+-automake --warnings=all ###--ignore-deps
++automake --add-missing --warnings=all ###--ignore-deps
+
+ # Create configure from configure.ac
+ autoconf --warnings=all
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131123/af1645f8/attachment-0001.html>
More information about the macports-changes
mailing list