Hello community, here is the log from the commit of package povray for openSUSE:Factory:NonFree checked in at 2012-09-14 12:34:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/povray (Old) and /work/SRC/openSUSE:Factory:NonFree/.povray.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "povray", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/povray/povray.changes 2012-06-26 17:21:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.povray.new/povray.changes 2012-09-14 12:34:02.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 5 13:44:45 UTC 2012 - [email protected] + +- updated to 3.7.RC6 (builds against libpng15) + * removed wronglibdetect.patch + * removed libpng14.patch + * added TIME_UTC_.patch + * buildrequire boost-devel + +------------------------------------------------------------------- Old: ---- povray-3.6.1-fix.patch povray-3.6.1-ini.patch povray-3.6.1-libpng14.patch povray-3.6.1-maxlib.patch povray-3.6.1-wronglibdetect.patch povray-3.6.tar.bz2 New: ---- 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ povray.spec ++++++ --- /var/tmp/diff_new_pack.a31O8d/_old 2012-09-14 12:34:04.000000000 +0200 +++ /var/tmp/diff_new_pack.a31O8d/_new 2012-09-14 12:34:04.000000000 +0200 @@ -19,6 +19,7 @@ Name: povray BuildRequires: automake +BuildRequires: boost-devel BuildRequires: gcc-c++ BuildRequires: libpng-devel BuildRequires: libtiff-devel @@ -28,16 +29,15 @@ BuildRequires: zlib-devel License: SUSE-NonFree Group: Productivity/Graphics/Visualization/Raytracers -Version: 3.6.1 +Version: 3.6.9.6 Release: 0 Summary: Ray Tracer Url: http://www.povray.org -Source: povray-3.6.tar.bz2 +Source: povray-3.7.0.RC6.tar.bz2 Patch1: povray-%{version}-ini.patch -Patch2: povray-%{version}-maxlib.patch -Patch3: povray-%{version}-fix.patch -Patch4: povray-%{version}-wronglibdetect.patch -Patch5: povray-%{version}-libpng14.patch +Patch2: povray-%{version}-fix.patch +# boost changed TIME_UTC -> TIME_UTC_ +Patch3: povray-%{version}-TIME_UTC_.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,12 +71,13 @@ Chris Young <[email protected]> %prep -%setup -q +%setup -q -n povray-3.7.0.RC6 %patch1 %patch2 -%patch3 -%patch4 -%patch5 -p1 +# boost changed TIME_UTC -> TIME_UTC_ +%if 0%{suse_version} > 1220 +%patch3 -p1 +%endif rm -rf libraries %build @@ -87,7 +88,7 @@ %endif CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-multichar" CFLAGS="$CXXFLAGS"\ %configure COMPILED_BY="SUSE LINUX Products GmbH, Nuernberg, Germany" \ - --disable-optimiz + --disable-optimiz --with-boost-thread=boost_thread-mt make %{?jobs:-j %jobs} perl -pi -e 's,^DEFAULT_DIR=.*,DEFAULT_DIR=/usr,' scripts/* perl -pi -e 's,^SYSCONFDIR=.*,SYSCONFDIR=/etc,' scripts/* @@ -106,7 +107,7 @@ %defattr(-,root,root) %config /etc/* /usr/bin/povray -/usr/share/povray-3.6 +/usr/share/povray-3.7 %{_mandir}/man*/* %doc %{_defaultdocdir}/%{name} ++++++ povray-3.6.9.6-TIME_UTC_.patch ++++++ 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 @@ -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, 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/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.1-fix.patch -> povray-3.6.9.6-fix.patch ++++++ --- /work/SRC/openSUSE:Factory:NonFree/povray/povray-3.6.1-fix.patch 2012-06-25 10:21:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.povray.new/povray-3.6.9.6-fix.patch 2012-09-14 12:34:02.000000000 +0200 @@ -1,23 +1,14 @@ ---- source/lighting.cpp -+++ source/lighting.cpp -@@ -4944,6 +4944,9 @@ - photonOptions.passThruPrev = true; - } - /* else die */ -+ doReflection = 0; -+ doRefraction = 0; -+ doDiffuse = 0; - } - else - { ---- source/renderio.cpp -+++ source/renderio.cpp -@@ -402,7 +402,7 @@ - } - - strncpy (Actual_Output_Name,opts.Output_Path, sizeof (Actual_Output_Name)); -- strncat (Actual_Output_Name,opts.Output_Numbered_Name, sizeof (Actual_Output_Name)); -+ strncat (Actual_Output_Name,opts.Output_Numbered_Name, sizeof (Actual_Output_Name)-strlen(Actual_Output_Name)-1); - /* - Debug_Info("P='%s',O='%s',A='%s',N='%s'\n",opts.Output_Path, - opts.Output_Numbered_Name, Actual_Output_Name,opts.Output_Numbered_Name); +Index: source/backend/lighting/photons.cpp +=================================================================== +--- source/backend/lighting/photons.cpp.orig ++++ source/backend/lighting/photons.cpp +@@ -604,6 +604,9 @@ void PhotonTrace::ComputeLightedTexture( + threadData->passThruPrev = true; + } + // else die ++ doReflection = 0; ++ doRefraction = 0; ++ doDiffuse = 0; + } + else + { ++++++ povray-3.6.1-ini.patch -> povray-3.6.9.6-ini.patch ++++++ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
