[SCM] supercollider/master: Remove more patches applied upstream

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Thu Sep 28 22:15:04 UTC 2017


The following commit has been merged in the master branch:
commit 2e0bdc3f0a2587dd602f4f97d20602effb8a7084
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Sep 26 22:54:38 2017 -0300

    Remove more patches applied upstream

diff --git a/debian/patches/gcc5-compile-fix.patch b/debian/patches/gcc5-compile-fix.patch
deleted file mode 100644
index fb21b43..0000000
--- a/debian/patches/gcc5-compile-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Tim Blechmann <tim at klingt.org>
-Date: Sun, 6 Sep 2015 10:12:46 +0200
-Subject: supernova: gcc-5 compile fix
-
----
- server/supernova/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: supercollider/server/supernova/CMakeLists.txt
-===================================================================
---- supercollider.orig/server/supernova/CMakeLists.txt
-+++ supercollider/server/supernova/CMakeLists.txt
-@@ -159,6 +159,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-     endif()
- endif()
- 
-+if( ${_gcc_version} VERSION_GREATER 5 )
-+  target_link_libraries( libsupernova atomic )
-+endif()
-+
- if(WIN32)
-     target_link_libraries(libsupernova wsock32 ws2_32 winmm)
- endif()
diff --git a/debian/patches/perf-counter-include.patch b/debian/patches/perf-counter-include.patch
deleted file mode 100644
index ff416e7..0000000
--- a/debian/patches/perf-counter-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Dan Stowell <danstowell at users.sourceforge.net>
-Date: Wed, 16 Nov 2016 18:33:12 -0300
-Subject: Avoid FTBFS in ia64
-
-ia64 and alpha include perf bits in other files
-Upstreamed, patch can be removed from 3.7.1+
-
-Forwarded: yes
----
- external_libraries/nova-simd/benchmarks/perf_counter.hpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-Index: supercollider/external_libraries/nova-simd/benchmarks/perf_counter.hpp
-===================================================================
---- supercollider.orig/external_libraries/nova-simd/benchmarks/perf_counter.hpp
-+++ supercollider/external_libraries/nova-simd/benchmarks/perf_counter.hpp
-@@ -54,6 +54,11 @@
- #endif
- 
- 
-+#if defined(__ia64__) || defined(__alpha__)
-+#include <asm-generic/unistd.h>
-+#endif
-+
-+
- /*
-  * User-space ABI bits:
-  */
diff --git a/debian/patches/series b/debian/patches/series
index a19e9db..b928816 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-perf-counter-include.patch
 supernova-i686-march-flag.patch
-gcc5-compile-fix.patch
 Disable-128bit-float-constants.patch
 adding-functional-header-in-PyrSerialPrim.cpp.patch
 DiskIO_UGens-include-functional.patch

-- 
supercollider packaging



More information about the pkg-multimedia-commits mailing list