diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
| commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
| tree | c44943ee0563a3fa957716de909fed683117fcb9 /media-gfx/povray | |
| parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) | |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'media-gfx/povray')
| -rw-r--r-- | media-gfx/povray/Manifest | 1 | ||||
| -rw-r--r-- | media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch | 72 |
2 files changed, 0 insertions, 73 deletions
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest index 8ade99d481de..23dbeebf5f3a 100644 --- a/media-gfx/povray/Manifest +++ b/media-gfx/povray/Manifest @@ -1,5 +1,4 @@ AUX povray-3.7.0.0-automagic.patch 812 BLAKE2B 86bd0a0419b215c3731517596544c8ebe48b5ffa6038e47f9f4fa01d4f21ce3474c2f825b21036b4b7fad7a6c31eb5513d3d95635b6356282ffccf6f028e2d68 SHA512 c76ccc429b2868fbae4d40f66d81c07d8b5eba3ec419b2377d3ee541f34b7e597ecf232d1a268abd85fa47abd4f9c7b3cbf26293746b2b10361cef2ea4c34709 -AUX povray-3.7.0.0-boost-1.50.patch 2739 BLAKE2B e13ba49fa2d6a2ee57110f5e22f3be9e9040d730d27cb611e16566596b9a6cb52deb008fabfe48da16a3dbd362842a93d60238678bde077bae37ce8137068abf SHA512 90b5f03bd290b8fd4431fae208a38d8d54c56bbe3e39db728546a0598ce953eb6f98745bd2ad527d4f8f39dc02cb066b4aee999e7fc7e1348c0da98e9f6bbc1b AUX povray-3.7.0.0-gcc6-openexr.patch 1153 BLAKE2B 645b9148b8ebc9eb14fd7a01f7479397542c015b1cfe10543870844326f929b9258e8c8bc7518b38c2bbc396070fd1e0336121a4502eed0460aac47e4634aad5 SHA512 0be944d63df3e1df031e25f535bddb7ef0416da8447167c1dbba1dc1b007e4c86119c01004953a7280a847640a7f630f3081fdd624028bb923620b78b5e20cec AUX povray-3.7.0.0-r1-boost-1.50.patch 3582 BLAKE2B d505f7aa1fa9f4a7c645c5eb815a29f51568490f5d3726991a58891fdf66010e2f1e5a03f35e686281cd43ead20d197af3843be00d1dff6d1bb4f93332686cb6 SHA512 5ab0f29e67e98e47fe8fb991d8a510cb1ff92f27be6e0191c7d8c8f91ec3d67b3127d7227bdbfe8f263b9c6ada216ac46d0bb2e1f221230b253f07424ba689db AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4cde1346ab77afd73d016f95eec444e6a1c741be87751c3e794c061fcc9534ac0ebb722ab6b16079044d5971be6b5b649 SHA512 f25ad7e0738a6e0e759aba7405d29839f69a3013170b7072e17afebda7e5d700906280491499628859a8d61c27ee3fc54f0b9fd3f472e0771cdad4f7a3bf6664 diff --git a/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch b/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch deleted file mode 100644 index f8e807ad647d..000000000000 --- a/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch +++ /dev/null @@ -1,72 +0,0 @@ - configure.ac | 26 ++++++-------------------- - vfe/unix/platformbase.cpp | 2 +- - 2 files changed, 7 insertions(+), 21 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 51596f8..900c150 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,8 +57,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]) -@@ -168,6 +166,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"]) -@@ -298,28 +297,15 @@ LIBS="$LIBS $PTHREAD_CFLAGS $PTHREAD_LIBS" # append - - # 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 -diff --git a/vfe/unix/platformbase.cpp b/vfe/unix/platformbase.cpp -index 8669d19..83c0191 100644 ---- a/vfe/unix/platformbase.cpp -+++ b/vfe/unix/platformbase.cpp -@@ -68,7 +68,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)); |