[SCM] supercollider/master: refresh patches

danstowell-guest at users.alioth.debian.org danstowell-guest at users.alioth.debian.org
Sun Feb 24 22:10:13 UTC 2013


The following commit has been merged in the master branch:
commit 26873ce8f4c2967db6760548b9d2a18b58f76523
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Sun Feb 24 21:57:19 2013 +0000

    refresh patches

diff --git a/debian/patches/no-inline-ppc-ftbfs.patch b/debian/patches/no-inline-ppc-ftbfs.patch
index afc527f..dce3c84 100644
--- a/debian/patches/no-inline-ppc-ftbfs.patch
+++ b/debian/patches/no-inline-ppc-ftbfs.patch
@@ -1,10 +1,8 @@
 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	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
+--- a/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp
++++ b/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp
 @@ -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 59e75c6..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	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
+--- 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/supernova-i686-march-flag.patch b/debian/patches/supernova-i686-march-flag.patch
index a692303..cf5b57e 100644
--- a/debian/patches/supernova-i686-march-flag.patch
+++ b/debian/patches/supernova-i686-march-flag.patch
@@ -1,7 +1,5 @@
-Index: supercollider/server/supernova/CMakeLists.txt
-===================================================================
---- supercollider.orig/server/supernova/CMakeLists.txt	2012-12-21 03:44:14.806118662 +0000
-+++ supercollider/server/supernova/CMakeLists.txt	2012-12-21 03:44:37.562118316 +0000
+--- a/server/supernova/CMakeLists.txt
++++ b/server/supernova/CMakeLists.txt
 @@ -12,6 +12,10 @@
      endif()
  endif()

-- 
supercollider packaging



More information about the pkg-multimedia-commits mailing list