[LuxRender: 1/3] Fix boost API Change issue

[Jochen Schmitt]

commit a98eff2d658efbd09c234b724c37ba77ba4b7659
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Nov 23 19:51:28 2011 +0100

    Fix boost API Change issue

 LuxRender.spec      |   14 +++++++++++---
 luxrays-boost.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)
---
diff --git a/LuxRender.spec b/LuxRender.spec
index 321bed6..476fe6b 100644
--- a/LuxRender.spec
+++ b/LuxRender.spec
@@ -7,7 +7,7 @@
 
 Name:           LuxRender
 Version:        0.8.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Lux Renderer, an unbiased rendering system
 
 Group:          Applications/Multimedia
@@ -21,6 +21,7 @@ Source3:        luxblend-default.cfg
 Patch0:         lux-45d3e13eb94c-ld.patch
 Patch1:         lux-0.8-shared.patch
 Patch2:         luxrays-e14ba5b1d111-ld.patch
+Patch3:		luxrays-boost.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
@@ -45,7 +46,7 @@ BuildRequires:  wxGTK-devel
 BuildRequires:  libXdamage-devel
 BuildRequires:  libXmu-devel
 
-BuildRequires:	blender-rpm-macros > 2.60a-3
+BuildRequires:	blender-rpm-macros > 2.60a-5
 
 Requires:  %{name}-core = %{version}-%{release}
 
@@ -72,7 +73,7 @@ The %{name}-core package contains core binaries for using %{name}.
 Summary:        Blender export plugin to %{name}
 Group:          Applications/Multimedia
 Requires:       %{name} = %{version}-%{release}
-%blender_requires
+Requires:	%{blender_requires}
 
 %description    blender
 The %{name}-blender package contains the plugin for Blender
@@ -114,6 +115,9 @@ pushd luxrays-%{hash2}
 %patch2 -p1 -b .ld
 popd
 
+# Patch for new boost release
+%patch3 -p1 -b .boost
+
 #Fix eol encoding
 find luxblend25-e7534273b94a/src/luxrender -type f -exec dos2unix {} ';'
 
@@ -221,6 +225,10 @@ install -pm 0644 %{SOURCE3} \
 
 
 %changelog
+* Wed Nov 23 2011 Jochen Schmitt <Jochen herr-schmitt de> - 0.8.0-6
+- Rebuilt to fix boost API change
+- Change user of blender-rpm macros
+
 * Mon Nov 21 2011 Jochen Schmitt <Jochen herr-schmitt de> - 0.8.0-5
 - Fix issue with missing blender addon (#754945)
 
diff --git a/luxrays-boost.patch b/luxrays-boost.patch
new file mode 100644
index 0000000..cdc5bc8
--- /dev/null
+++ b/luxrays-boost.patch
@@ -0,0 +1,30 @@
+diff -up lux-45d3e13eb94c/luxrays-e14ba5b1d111/include/luxrays/utils/core/atomic.h.boost lux-45d3e13eb94c/luxrays-e14ba5b1d111/include/luxrays/utils/core/atomic.h
+--- lux-45d3e13eb94c/luxrays-e14ba5b1d111/include/luxrays/utils/core/atomic.h.boost	2011-11-23 18:29:17.946657332 +0100
++++ lux-45d3e13eb94c/luxrays-e14ba5b1d111/include/luxrays/utils/core/atomic.h	2011-11-23 18:40:45.818445953 +0100
+@@ -43,7 +43,7 @@ inline void AtomicAdd(float *val, const
+ 
+ 		oldVal.f = *val;
+ 		newVal.f = oldVal.f + delta;
+-	} while (boost::interprocess::detail::atomic_cas32(((boost::uint32_t *)val), newVal.i, oldVal.i) != oldVal.i);
++	} while (boost::interprocess::ipcdetail::atomic_cas32(((boost::uint32_t *)val), newVal.i, oldVal.i) != oldVal.i);
+ }
+ 
+ inline void AtomicAdd(unsigned int *val, const unsigned int delta) {
+@@ -55,14 +55,14 @@ inline void AtomicAdd(unsigned int *val,
+          __asm__ __volatile__("pause\n");
+       #endif
+       newVal = *val + delta;
+-   } while (boost::interprocess::detail::atomic_cas32(((boost::uint32_t*)val), newVal, *val) != *val);
++   } while (boost::interprocess::ipcdetail::atomic_cas32(((boost::uint32_t*)val), newVal, *val) != *val);
+ #else
+-	boost::interprocess::detail::atomic_add32(((boost::uint32_t *)val), (boost::uint32_t)delta);
++	boost::interprocess::ipcdetail::atomic_add32(((boost::uint32_t *)val), (boost::uint32_t)delta);
+ #endif
+ }
+ 
+ inline void AtomicInc(unsigned int *val) {
+-	boost::interprocess::detail::atomic_inc32(((boost::uint32_t *)val));
++	boost::interprocess::ipcdetail::atomic_inc32(((boost::uint32_t *)val));
+ }
+ 
+ }