[SCM] supercollider/master: Update/refresh patches, remove 4 outdated patches

danstowell-guest at users.alioth.debian.org danstowell-guest at users.alioth.debian.org
Thu Dec 20 20:12:57 UTC 2012 

The following commit has been merged in the master branch:
commit 2217b3a90536186db8e2e7ce7357ae41a6841db5
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Thu Dec 20 19:31:35 2012 +0000

    Update/refresh patches, remove 4 outdated patches

diff --git a/debian/changelog b/debian/changelog
index 5818c1e..2c24daa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 supercollider (1:3.6.1~repack) unstable; urgency=low
 
   * Imported upstream version 3.6.1
+  * Update/refresh patches, remove 4 outdated patches
 
  -- Dan Stowell <danstowell at users.sourceforge.net>  Thu, 20 Dec 2012 19:22:39 +0000
 
diff --git a/debian/patches/arm-qreal-is-float.patch b/debian/patches/arm-qreal-is-float.patch
deleted file mode 100644
index 5ada7a5..0000000
--- a/debian/patches/arm-qreal-is-float.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Date: Mon, 9 Jul 2012 18:57:51 -0400
-Subject: [PATCH] QcMultiSlider::valueRect takes in a qreal, not a double
-
-Usually qreal is double (which is why it works), but on ARM systems qreal
-is float instead.
-This causes sc to fail to build on ARM systems.
----
- QtCollider/widgets/QcMultiSlider.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/QtCollider/widgets/QcMultiSlider.cpp
-+++ b/QtCollider/widgets/QcMultiSlider.cpp
-@@ -182,7 +182,7 @@
-   if( !c ) return;
- 
-   bool horiz = ort == Qt::Horizontal;
--  double spacing;
-+  qreal spacing;
- 
-   QRect r( valueRect( c - startIndex, spacing ) );
- 
diff --git a/debian/patches/boostatomic_ppc_build.patch b/debian/patches/boostatomic_ppc_build.patch
deleted file mode 100644
index 4e611b8..0000000
--- a/debian/patches/boostatomic_ppc_build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Boost-atomic build fix for PPC
-Author: Dan Stowell
---- a/external_libraries/boost_lockfree/boost/atomic/detail/gcc-ppc.hpp
-+++ b/external_libraries/boost_lockfree/boost/atomic/detail/gcc-ppc.hpp
-@@ -252,7 +252,6 @@
- 			);
- 		if (success) fence_after(success_order);
- 		else fence_after(failure_order);
--		fence_after(order);
- 		return success;
- 	}
- 
diff --git a/debian/patches/deactivate_perf_counter.patch b/debian/patches/deactivate_perf_counter.patch
deleted file mode 100644
index 50e2761..0000000
--- a/debian/patches/deactivate_perf_counter.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Avoid invoking perf_counter.hpp - doesn't build on ia64, and unneeded for building supercollider
-Author: Dan Stowell
---- a/external_libraries/nova-simd/benchmarks/CMakeLists.txt
-+++ b/external_libraries/nova-simd/benchmarks/CMakeLists.txt
-@@ -19,6 +19,8 @@
-    simd_unroll_benchmarks.cpp
-  )
- 
-+add_definitions(-DNO_PERFORMANCE_COUNTERS)   # perf_counter.hpp functionality not needed unless profiling, and doesn't work for all platforms
-+
- # build benchmarks
- foreach(benchmark ${benchmarks})
-   string(REPLACE .cpp "" benchmark_name ${benchmark} )
diff --git a/debian/patches/no-inline-ppc-ftbfs.patch b/debian/patches/no-inline-ppc-ftbfs.patch
index 99e0675..dce3c84 100644
--- a/debian/patches/no-inline-ppc-ftbfs.patch
+++ b/debian/patches/no-inline-ppc-ftbfs.patch
@@ -1,14 +1,14 @@
 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
-@@ -124,7 +124,7 @@
- 		T &expected,
- 		T desired,
- 		memory_order success_order,
--		memory_order failure_order) volatile
-+		memory_order failure_order) volatile __attribute__((noinline))
- 	{
- 		fence_before(success_order);
- 		int success;
+--- 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,
+         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 aa80dea..6943ebd 100644
--- a/debian/patches/perf-counter-include.patch
+++ b/debian/patches/perf-counter-include.patch
@@ -2,9 +2,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
-@@ -49,6 +49,11 @@
- #include <linux/ioctl.h>
- #include <asm/byteorder.h>
+@@ -54,6 +54,11 @@
+ #endif
+ 
  
 +#if defined(__ia64__) || defined(__alpha__)
 +#include <asm-generic/unistd.h>
diff --git a/debian/patches/series b/debian/patches/series
index 5e333d6..2f7e98b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,2 @@
-update_boostlockfree_prefixhpp.patch
-arm-qreal-is-float.patch
-deactivate_perf_counter.patch
-boostatomic_ppc_build.patch
 no-inline-ppc-ftbfs.patch
 perf-counter-include.patch
diff --git a/debian/patches/update_boostlockfree_prefixhpp.patch b/debian/patches/update_boostlockfree_prefixhpp.patch
deleted file mode 100644
index 34b197e..0000000
--- a/debian/patches/update_boostlockfree_prefixhpp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Define alignment macros as empty when they have not been defined
-Author: Tim Blechmann
-Applied-Upstream: commit:79216
---- a/external_libraries/boost_lockfree/boost/lockfree/detail/prefix.hpp
-+++ b/external_libraries/boost_lockfree/boost/lockfree/detail/prefix.hpp
-@@ -4,8 +4,6 @@
- //  accompanying file LICENSE_1_0.txt or copy at
- //  http://www.boost.org/LICENSE_1_0.txt)
- 
--//  Disclaimer: Not a Boost library.
--
- #ifndef BOOST_LOCKFREE_PREFIX_HPP_INCLUDED
- #define BOOST_LOCKFREE_PREFIX_HPP_INCLUDED
- 
-@@ -47,4 +45,12 @@
- #endif
- #endif /* __GNUC__ */
- 
-+#ifndef BOOST_LOCKFREE_DCAS_ALIGNMENT
-+#define BOOST_LOCKFREE_DCAS_ALIGNMENT /*BOOST_LOCKFREE_DCAS_ALIGNMENT*/
-+#endif
-+
-+#ifndef BOOST_LOCKFREE_CACHELINE_ALIGNMENT
-+#define BOOST_LOCKFREE_CACHELINE_ALIGNMENT /*BOOST_LOCKFREE_CACHELINE_ALIGNMENT*/
-+#endif
-+
- #endif /* BOOST_LOCKFREE_PREFIX_HPP_INCLUDED */

-- 
supercollider packaging

More information about the pkg-multimedia-commits mailing list