[SCM] supercollider/master: Refresh patches

danstowell-guest at users.alioth.debian.org danstowell-guest at users.alioth.debian.org
Thu Dec 27 14:06:49 UTC 2012


The following commit has been merged in the master branch:
commit 3014597e7a6cefe03b0838560a847f4c88c309d0
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Fri Dec 21 17:41:01 2012 +0000

    Refresh patches

diff --git a/debian/patches/no-inline-ppc-ftbfs.patch b/debian/patches/no-inline-ppc-ftbfs.patch
index dce3c84..afc527f 100644
--- a/debian/patches/no-inline-ppc-ftbfs.patch
+++ b/debian/patches/no-inline-ppc-ftbfs.patch
@@ -1,8 +1,10 @@
 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
---- a/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp
-+++ b/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp
+Index: supercollider/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp
+===================================================================
+--- supercollider.orig/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp	2012-12-21 03:40:53.858121916 +0000
++++ supercollider/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp	2012-12-21 03:44:37.426118318 +0000
 @@ -247,7 +247,7 @@
          value_type & expected,
          value_type desired,
diff --git a/debian/patches/perf-counter-include.patch b/debian/patches/perf-counter-include.patch
index 6943ebd..59e75c6 100644
--- a/debian/patches/perf-counter-include.patch
+++ b/debian/patches/perf-counter-include.patch
@@ -1,7 +1,9 @@
 Author: Dan Stowell <danstowell at users.sourceforge.net>
 Description: ia64 and alpha include perf bits in other files
---- a/external_libraries/nova-simd/benchmarks/perf_counter.hpp
-+++ b/external_libraries/nova-simd/benchmarks/perf_counter.hpp
+Index: supercollider/external_libraries/nova-simd/benchmarks/perf_counter.hpp
+===================================================================
+--- supercollider.orig/external_libraries/nova-simd/benchmarks/perf_counter.hpp	2012-12-21 03:40:50.386121971 +0000
++++ supercollider/external_libraries/nova-simd/benchmarks/perf_counter.hpp	2012-12-21 03:44:37.494118317 +0000
 @@ -54,6 +54,11 @@
  #endif
  

-- 
supercollider packaging



More information about the pkg-multimedia-commits mailing list