[SCM] supercollider/master: Add patch to use system lockfree

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c646e78915272888b232d306ad7342397a86ba90
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Sep 10 18:24:49 2013 -0300

    Add patch to use system lockfree

diff --git a/debian/patches/series b/debian/patches/series
index f5ed3fa..87e37f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ no-inline-ppc-ftbfs.patch
 perf-counter-include.patch
 supernova-i686-march-flag.patch
 two-extra-dev-headers.patch
+system-lockfree.patch
diff --git a/debian/patches/system-lockfree.patch b/debian/patches/system-lockfree.patch
new file mode 100644
index 0000000..6df7a4a
--- /dev/null
+++ b/debian/patches/system-lockfree.patch
@@ -0,0 +1,76 @@
+Author: Felipe Sateler <fsateler at debian.org>
+Description: Boost 1.5* includes the lockfree lib, so use the system one
+Lockfree requires the atomic library in some archs, so include it in the supernova target
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,7 +225,7 @@
+ 
+ if(SYSTEM_BOOST)
+   set(Boost_USE_MULTITHREADED      ON)
+-  find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor )
++  find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor atomic)
+ endif()
+ 
+ if (Boost_FOUND)
+--- a/lang/CMakeLists.txt
++++ b/lang/CMakeLists.txt
+@@ -6,7 +6,6 @@
+ 
+                     ${YAMLCPP_INCLUDE_DIR}
+ 
+-                    ${CMAKE_SOURCE_DIR}/external_libraries/boost-lockfree
+                     ${CMAKE_SOURCE_DIR}/external_libraries/threadpool
+                     ${CMAKE_SOURCE_DIR}/external_libraries/TLSF-2.4.6/src
+                     LangSource/Bison)
+@@ -207,7 +206,7 @@
+ endif()
+ 
+ if (Boost_FOUND)
+-	target_link_libraries(libsclang ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
++    target_link_libraries(libsclang ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_ATOMIC_LIBRARY})
+ endif()
+ 
+ if (SCLANG_SERVER)
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -4,7 +4,6 @@
+ endif()
+ 
+ include_directories(${CMAKE_SOURCE_DIR}/external_libraries
+-					${CMAKE_SOURCE_DIR}/external_libraries/boost-lockfree
+ 					${CMAKE_SOURCE_DIR}/external_libraries/nova-simd
+ 					${CMAKE_SOURCE_DIR}/external_libraries/nova-tt
+ 					)
+--- a/server/supernova/CMakeLists.txt
++++ b/server/supernova/CMakeLists.txt
+@@ -159,7 +159,7 @@
+ target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES})
+ 
+ if (Boost_FOUND)
+-    target_link_libraries(libsupernova   ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
++    target_link_libraries(libsupernova   ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_ATOMIC_LIBRARY})
+ else()
+     target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options)
+ endif()
+--- a/testsuite/supernova/CMakeLists.txt
++++ b/testsuite/supernova/CMakeLists.txt
+@@ -45,7 +45,6 @@
+                     ${CMAKE_SOURCE_DIR}/server/supernova
+                     ${CMAKE_SOURCE_DIR}/external_libraries/boost
+                     ${CMAKE_SOURCE_DIR}/external_libraries/boost_endian
+-                    ${CMAKE_SOURCE_DIR}/external_libraries/boost-lockfree
+                     ${CMAKE_SOURCE_DIR}/external_libraries/oscpack
+                     ${CMAKE_SOURCE_DIR}/external_libraries/
+                     ${CMAKE_SOURCE_DIR}/external_libraries/nova-tt
+--- a/server/scsynth/CMakeLists.txt
++++ b/server/scsynth/CMakeLists.txt
+@@ -207,7 +207,7 @@
+ endif()
+ 
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+-	target_link_libraries(libscsynth rt)
++    target_link_libraries(libscsynth rt ${Boost_THREAD_LIBRARY})
+ endif()
+ 
+ file(GLOB_RECURSE all_headers ../../*hpp)

-- 
supercollider packaging