Hello community, here is the log from the commit of package povray for openSUSE:Factory:NonFree checked in at 2013-07-16 16:13:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/povray (Old) and /work/SRC/openSUSE:Factory:NonFree/.povray.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "povray" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/povray/povray.changes 2012-11-28 16:22:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory:NonFree/.povray.new/povray.changes 2013-07-16 16:13:51.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Jul 13 14:25:40 UTC 2013 - [email protected] + +- update to 3.7.RC7 + * added patch povray-3.6.9.7-boost-link.patch + * allows boost to be linked + * renamed all the patches to correspond to the version bump + * updated patch TIME_UTC_.patch to reflect changes to source + * BuildRequires: libSDL-devel openexr-devel + +------------------------------------------------------------------- Old: ---- povray-3.6.9.6-TIME_UTC_.patch povray-3.6.9.6-fix.patch povray-3.6.9.6-ini.patch povray-3.7.0.RC6.tar.bz2 New: ---- povray-3.6.9.7-TIME_UTC_.patch povray-3.6.9.7-boost-link.patch povray-3.6.9.7-fix.patch povray-3.6.9.7-ini.patch povray-3.7.0.RC7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ povray.spec ++++++ --- /var/tmp/diff_new_pack.hHgITc/_old 2013-07-16 16:13:52.000000000 +0200 +++ /var/tmp/diff_new_pack.hHgITc/_new 2013-07-16 16:13:52.000000000 +0200 @@ -19,16 +19,18 @@ Name: povray License: SUSE-NonFree Group: Productivity/Graphics/Visualization/Raytracers -Version: 3.6.9.6 +Version: 3.6.9.7 Release: 0 Summary: Ray Tracer Url: http://www.povray.org -Source: povray-3.7.0.RC6.tar.bz2 +Source: povray-3.7.0.RC7.tar.bz2 Patch1: povray-%{version}-ini.patch Patch2: povray-%{version}-fix.patch # boost changed TIME_UTC -> TIME_UTC_ Patch3: povray-%{version}-TIME_UTC_.patch +# make boost link +Patch4: povray-%{version}-boost-link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: boost-devel @@ -39,6 +41,8 @@ BuildRequires: xorg-x11-libX11-devel BuildRequires: libjpeg-devel BuildRequires: zlib-devel +BuildRequires: libSDL-devel +BuildRequires: openexr-devel %description The Persistence of Vision Ray tracer creates three-dimensional, @@ -51,24 +55,23 @@ realistic reflections, shading, perspective, and other effects. %prep -%setup -q -n povray-3.7.0.RC6 +%setup -q -n povray-3.7.0.RC7 %patch1 %patch2 # boost changed TIME_UTC -> TIME_UTC_ %if 0%{suse_version} > 1220 -%patch3 -p1 +%patch4 %endif rm -rf libraries - %build -autoreconf -fiv +autoreconf -fi %ifarch %arm # work around ICE RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O1" %endif CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-multichar" CFLAGS="$CXXFLAGS"\ %configure COMPILED_BY="SUSE LINUX Products GmbH, Nuernberg, Germany" \ - --disable-optimiz --with-boost-thread=boost_thread-mt + --disable-optimiz --with-boost-libdir=%{_libdir} make %{?_smp_mflags} perl -pi -e 's,^DEFAULT_DIR=.*,DEFAULT_DIR=/usr,' scripts/* perl -pi -e 's,^SYSCONFDIR=.*,SYSCONFDIR=/etc,' scripts/* ++++++ povray-3.6.9.6-TIME_UTC_.patch -> povray-3.6.9.7-TIME_UTC_.patch ++++++ --- /work/SRC/openSUSE:Factory:NonFree/povray/povray-3.6.9.6-TIME_UTC_.patch 2012-09-14 12:34:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.povray.new/povray-3.6.9.7-TIME_UTC_.patch 2013-07-16 16:13:50.000000000 +0200 @@ -1,62 +1,5 @@ -Index: povray-3.7.0.RC6/source/backend/scene/view.cpp -=================================================================== ---- povray-3.7.0.RC6.orig/source/backend/scene/view.cpp -+++ povray-3.7.0.RC6/source/backend/scene/view.cpp -@@ -1550,7 +1550,7 @@ const Camera *RTRData::CompletedFrame() - } - - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.sec += 3; - - // this will cause us to wait until the other threads are done. -Index: povray-3.7.0.RC6/source/base/timer.cpp -=================================================================== ---- povray-3.7.0.RC6.orig/source/base/timer.cpp -+++ povray-3.7.0.RC6/source/base/timer.cpp -@@ -117,7 +117,7 @@ TimerDefault::~TimerDefault() - POV_LONG TimerDefault::ElapsedRealTime() const - { - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::TIME_UTC_); - POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec); - POV_LONG st = (POV_LONG)(realTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(realTimeStart.nsec); - return ((tt - st) / (POV_LONG)(1000000)); -@@ -126,7 +126,7 @@ POV_LONG TimerDefault::ElapsedRealTime() - POV_LONG TimerDefault::ElapsedCPUTime() const - { - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::TIME_UTC_); - POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec); - POV_LONG st = (POV_LONG)(cpuTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(cpuTimeStart.nsec); - return ((tt - st) / (POV_LONG)(1000000)); -@@ -139,8 +139,8 @@ bool TimerDefault::HasValidCPUTime() con - - void TimerDefault::Reset() - { -- boost::xtime_get(&realTimeStart, boost::TIME_UTC); -- boost::xtime_get(&cpuTimeStart, boost::TIME_UTC); -+ boost::xtime_get(&realTimeStart, boost::TIME_UTC_); -+ boost::xtime_get(&cpuTimeStart, boost::TIME_UTC_); - } - - } -@@ -155,7 +155,7 @@ namespace pov_base - void Delay(unsigned int msec) - { - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::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)); -Index: povray-3.7.0.RC6/vfe/unix/platformbase.cpp -=================================================================== ---- povray-3.7.0.RC6.orig/vfe/unix/platformbase.cpp -+++ povray-3.7.0.RC6/vfe/unix/platformbase.cpp +--- vfe/unix/platformbase.cpp.orig 2013-07-13 14:02:20.743136000 +0100 ++++ vfe/unix/platformbase.cpp 2013-07-13 14:02:40.028136000 +0100 @@ -126,7 +126,7 @@ namespace pov_base #else // taken from source/base/timer.cpp @@ -66,56 +9,3 @@ 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)); -Index: povray-3.7.0.RC6/vfe/vfesession.cpp -=================================================================== ---- povray-3.7.0.RC6.orig/vfe/vfesession.cpp -+++ povray-3.7.0.RC6/vfe/vfesession.cpp -@@ -967,7 +967,7 @@ vfeStatusFlags vfeSession::GetStatus(boo - if (WaitTime > 0) - { - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.sec += WaitTime / 1000 ; - t.nsec += (WaitTime % 1000) * 1000000 ; - m_SessionEvent.timed_wait (lock, t); -@@ -1034,7 +1034,7 @@ bool vfeSession::Pause() - // we can't call pause directly since it will result in a thread context - // error. pause must be called from the context of the worker thread. - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.sec += 3 ; - m_RequestFlag = rqPauseRequest; - if (m_RequestEvent.timed_wait(lock, t) == false) -@@ -1057,7 +1057,7 @@ bool vfeSession::Resume() - // we can't call resume directly since it will result in a thread context - // error. it must be called from the context of the worker thread. - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.sec += 3 ; - m_RequestFlag = rqResumeRequest; - if (m_RequestEvent.timed_wait(lock, t) == false) -@@ -1123,7 +1123,7 @@ int vfeSession::Initialize(vfeDestInfo * - m_LastError = vfeNoError; - - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.sec += 3 ; - #ifdef _DEBUG - t.sec += 120; -Index: povray-3.7.0.RC6/vfe/vfepovms.cpp -=================================================================== ---- povray-3.7.0.RC6.orig/vfe/vfepovms.cpp -+++ povray-3.7.0.RC6/vfe/vfepovms.cpp -@@ -247,7 +247,7 @@ void *SysQNode::Receive (int *pLen, bool - - // TODO: have a shorter wait but loop, and check for system shutdown - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.nsec += 50000000 ; - m_Event.timed_wait (lock, t); - ++++++ povray-3.6.9.7-boost-link.patch ++++++ --- unix/config/ax_boost_thread.m4.link 2012-08-02 17:47:13.000000000 +0800 +++ unix/config/ax_boost_thread.m4 2012-08-02 17:48:18.000000000 +0800 @@ -104,14 +104,14 @@ for libextension in `ls $BOOSTLIBDIR/libboost_thread*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.a*$;\1;'`; do ax_lib=${libextension} AC_CHECK_LIB($ax_lib, exit, - [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], + [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], [link_thread="no"]) done if test "x$link_thread" != "xyes"; then for libextension in `ls $BOOSTLIBDIR/boost_thread*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.a*$;\1;'` ; do ax_lib=${libextension} AC_CHECK_LIB($ax_lib, exit, - [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], + [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], [link_thread="no"]) done fi @@ -119,7 +119,7 @@ else for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do AC_CHECK_LIB($ax_lib, exit, - [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], + [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], [link_thread="no"]) done ++++++ povray-3.6.9.6-fix.patch -> povray-3.6.9.7-fix.patch ++++++ ++++++ povray-3.6.9.6-ini.patch -> povray-3.6.9.7-ini.patch ++++++ ++++++ povray-3.7.0.RC6.tar.bz2 -> povray-3.7.0.RC7.tar.bz2 ++++++ /work/SRC/openSUSE:Factory:NonFree/povray/povray-3.7.0.RC6.tar.bz2 /work/SRC/openSUSE:Factory:NonFree/.povray.new/povray-3.7.0.RC7.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
