| 1 |
jlec 13/12/26 13:37:00 |
| 2 |
|
| 3 |
Added: povray-3.7.0.0-user-conf.patch |
| 4 |
povray-3.7.0.0-automagic.patch |
| 5 |
povray-3.7.0.0-boost-1.50.patch |
| 6 |
Log: |
| 7 |
media-gfx/povray: Version BUmp |
| 8 |
|
| 9 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 media-gfx/povray/files/povray-3.7.0.0-user-conf.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/files/povray-3.7.0.0-user-conf.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/files/povray-3.7.0.0-user-conf.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: povray-3.7.0.0-user-conf.patch |
| 18 |
=================================================================== |
| 19 |
Makefile.am | 13 ------------- |
| 20 |
1 files changed, 0 insertions(+), 13 deletions(-) |
| 21 |
|
| 22 |
diff --git a/Makefile.am b/Makefile.am |
| 23 |
index 76b394c..9822c52 100644 |
| 24 |
--- a/Makefile.am |
| 25 |
+++ b/Makefile.am |
| 26 |
@@ -107,19 +107,6 @@ install-data-local: |
| 27 |
for f in $$filelist ; do \ |
| 28 |
$(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \ |
| 29 |
done |
| 30 |
- @echo "Creating user directories..."; \ |
| 31 |
- for p in $(povuser) $(povconfuser) ; do \ |
| 32 |
- $(MKDIR_P) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \ |
| 33 |
- done |
| 34 |
- @echo "Copying user configuration and INI files..."; \ |
| 35 |
- for f in povray.conf povray.ini ; do \ |
| 36 |
- if test -f $(povconfuser)/$$f; then \ |
| 37 |
- echo "Creating backup of $(povconfuser)/$$f"; \ |
| 38 |
- mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \ |
| 39 |
- fi; \ |
| 40 |
- done; \ |
| 41 |
- $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf && echo "$(povconfuser)/povray.conf" >> $(povinstall); \ |
| 42 |
- $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini && echo "$(povconfuser)/povray.ini" >> $(povinstall) |
| 43 |
|
| 44 |
# Remove data, config, and empty folders for 'make uninstall'. |
| 45 |
# Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts). |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.1 media-gfx/povray/files/povray-3.7.0.0-automagic.patch |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/files/povray-3.7.0.0-automagic.patch?rev=1.1&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/files/povray-3.7.0.0-automagic.patch?rev=1.1&content-type=text/plain |
| 53 |
|
| 54 |
Index: povray-3.7.0.0-automagic.patch |
| 55 |
=================================================================== |
| 56 |
unix/configure.ac | 13 +++++++++---- |
| 57 |
1 file changed, 9 insertions(+), 4 deletions(-) |
| 58 |
|
| 59 |
diff --git a/configure.ac b/configure.ac |
| 60 |
index f62f5d4..d9a3750 100644 |
| 61 |
--- a/configure.ac |
| 62 |
+++ b/configure.ac |
| 63 |
@@ -335,10 +335,15 @@ fi |
| 64 |
AC_DEFINE([USE_OFFICIAL_BOOST], [], [Use the official Boost libraries.]) |
| 65 |
|
| 66 |
# Intel Math Kernel library |
| 67 |
-pov_save_ldflags="$LDFLAGS" |
| 68 |
-test x"$with_libmkl" != x"" && LDFLAGS="-L$with_libmkl $LDFLAGS" |
| 69 |
-AC_CHECK_LIB([mkl], [sin]) |
| 70 |
-test x"ac_cv_lib_mkl_sin" = x"no" && LDFLAGS="$pov_save_ldflags" |
| 71 |
+AS_IF([test x"$with_libmkl" != x"no"], [ |
| 72 |
+ pov_save_ldflags="$LDFLAGS" |
| 73 |
+ AS_IF([test x"$with_libmkl" != x"yes"], [ |
| 74 |
+ LDFLAGS="-L$with_libmkl $LDFLAGS" |
| 75 |
+ ]) |
| 76 |
+ AC_CHECK_LIB([mkl], [sin], [], [ |
| 77 |
+ AC_MSG_ERROR([Cannot find working mkl library]) |
| 78 |
+ ]) |
| 79 |
+]) |
| 80 |
|
| 81 |
# libm |
| 82 |
AC_CHECK_LIB([m], [sin]) |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
1.1 media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch |
| 87 |
|
| 88 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch?rev=1.1&view=markup |
| 89 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch?rev=1.1&content-type=text/plain |
| 90 |
|
| 91 |
Index: povray-3.7.0.0-boost-1.50.patch |
| 92 |
=================================================================== |
| 93 |
configure.ac | 26 ++++++-------------------- |
| 94 |
vfe/unix/platformbase.cpp | 2 +- |
| 95 |
2 files changed, 7 insertions(+), 21 deletions(-) |
| 96 |
|
| 97 |
diff --git a/configure.ac b/configure.ac |
| 98 |
index 51596f8..900c150 100644 |
| 99 |
--- a/configure.ac |
| 100 |
+++ b/configure.ac |
| 101 |
@@ -57,8 +57,6 @@ AC_CONFIG_SRCDIR([unix/disp_text.cpp]) |
| 102 |
m4_include([unix/config/acx_pthread.m4]) |
| 103 |
m4_include([unix/config/ax_arg_enable.m4]) |
| 104 |
m4_include([unix/config/ax_arg_with.m4]) |
| 105 |
-m4_include([unix/config/ax_boost_base.m4]) |
| 106 |
-m4_include([unix/config/ax_boost_thread.m4]) |
| 107 |
m4_include([unix/config/ax_test_compiler_flags.m4]) |
| 108 |
m4_include([unix/config/ax_check_lib.m4]) |
| 109 |
m4_include([unix/config/ax_check_libjpeg.m4]) |
| 110 |
@@ -168,6 +166,7 @@ AC_CANONICAL_HOST |
| 111 |
|
| 112 |
AM_INIT_AUTOMAKE([1.9 dist-bzip2]) |
| 113 |
AM_MAINTAINER_MODE |
| 114 |
+LT_INIT |
| 115 |
|
| 116 |
AX_FIX_INCORRECT_PATH(C_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path C_INCLUDE_PATH"]) |
| 117 |
AX_FIX_INCORRECT_PATH(CPLUS_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path CPLUS_INCLUDE_PATH"]) |
| 118 |
@@ -298,28 +297,15 @@ LIBS="$LIBS $PTHREAD_CFLAGS $PTHREAD_LIBS" # append |
| 119 |
|
| 120 |
# Boost; required library |
| 121 |
# the following macro stops with error when boost is not found |
| 122 |
-AX_BOOST_BASE([$required_libboost_version]) |
| 123 |
-AX_BOOST_THREAD |
| 124 |
-if test x"$ax_cv_boost_thread" != x"yes"; then |
| 125 |
+BOOST_REQUIRE([$required_libboost_version]) |
| 126 |
+BOOST_THREADS |
| 127 |
+if test x"$boost_cv_lib_thread" != x"yes"; then |
| 128 |
AC_MSG_ERROR([cannot find a suitable boost thread library]) |
| 129 |
else |
| 130 |
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" # append |
| 131 |
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" # append |
| 132 |
- LIBS="$BOOST_THREAD_LIB $LIBS" |
| 133 |
+ LDFLAGS="$LDFLAGS -L$BOOST_LDPATH" # append |
| 134 |
+ LIBS="$BOOST_THREAD_LIBS $LIBS" |
| 135 |
fi |
| 136 |
-AC_MSG_CHECKING([whether the boost thread library is usable]) |
| 137 |
-AC_RUN_IFELSE( |
| 138 |
- [AC_LANG_PROGRAM([[ |
| 139 |
-#include <boost/thread/thread.hpp> |
| 140 |
- ]], |
| 141 |
- [[boost::defer_lock_t(); return 0;]])], |
| 142 |
- [AC_MSG_RESULT([yes])], |
| 143 |
- [ |
| 144 |
- AC_MSG_RESULT([no]) |
| 145 |
- AC_MSG_FAILURE([cannot link with the boost thread library]) |
| 146 |
- ], |
| 147 |
- [AC_MSG_RESULT([cross-compiling])] # FIXME |
| 148 |
-) |
| 149 |
AC_DEFINE([USE_OFFICIAL_BOOST], [], [Use the official Boost libraries.]) |
| 150 |
|
| 151 |
# Intel Math Kernel library |
| 152 |
diff --git a/vfe/unix/platformbase.cpp b/vfe/unix/platformbase.cpp |
| 153 |
index 8669d19..83c0191 100644 |
| 154 |
--- a/vfe/unix/platformbase.cpp |
| 155 |
+++ b/vfe/unix/platformbase.cpp |
| 156 |
@@ -68,7 +68,7 @@ namespace pov_base |
| 157 |
#else |
| 158 |
// taken from source/base/timer.cpp |
| 159 |
boost::xtime t; |
| 160 |
- boost::xtime_get(&t, boost::TIME_UTC); |
| 161 |
+ boost::xtime_get(&t, POV_TIME_UTC); |
| 162 |
POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000); |
| 163 |
t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000)); |
| 164 |
t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000)); |
Archives