]> git.pld-linux.org Git - packages/povray.git/blame - boost-1.50.patch
projects / packages / povray.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
More TIME_UTC renames
[packages/povray.git] / boost-1.50.patch
CommitLineData
08ddefcf
JR		 1--- povray-3.7.0.RC6/unix/config/ax_boost_thread.m4~ 2012-02-05 21:54:21.000000000 +0100
2+++ povray-3.7.0.RC6/unix/config/ax_boost_thread.m4 2012-07-11 11:55:14.040194944 +0200
3@@ -104,23 +104,26 @@
4 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
5 ax_lib=${libextension}
6 AC_CHECK_LIB($ax_lib, exit,
7- [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
8- [link_thread="no"])
9+ [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
10+ [link_thread="no"],
11+ [-lboost_system])
12 done
13 if test "x$link_thread" != "xyes"; then
14 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
15 ax_lib=${libextension}
16 AC_CHECK_LIB($ax_lib, exit,
17- [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
18- [link_thread="no"])
19+ [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
20+ [link_thread="no"],
21+ [-lboost_system])
22 done
23 fi
24
25 else
26 for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do
27 AC_CHECK_LIB($ax_lib, exit,
28- [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
29- [link_thread="no"])
30+ [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
31+ [link_thread="no"],
32+ [-lboost_system])
33 done
34
35 fi
ff0acd0c
JR		 36diff -ur povray-3.7.0.RC6.orig/source/backend/scene/view.cpp povray-3.7.0.RC6/source/backend/scene/view.cpp
37--- povray-3.7.0.RC6.orig/source/backend/scene/view.cpp 2012-07-11 12:26:19.627968703 +0200
38+++ povray-3.7.0.RC6/source/backend/scene/view.cpp 2012-07-11 12:31:21.111291400 +0200
39e31789
JR		 39@@ -1550,7 +1550,7 @@
40 }
41
42 boost::xtime t;
43- boost::xtime_get (&t, boost::TIME_UTC);
44+ boost::xtime_get (&t, boost::TIME_UTC_);
45 t.sec += 3;
46
47 // this will cause us to wait until the other threads are done.
ff0acd0c
JR		 48diff -ur povray-3.7.0.RC6.orig/source/base/timer.cpp povray-3.7.0.RC6/source/base/timer.cpp
49--- povray-3.7.0.RC6.orig/source/base/timer.cpp 2012-02-05 21:54:15.000000000 +0100
50+++ povray-3.7.0.RC6/source/base/timer.cpp 2012-07-11 12:31:21.107958067 +0200
51@@ -117,7 +117,7 @@
52 POV_LONG TimerDefault::ElapsedRealTime() const
53 {
54 boost::xtime t;
55- boost::xtime_get(&t, boost::TIME_UTC);
56+ boost::xtime_get(&t, boost::TIME_UTC_);
57 POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);
58 POV_LONG st = (POV_LONG)(realTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(realTimeStart.nsec);
59 return ((tt - st) / (POV_LONG)(1000000));
60@@ -126,7 +126,7 @@
61 POV_LONG TimerDefault::ElapsedCPUTime() const
62 {
63 boost::xtime t;
64- boost::xtime_get(&t, boost::TIME_UTC);
65+ boost::xtime_get(&t, boost::TIME_UTC_);
66 POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);
67 POV_LONG st = (POV_LONG)(cpuTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(cpuTimeStart.nsec);
68 return ((tt - st) / (POV_LONG)(1000000));
69@@ -139,8 +139,8 @@
70
71 void TimerDefault::Reset()
72 {
73- boost::xtime_get(&realTimeStart, boost::TIME_UTC);
74- boost::xtime_get(&cpuTimeStart, boost::TIME_UTC);
75+ boost::xtime_get(&realTimeStart, boost::TIME_UTC_);
76+ boost::xtime_get(&cpuTimeStart, boost::TIME_UTC_);
77 }
78
79 }
80@@ -155,7 +155,7 @@
81 void Delay(unsigned int msec)
82 {
83 boost::xtime t;
84- boost::xtime_get(&t, boost::TIME_UTC);
85+ boost::xtime_get(&t, boost::TIME_UTC_);
86 POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
87 t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
88 t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));
89diff -ur povray-3.7.0.RC6.orig/vfe/unix/platformbase.cpp povray-3.7.0.RC6/vfe/unix/platformbase.cpp
90--- povray-3.7.0.RC6.orig/vfe/unix/platformbase.cpp 2012-06-19 18:29:38.000000000 +0200
91+++ povray-3.7.0.RC6/vfe/unix/platformbase.cpp 2012-07-11 12:31:21.114624733 +0200
92@@ -126,7 +126,7 @@
93 #else
94 // taken from source/base/timer.cpp
95 boost::xtime t;
96- boost::xtime_get(&t, boost::TIME_UTC);
97+ boost::xtime_get(&t, boost::TIME_UTC_);
98 POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
99 t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
100 t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));
101diff -ur povray-3.7.0.RC6.orig/vfe/vfepovms.cpp povray-3.7.0.RC6/vfe/vfepovms.cpp
102--- povray-3.7.0.RC6.orig/vfe/vfepovms.cpp 2012-06-19 18:29:40.000000000 +0200
103+++ povray-3.7.0.RC6/vfe/vfepovms.cpp 2012-07-11 12:31:21.114624733 +0200
104@@ -247,7 +247,7 @@
105
106 // TODO: have a shorter wait but loop, and check for system shutdown
107 boost::xtime t;
108- boost::xtime_get (&t, boost::TIME_UTC);
109+ boost::xtime_get (&t, boost::TIME_UTC_);
110 t.nsec += 50000000 ;
111 m_Event.timed_wait (lock, t);
112
113diff -ur povray-3.7.0.RC6.orig/vfe/vfesession.cpp povray-3.7.0.RC6/vfe/vfesession.cpp
114--- povray-3.7.0.RC6.orig/vfe/vfesession.cpp 2012-06-19 18:29:40.000000000 +0200
115+++ povray-3.7.0.RC6/vfe/vfesession.cpp 2012-07-11 12:31:21.114624733 +0200
116@@ -967,7 +967,7 @@
117 if (WaitTime > 0)
118 {
119 boost::xtime t;
120- boost::xtime_get (&t, boost::TIME_UTC);
121+ boost::xtime_get (&t, boost::TIME_UTC_);
122 t.sec += WaitTime / 1000 ;
123 t.nsec += (WaitTime % 1000) * 1000000 ;
124 m_SessionEvent.timed_wait (lock, t);
125@@ -1034,7 +1034,7 @@
126 // we can't call pause directly since it will result in a thread context
127 // error. pause must be called from the context of the worker thread.
128 boost::xtime t;
129- boost::xtime_get (&t, boost::TIME_UTC);
130+ boost::xtime_get (&t, boost::TIME_UTC_);
131 t.sec += 3 ;
132 m_RequestFlag = rqPauseRequest;
133 if (m_RequestEvent.timed_wait(lock, t) == false)
134@@ -1057,7 +1057,7 @@
135 // we can't call resume directly since it will result in a thread context
136 // error. it must be called from the context of the worker thread.
137 boost::xtime t;
138- boost::xtime_get (&t, boost::TIME_UTC);
139+ boost::xtime_get (&t, boost::TIME_UTC_);
140 t.sec += 3 ;
141 m_RequestFlag = rqResumeRequest;
142 if (m_RequestEvent.timed_wait(lock, t) == false)
143@@ -1123,7 +1123,7 @@
144 m_LastError = vfeNoError;
145
146 boost::xtime t;
147- boost::xtime_get (&t, boost::TIME_UTC);
148+ boost::xtime_get (&t, boost::TIME_UTC_);
149 t.sec += 3 ;
150 #ifdef _DEBUG
151 t.sec += 120;
Persistence of Vision Ray Tracer
This page took 0.066881 seconds and 4 git commands to generate.