[SCM] supercollider/master: Refresh patches
danstowell-guest at users.alioth.debian.org
danstowell-guest at users.alioth.debian.org
Thu Sep 28 11:49:49 UTC 2017
The following commit has been merged in the master branch:
commit fe326510ed9bf2b70ac87c43dd8a8466bfda25d9
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date: Mon Sep 25 20:20:39 2017 +0100
Refresh patches
diff --git a/debian/patches/Disable-128bit-float-constants.patch b/debian/patches/Disable-128bit-float-constants.patch
index 11a85ab..4a679ca 100644
--- a/debian/patches/Disable-128bit-float-constants.patch
+++ b/debian/patches/Disable-128bit-float-constants.patch
@@ -8,10 +8,10 @@ but are not used, so just skip that
lang/LangPrimSource/PyrMathPrim.cpp | 1 +
1 file changed, 1 insertion(+)
-diff --git a/lang/LangPrimSource/PyrMathPrim.cpp b/lang/LangPrimSource/PyrMathPrim.cpp
-index 16ca148..8a3b15a 100644
---- a/lang/LangPrimSource/PyrMathPrim.cpp
-+++ b/lang/LangPrimSource/PyrMathPrim.cpp
+Index: supercollider/lang/LangPrimSource/PyrMathPrim.cpp
+===================================================================
+--- supercollider.orig/lang/LangPrimSource/PyrMathPrim.cpp
++++ supercollider/lang/LangPrimSource/PyrMathPrim.cpp
@@ -34,6 +34,7 @@
#include "SC_Endian.h"
#include "SCBase.h"
diff --git a/debian/patches/DiskIO_UGens-include-functional.patch b/debian/patches/DiskIO_UGens-include-functional.patch
index e3f578c..411e81b 100644
--- a/debian/patches/DiskIO_UGens-include-functional.patch
+++ b/debian/patches/DiskIO_UGens-include-functional.patch
@@ -8,10 +8,10 @@ gcc7.1 enforces this.
server/plugins/DiskIO_UGens.cpp | 1 +
1 file changed, 1 insertion(+)
-diff --git a/server/plugins/DiskIO_UGens.cpp b/server/plugins/DiskIO_UGens.cpp
-index b695b70..a6a8764 100644
---- a/server/plugins/DiskIO_UGens.cpp
-+++ b/server/plugins/DiskIO_UGens.cpp
+Index: supercollider/server/plugins/DiskIO_UGens.cpp
+===================================================================
+--- supercollider.orig/server/plugins/DiskIO_UGens.cpp
++++ supercollider/server/plugins/DiskIO_UGens.cpp
@@ -28,6 +28,7 @@
#include <atomic>
diff --git a/debian/patches/PyrSched.cpp-include-functional-to-fix-FTBFS.patch b/debian/patches/PyrSched.cpp-include-functional-to-fix-FTBFS.patch
index 93f33ab..cc939ca 100644
--- a/debian/patches/PyrSched.cpp-include-functional-to-fix-FTBFS.patch
+++ b/debian/patches/PyrSched.cpp-include-functional-to-fix-FTBFS.patch
@@ -7,10 +7,10 @@ Bug-Debian: https://bugs.debian.org/853671
lang/LangPrimSource/PyrSched.cpp | 1 +
1 file changed, 1 insertion(+)
-diff --git a/lang/LangPrimSource/PyrSched.cpp b/lang/LangPrimSource/PyrSched.cpp
-index 7d33518..2f5908e 100644
---- a/lang/LangPrimSource/PyrSched.cpp
-+++ b/lang/LangPrimSource/PyrSched.cpp
+Index: supercollider/lang/LangPrimSource/PyrSched.cpp
+===================================================================
+--- supercollider.orig/lang/LangPrimSource/PyrSched.cpp
++++ supercollider/lang/LangPrimSource/PyrSched.cpp
@@ -37,6 +37,7 @@
#include <string.h>
#include <math.h>
diff --git a/debian/patches/adding-functional-header-in-PyrSerialPrim.cpp.patch b/debian/patches/adding-functional-header-in-PyrSerialPrim.cpp.patch
index 64ae479..8aee481 100644
--- a/debian/patches/adding-functional-header-in-PyrSerialPrim.cpp.patch
+++ b/debian/patches/adding-functional-header-in-PyrSerialPrim.cpp.patch
@@ -6,10 +6,10 @@ Subject: adding functional header in PyrSerialPrim.cpp
lang/LangPrimSource/PyrSerialPrim.cpp | 1 +
1 file changed, 1 insertion(+)
-diff --git a/lang/LangPrimSource/PyrSerialPrim.cpp b/lang/LangPrimSource/PyrSerialPrim.cpp
-index 7935255..45933af 100644
---- a/lang/LangPrimSource/PyrSerialPrim.cpp
-+++ b/lang/LangPrimSource/PyrSerialPrim.cpp
+Index: supercollider/lang/LangPrimSource/PyrSerialPrim.cpp
+===================================================================
+--- supercollider.orig/lang/LangPrimSource/PyrSerialPrim.cpp
++++ supercollider/lang/LangPrimSource/PyrSerialPrim.cpp
@@ -36,6 +36,7 @@
#include <termios.h>
#include <unistd.h>
diff --git a/debian/patches/gcc5-compile-fix.patch b/debian/patches/gcc5-compile-fix.patch
index c1a136d..fb21b43 100644
--- a/debian/patches/gcc5-compile-fix.patch
+++ b/debian/patches/gcc5-compile-fix.patch
@@ -6,10 +6,10 @@ Subject: supernova: gcc-5 compile fix
server/supernova/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
-index fda7d1d..2731ce5 100644
---- a/server/supernova/CMakeLists.txt
-+++ b/server/supernova/CMakeLists.txt
+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()
diff --git a/debian/patches/perf-counter-include.patch b/debian/patches/perf-counter-include.patch
index 2874bd0..ff416e7 100644
--- a/debian/patches/perf-counter-include.patch
+++ b/debian/patches/perf-counter-include.patch
@@ -10,10 +10,10 @@ Forwarded: yes
external_libraries/nova-simd/benchmarks/perf_counter.hpp | 5 +++++
1 file changed, 5 insertions(+)
-diff --git a/external_libraries/nova-simd/benchmarks/perf_counter.hpp b/external_libraries/nova-simd/benchmarks/perf_counter.hpp
-index ee78f18..ee68df6 100644
---- 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
++++ supercollider/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 0c4e94e..8237d52 100644
--- a/debian/patches/supernova-i686-march-flag.patch
+++ b/debian/patches/supernova-i686-march-flag.patch
@@ -6,10 +6,10 @@ Subject: Fix supernova build on x86
server/supernova/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
-index c71a8dd..fda7d1d 100644
---- a/server/supernova/CMakeLists.txt
-+++ b/server/supernova/CMakeLists.txt
+Index: supercollider/server/supernova/CMakeLists.txt
+===================================================================
+--- supercollider.orig/server/supernova/CMakeLists.txt
++++ supercollider/server/supernova/CMakeLists.txt
@@ -149,6 +149,10 @@ else()
target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options)
endif()
--
supercollider packaging
More information about the pkg-multimedia-commits
mailing list