Date: Tuesday, July 9, 2013 @ 00:27:30 Author: arodseth Revision: 93724
Added patch from gentoo Added: povray/trunk/povray-3.7.0_rc7-boost-1.50.patch -----------------------------------+ povray-3.7.0_rc7-boost-1.50.patch | 68 ++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) Added: povray-3.7.0_rc7-boost-1.50.patch =================================================================== --- povray-3.7.0_rc7-boost-1.50.patch (rev 0) +++ povray-3.7.0_rc7-boost-1.50.patch 2013-07-08 22:27:30 UTC (rev 93724) @@ -0,0 +1,68 @@ +Index: povray-3.7.0.RC5/configure.ac +=================================================================== +--- povray-3.7.0.RC5.orig/configure.ac ++++ povray-3.7.0.RC5/configure.ac +@@ -54,8 +54,6 @@ AC_CONFIG_SRCDIR([unix/disp_text.cpp]) + m4_include([unix/config/acx_pthread.m4]) + m4_include([unix/config/ax_arg_enable.m4]) + m4_include([unix/config/ax_arg_with.m4]) +-m4_include([unix/config/ax_boost_base.m4]) +-m4_include([unix/config/ax_boost_thread.m4]) + m4_include([unix/config/ax_test_compiler_flags.m4]) + m4_include([unix/config/ax_check_lib.m4]) + m4_include([unix/config/ax_check_libjpeg.m4]) +@@ -165,6 +163,7 @@ AC_CANONICAL_HOST + + AM_INIT_AUTOMAKE([1.9 dist-bzip2]) + AM_MAINTAINER_MODE ++LT_INIT + + AX_FIX_INCORRECT_PATH(C_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path C_INCLUDE_PATH"]) + AX_FIX_INCORRECT_PATH(CPLUS_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path CPLUS_INCLUDE_PATH"]) +@@ -295,28 +294,15 @@ LIBS="$LIBS $PTHREAD_CFLAGS $PTHREAD_LIB + + # Boost; required library + # the following macro stops with error when boost is not found +-AX_BOOST_BASE([$required_libboost_version]) +-AX_BOOST_THREAD +-if test x"$ax_cv_boost_thread" != x"yes"; then ++BOOST_REQUIRE([$required_libboost_version]) ++BOOST_THREADS ++if test x"$boost_cv_lib_thread" != x"yes"; then + AC_MSG_ERROR([cannot find a suitable boost thread library]) + else + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" # append +- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" # append +- LIBS="$BOOST_THREAD_LIB $LIBS" ++ LDFLAGS="$LDFLAGS -L$BOOST_LDPATH" # append ++ LIBS="$BOOST_THREAD_LIBS $LIBS" + fi +-AC_MSG_CHECKING([whether the boost thread library is usable]) +-AC_RUN_IFELSE( +- [AC_LANG_PROGRAM([[ +-#include <boost/thread/thread.hpp> +- ]], +- [[boost::defer_lock_t(); return 0;]])], +- [AC_MSG_RESULT([yes])], +- [ +- AC_MSG_RESULT([no]) +- AC_MSG_FAILURE([cannot link with the boost thread library]) +- ], +- [AC_MSG_RESULT([cross-compiling])] # FIXME +-) + AC_DEFINE([USE_OFFICIAL_BOOST], [], [Use the official Boost libraries.]) + + # Intel Math Kernel library +Index: povray-3.7.0.RC5/vfe/unix/platformbase.cpp +=================================================================== +--- povray-3.7.0.RC5.orig/vfe/unix/platformbase.cpp ++++ povray-3.7.0.RC5/vfe/unix/platformbase.cpp +@@ -126,7 +126,7 @@ namespace pov_base + #else + // taken from source/base/timer.cpp + boost::xtime t; +- boost::xtime_get(&t, boost::TIME_UTC); ++ boost::xtime_get(&t, POV_TIME_UTC); + POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000); + t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000)); + t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));
