| 1 |
commit: 31c72ffcbcaa1f5cecb081b17ee52dbbd9d542ce |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jan 31 18:48:23 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 31 20:38:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31c72ffc |
| 7 |
|
| 8 |
media-gfx/povray: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/19275 |
| 11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
.../povray/files/povray-3.7.0.0-boost-1.50.patch | 72 ---------------------- |
| 16 |
1 file changed, 72 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index f8e807ad647..00000000000 |
| 21 |
--- a/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,72 +0,0 @@ |
| 24 |
- configure.ac | 26 ++++++-------------------- |
| 25 |
- vfe/unix/platformbase.cpp | 2 +- |
| 26 |
- 2 files changed, 7 insertions(+), 21 deletions(-) |
| 27 |
- |
| 28 |
-diff --git a/configure.ac b/configure.ac |
| 29 |
-index 51596f8..900c150 100644 |
| 30 |
---- a/configure.ac |
| 31 |
-+++ b/configure.ac |
| 32 |
-@@ -57,8 +57,6 @@ AC_CONFIG_SRCDIR([unix/disp_text.cpp]) |
| 33 |
- m4_include([unix/config/acx_pthread.m4]) |
| 34 |
- m4_include([unix/config/ax_arg_enable.m4]) |
| 35 |
- m4_include([unix/config/ax_arg_with.m4]) |
| 36 |
--m4_include([unix/config/ax_boost_base.m4]) |
| 37 |
--m4_include([unix/config/ax_boost_thread.m4]) |
| 38 |
- m4_include([unix/config/ax_test_compiler_flags.m4]) |
| 39 |
- m4_include([unix/config/ax_check_lib.m4]) |
| 40 |
- m4_include([unix/config/ax_check_libjpeg.m4]) |
| 41 |
-@@ -168,6 +166,7 @@ AC_CANONICAL_HOST |
| 42 |
- |
| 43 |
- AM_INIT_AUTOMAKE([1.9 dist-bzip2]) |
| 44 |
- AM_MAINTAINER_MODE |
| 45 |
-+LT_INIT |
| 46 |
- |
| 47 |
- AX_FIX_INCORRECT_PATH(C_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path C_INCLUDE_PATH"]) |
| 48 |
- AX_FIX_INCORRECT_PATH(CPLUS_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path CPLUS_INCLUDE_PATH"]) |
| 49 |
-@@ -298,28 +297,15 @@ LIBS="$LIBS $PTHREAD_CFLAGS $PTHREAD_LIBS" # append |
| 50 |
- |
| 51 |
- # Boost; required library |
| 52 |
- # the following macro stops with error when boost is not found |
| 53 |
--AX_BOOST_BASE([$required_libboost_version]) |
| 54 |
--AX_BOOST_THREAD |
| 55 |
--if test x"$ax_cv_boost_thread" != x"yes"; then |
| 56 |
-+BOOST_REQUIRE([$required_libboost_version]) |
| 57 |
-+BOOST_THREADS |
| 58 |
-+if test x"$boost_cv_lib_thread" != x"yes"; then |
| 59 |
- AC_MSG_ERROR([cannot find a suitable boost thread library]) |
| 60 |
- else |
| 61 |
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" # append |
| 62 |
-- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" # append |
| 63 |
-- LIBS="$BOOST_THREAD_LIB $LIBS" |
| 64 |
-+ LDFLAGS="$LDFLAGS -L$BOOST_LDPATH" # append |
| 65 |
-+ LIBS="$BOOST_THREAD_LIBS $LIBS" |
| 66 |
- fi |
| 67 |
--AC_MSG_CHECKING([whether the boost thread library is usable]) |
| 68 |
--AC_RUN_IFELSE( |
| 69 |
-- [AC_LANG_PROGRAM([[ |
| 70 |
--#include <boost/thread/thread.hpp> |
| 71 |
-- ]], |
| 72 |
-- [[boost::defer_lock_t(); return 0;]])], |
| 73 |
-- [AC_MSG_RESULT([yes])], |
| 74 |
-- [ |
| 75 |
-- AC_MSG_RESULT([no]) |
| 76 |
-- AC_MSG_FAILURE([cannot link with the boost thread library]) |
| 77 |
-- ], |
| 78 |
-- [AC_MSG_RESULT([cross-compiling])] # FIXME |
| 79 |
--) |
| 80 |
- AC_DEFINE([USE_OFFICIAL_BOOST], [], [Use the official Boost libraries.]) |
| 81 |
- |
| 82 |
- # Intel Math Kernel library |
| 83 |
-diff --git a/vfe/unix/platformbase.cpp b/vfe/unix/platformbase.cpp |
| 84 |
-index 8669d19..83c0191 100644 |
| 85 |
---- a/vfe/unix/platformbase.cpp |
| 86 |
-+++ b/vfe/unix/platformbase.cpp |
| 87 |
-@@ -68,7 +68,7 @@ namespace pov_base |
| 88 |
- #else |
| 89 |
- // taken from source/base/timer.cpp |
| 90 |
- boost::xtime t; |
| 91 |
-- boost::xtime_get(&t, boost::TIME_UTC); |
| 92 |
-+ boost::xtime_get(&t, POV_TIME_UTC); |
| 93 |
- POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000); |
| 94 |
- t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000)); |
| 95 |
- t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000)); |
Archives