[SCM] supercollider/master: Refresh patches, and drop outdated ones

danstowell-guest at users.alioth.debian.org danstowell-guest at users.alioth.debian.org
Sun Mar 13 22:03:55 UTC 2016 

The following commit has been merged in the master branch:
commit 69d17deb8e22bd5d414e68f9bbff6b21057f4c71
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Sun Mar 13 21:36:42 2016 +0000

    Refresh patches, and drop outdated ones

diff --git a/debian/patches/ftbfs-gcc-4.9.patch b/debian/patches/ftbfs-gcc-4.9.patch
deleted file mode 100644
index 1b124f7..0000000
--- a/debian/patches/ftbfs-gcc-4.9.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Date: Fri, 6 Jun 2014 13:15:18 -0400
-Subject: Fix implementation of aligned_allocator::construct<U>.
-
-Fixes a build failure with gcc >= 4.9, because it defines __cplusplus >= 201103L.
-
-A typo, apparently. This patch can be dropped in the next upstream release.
-Index: supercollider/server/supernova/utilities/malloc_aligned.hpp
-===================================================================
---- supercollider.orig/server/supernova/utilities/malloc_aligned.hpp	2014-09-11 09:15:20.399357542 +0100
-+++ supercollider/server/supernova/utilities/malloc_aligned.hpp	2014-09-11 09:15:20.399357542 +0100
-@@ -243,7 +243,7 @@
-     template< class U, class... Args >
-     void construct(U * p, Args&& ... args)
-     {
--        ::new(p) T(std::forward<Args>(args)...);
-+        ::new(p) U(std::forward<Args>(args)...);
-     }
- #endif
- 
diff --git a/debian/patches/gcc5-compile-fix.patch b/debian/patches/gcc5-compile-fix.patch
index 568282b..553cc81 100644
--- a/debian/patches/gcc5-compile-fix.patch
+++ b/debian/patches/gcc5-compile-fix.patch
@@ -9,9 +9,9 @@ Subject: [PATCH] supernova: gcc-5 compile fix
 
 --- a/server/supernova/CMakeLists.txt
 +++ b/server/supernova/CMakeLists.txt
-@@ -167,6 +167,10 @@ endif()
- 
- target_link_libraries(supernova libsupernova)
+@@ -167,6 +167,10 @@
+     endif()
+ endif()
  
 +if( ${_gcc_version} VERSION_GREATER 5 )
 +  target_link_libraries( libsupernova atomic )
diff --git a/debian/patches/no-inline-ppc-ftbfs.patch b/debian/patches/no-inline-ppc-ftbfs.patch
deleted file mode 100644
index b4cec9e..0000000
--- a/debian/patches/no-inline-ppc-ftbfs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Felipe Sateler <fsateler at debian.org>
-Description: Apparently there is some bug in gcc that makes it output too large sections
-Avoiding inlining this function works around the issue
-Index: supercollider/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp
-===================================================================
---- supercollider.orig/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp	2014-09-11 09:15:20.311357545 +0100
-+++ supercollider/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp	2014-09-11 09:15:20.295357546 +0100
-@@ -247,7 +247,7 @@
-         value_type & expected,
-         value_type desired,
-         memory_order success_order,
--        memory_order failure_order) volatile
-+        memory_order failure_order) volatile __attribute__((noinline))
-     {
-         int success;
-         ppc_fence_before(success_order);
diff --git a/debian/patches/perf-counter-include.patch b/debian/patches/perf-counter-include.patch
index 090e385..6943ebd 100644
--- a/debian/patches/perf-counter-include.patch
+++ b/debian/patches/perf-counter-include.patch
@@ -1,9 +1,7 @@
 Author: Dan Stowell <danstowell at users.sourceforge.net>
 Description: ia64 and alpha include perf bits in other files
-Index: supercollider/external_libraries/nova-simd/benchmarks/perf_counter.hpp
-===================================================================
---- supercollider.orig/external_libraries/nova-simd/benchmarks/perf_counter.hpp	2014-09-11 09:15:20.367357543 +0100
-+++ supercollider/external_libraries/nova-simd/benchmarks/perf_counter.hpp	2014-09-11 09:15:20.367357543 +0100
+--- a/external_libraries/nova-simd/benchmarks/perf_counter.hpp
++++ b/external_libraries/nova-simd/benchmarks/perf_counter.hpp
 @@ -54,6 +54,11 @@
  #endif
  
diff --git a/debian/patches/series b/debian/patches/series
index 948967e..c694501 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-no-inline-ppc-ftbfs.patch
 perf-counter-include.patch
 supernova-i686-march-flag.patch
-system-lockfree.patch
-ftbfs-gcc-4.9.patch
 gcc5-compile-fix.patch
diff --git a/debian/patches/supernova-i686-march-flag.patch b/debian/patches/supernova-i686-march-flag.patch
index 15d544b..e6af2a0 100644
--- a/debian/patches/supernova-i686-march-flag.patch
+++ b/debian/patches/supernova-i686-march-flag.patch
@@ -1,9 +1,7 @@
-Index: supercollider/server/supernova/CMakeLists.txt
-===================================================================
---- supercollider.orig/server/supernova/CMakeLists.txt	2014-09-11 09:15:20.379357543 +0100
-+++ supercollider/server/supernova/CMakeLists.txt	2014-09-11 09:15:30.000000000 +0100
-@@ -12,6 +12,10 @@
-     endif()
+--- a/server/supernova/CMakeLists.txt
++++ b/server/supernova/CMakeLists.txt
+@@ -157,6 +157,10 @@
+     target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options boost_thread)
  endif()
  
 +if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686")
@@ -11,5 +9,5 @@ Index: supercollider/server/supernova/CMakeLists.txt
 +endif()
 +
  if(CMAKE_COMPILER_IS_GNUCXX)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-4096")
-   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer")
+     if( ${_gcc_version} VERSION_GREATER 5 )
+       target_link_libraries( libsupernova atomic )
diff --git a/debian/patches/system-lockfree.patch b/debian/patches/system-lockfree.patch
deleted file mode 100644
index d743df9..0000000
--- a/debian/patches/system-lockfree.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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
-
-Index: supercollider/CMakeLists.txt
-===================================================================
---- supercollider.orig/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-+++ supercollider/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-@@ -235,7 +235,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)
-Index: supercollider/lang/CMakeLists.txt
-===================================================================
---- supercollider.orig/lang/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-+++ supercollider/lang/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-@@ -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)
-@@ -217,7 +216,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)
-Index: supercollider/server/CMakeLists.txt
-===================================================================
---- supercollider.orig/server/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-+++ supercollider/server/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-@@ -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
- 					)
-Index: supercollider/server/supernova/CMakeLists.txt
-===================================================================
---- supercollider.orig/server/supernova/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-+++ supercollider/server/supernova/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-@@ -160,7 +160,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()
-Index: supercollider/testsuite/supernova/CMakeLists.txt
-===================================================================
---- supercollider.orig/testsuite/supernova/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-+++ supercollider/testsuite/supernova/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-@@ -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
-Index: supercollider/server/scsynth/CMakeLists.txt
-===================================================================
---- supercollider.orig/server/scsynth/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-+++ supercollider/server/scsynth/CMakeLists.txt	2014-09-11 09:15:20.387357543 +0100
-@@ -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

More information about the pkg-multimedia-commits mailing list