[arch-commits] Commit in povray/trunk (PKGBUILD povray-3.7.0_rc7-boost-1.50.patch)

[Alexander Rødseth]

    Date: Thursday, November 14, 2013 @ 19:28:57
  Author: arodseth
Revision: 101000

Upgrading to 3.7 stable

Modified:
  povray/trunk/PKGBUILD
Deleted:
  povray/trunk/povray-3.7.0_rc7-boost-1.50.patch

-----------------------------------+
 PKGBUILD                          |   10 ++---
 povray-3.7.0_rc7-boost-1.50.patch |   68 ------------------------------------
 2 files changed, 5 insertions(+), 73 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-14 15:05:53 UTC (rev 100999)
+++ PKGBUILD	2013-11-14 18:28:57 UTC (rev 101000)
@@ -30,11 +30,11 @@
 prepare() {
   cd "$pkgname-$pkgver-stable"
 
-  sed -i 's:=no:=yes:' unix/config/ax_boost_thread.m4
   cd unix
-  1>/dev/null 2>/dev/null ./prebuild.sh
+  sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh
+  sed 's/dist-bzip2/dist-bzip2 subdir-objects/g' -i configure.ac
+  ./prebuild.sh
   cd ..
-  sed -i 's:AC_MSG_FAILURE(\[c:AC_MSG_RESULT(\[:' configure.ac
   ./bootstrap
   patch -p1 < "$srcdir/povray3.7.0_rc3-user-conf.patch"
 }
@@ -42,8 +42,8 @@
 build() {
   cd "$pkgname-$pkgver-stable"
 
-  ./configure COMPILED_BY='Arch Linux' --prefix=/usr --sysconfdir=/etc --with-boost-thread=boost_thread
-  make CXXFLAGS+="-w -lboost_system"
+  ./configure LIBS="-lboost_system -lboost_thread" COMPILED_BY='Arch Linux' --prefix=/usr --sysconfdir=/etc
+  make CXXFLAGS+="-w -lboost_system -lboost_thread"
   gzip -f povray.1
 }
 

Deleted: povray-3.7.0_rc7-boost-1.50.patch
===================================================================
--- povray-3.7.0_rc7-boost-1.50.patch	2013-11-14 15:05:53 UTC (rev 100999)
+++ povray-3.7.0_rc7-boost-1.50.patch	2013-11-14 18:28:57 UTC (rev 101000)
@@ -1,68 +0,0 @@
-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));