[SCM] supercollider/master: Drop upstreamed patches, refresh others

Mon Sep 25 14:11:28 UTC 2017

The following commit has been merged in the master branch:
commit 7b825d43099a0ed99eaf323c0f14f0ac39ad40ba
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Sat Sep 23 18:56:52 2017 +0100

    Drop upstreamed patches, refresh others

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/cmake-fix-systemboost.patch b/debian/patches/cmake-fix-systemboost.patch
deleted file mode 100644
index 3b317ca..0000000
--- a/debian/patches/cmake-fix-systemboost.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Dan Stowell <danstowell at users.sourceforge.net>
-Date: Wed, 16 Nov 2016 18:33:12 -0300
-Subject: Fix ftbfs when using system boost
-
-Upstreamed, patch can be removed from 3.7.1+
-Forwarded: yes
----
- external_libraries/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/external_libraries/CMakeLists.txt b/external_libraries/CMakeLists.txt
-index 5cb123d..9d2555d 100644
---- a/external_libraries/CMakeLists.txt
-+++ b/external_libraries/CMakeLists.txt
-@@ -60,6 +60,9 @@ if(NOT Boost_FOUND) # we compile boost ourselves
- 		set_property(TARGET boost_thread
- 			APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
- 	endif()
-+
-+	set_property( TARGET boost_thread boost_program_options boost_system boost_filesystem PROPERTY FOLDER 3rdparty )
-+
- endif()
- 
- # tlsf
-@@ -98,7 +101,7 @@ if(NOT YAMLCPP_FOUND)
- endif()
- 
- 
--set_property( TARGET oscpack tlsf boost_thread boost_program_options boost_system boost_filesystem PROPERTY FOLDER 3rdparty )
-+set_property( TARGET oscpack tlsf PROPERTY FOLDER 3rdparty )
- 
- 
- ##### HID_API #######
diff --git a/debian/patches/gcc5-compile-fix.patch b/debian/patches/gcc5-compile-fix.patch
index e165fea..fb21b43 100644
--- a/debian/patches/gcc5-compile-fix.patch
+++ b/debian/patches/gcc5-compile-fix.patch
@@ -6,11 +6,11 @@ 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 5ff5dd9..1ef4eda 100644
---- a/server/supernova/CMakeLists.txt
-+++ b/server/supernova/CMakeLists.txt
-@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+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/series b/debian/patches/series
index 981f5f8..91f0078 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 perf-counter-include.patch
 supernova-i686-march-flag.patch
 gcc5-compile-fix.patch
-cmake-fix-systemboost.patch
-tlsf-fPIC-flag.patch
 fix-oscpack-ftbfs.patch
 Disable-128bit-float-constants.patch
diff --git a/debian/patches/supernova-i686-march-flag.patch b/debian/patches/supernova-i686-march-flag.patch
index d950c17..8237d52 100644
--- a/debian/patches/supernova-i686-march-flag.patch
+++ b/debian/patches/supernova-i686-march-flag.patch
@@ -6,12 +6,12 @@ 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 35405b1..5ff5dd9 100644
---- a/server/supernova/CMakeLists.txt
-+++ b/server/supernova/CMakeLists.txt
-@@ -157,6 +157,10 @@ else()
-     target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options boost_thread)
+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()
  
 +if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686")
diff --git a/debian/patches/tlsf-fPIC-flag.patch b/debian/patches/tlsf-fPIC-flag.patch
deleted file mode 100644
index b0c4bf0..0000000
--- a/debian/patches/tlsf-fPIC-flag.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Dan Stowell <danstowell at users.sourceforge.net>
-Date: Wed, 16 Nov 2016 18:33:12 -0300
-Subject: Add -fPIC flag to tlfs
-
-This patch (modified) was accepted upstream, and will be superfluous in
-SC 3.7.2 and later
-
-Forwarded: yes
----
- external_libraries/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/external_libraries/CMakeLists.txt b/external_libraries/CMakeLists.txt
-index 9d2555d..5dd0fe1 100644
---- a/external_libraries/CMakeLists.txt
-+++ b/external_libraries/CMakeLists.txt
-@@ -69,6 +69,7 @@ endif()
- add_library(tlsf STATIC "TLSF-2.4.6/src/tlsf.c")
- target_compile_definitions( tlsf PRIVATE TLSF_STATISTIC=1 )
- target_include_directories( tlsf INTERFACE TLSF-2.4.6/src )
-+target_compile_options(tlsf PRIVATE -fPIC)
- 
- if(LTO)
- 	set_property(TARGET oscpack tlsf

-- 
supercollider packaging

