[SCM] supercollider/master: Refresh patches, dropping one superceded patch.
danstowell-guest at users.alioth.debian.org
danstowell-guest at users.alioth.debian.org
Thu Sep 11 09:26:22 UTC 2014
The following commit has been merged in the master branch:
commit 1b96428adefe3b0f390258430b596d6edc66f658
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date: Thu Sep 11 09:18:57 2014 +0100
Refresh patches, dropping one superceded patch.
diff --git a/debian/changelog b/debian/changelog
index 0059f11..9b8596b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ supercollider (1:3.6.6~repack-1) unstable; urgency=low
* Imported upstream version 3.6.6.
* Exclude bundled MathJax scripts. We use system MathJax. Closes: #760981
+ * Refresh patches, dropping one superceded patch.
-- Dan Stowell <danstowell at users.sourceforge.net> Wed, 10 Sep 2014 09:28:36 +0100
diff --git a/debian/patches/ftbfs-gcc-4.9.patch b/debian/patches/ftbfs-gcc-4.9.patch
index c554d10..1b124f7 100644
--- a/debian/patches/ftbfs-gcc-4.9.patch
+++ b/debian/patches/ftbfs-gcc-4.9.patch
@@ -5,11 +5,11 @@ Subject: Fix implementation of aligned_allocator::construct<U>.
Fixes a build failure with gcc >= 4.9, because it defines __cplusplus >= 201103L.
A typo, apparently. This patch can be dropped in the next upstream release.
-diff --git a/server/supernova/utilities/malloc_aligned.hpp b/server/supernova/utilities/malloc_aligned.hpp
-index e572dcb..89277ff 100644
---- a/server/supernova/utilities/malloc_aligned.hpp
-+++ b/server/supernova/utilities/malloc_aligned.hpp
-@@ -243,7 +243,7 @@ public:
+Index: supercollider/server/supernova/utilities/malloc_aligned.hpp
+===================================================================
+--- supercollider.orig/server/supernova/utilities/malloc_aligned.hpp 2014-09-11 09:15:20.399357542 +0100
++++ supercollider/server/supernova/utilities/malloc_aligned.hpp 2014-09-11 09:15:20.399357542 +0100
+@@ -243,7 +243,7 @@
template< class U, class... Args >
void construct(U * p, Args&& ... args)
{
diff --git a/debian/patches/no-inline-ppc-ftbfs.patch b/debian/patches/no-inline-ppc-ftbfs.patch
index dce3c84..b4cec9e 100644
--- a/debian/patches/no-inline-ppc-ftbfs.patch
+++ b/debian/patches/no-inline-ppc-ftbfs.patch
@@ -1,8 +1,10 @@
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
+Index: supercollider/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp
+===================================================================
+--- supercollider.orig/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp 2014-09-11 09:15:20.311357545 +0100
++++ supercollider/external_libraries/boost-lockfree/boost/atomic/detail/gcc-ppc.hpp 2014-09-11 09:15:20.295357546 +0100
@@ -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 6943ebd..090e385 100644
--- a/debian/patches/perf-counter-include.patch
+++ b/debian/patches/perf-counter-include.patch
@@ -1,7 +1,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
+Index: supercollider/external_libraries/nova-simd/benchmarks/perf_counter.hpp
+===================================================================
+--- supercollider.orig/external_libraries/nova-simd/benchmarks/perf_counter.hpp 2014-09-11 09:15:20.367357543 +0100
++++ supercollider/external_libraries/nova-simd/benchmarks/perf_counter.hpp 2014-09-11 09:15:20.367357543 +0100
@@ -54,6 +54,11 @@
#endif
diff --git a/debian/patches/series b/debian/patches/series
index b8b8c42..8d1c14a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
no-inline-ppc-ftbfs.patch
perf-counter-include.patch
supernova-i686-march-flag.patch
-two-extra-dev-headers.patch
system-lockfree.patch
ftbfs-gcc-4.9.patch
diff --git a/debian/patches/supernova-i686-march-flag.patch b/debian/patches/supernova-i686-march-flag.patch
index cf5b57e..15d544b 100644
--- a/debian/patches/supernova-i686-march-flag.patch
+++ b/debian/patches/supernova-i686-march-flag.patch
@@ -1,5 +1,7 @@
---- a/server/supernova/CMakeLists.txt
-+++ b/server/supernova/CMakeLists.txt
+Index: supercollider/server/supernova/CMakeLists.txt
+===================================================================
+--- supercollider.orig/server/supernova/CMakeLists.txt 2014-09-11 09:15:20.379357543 +0100
++++ supercollider/server/supernova/CMakeLists.txt 2014-09-11 09:15:30.000000000 +0100
@@ -12,6 +12,10 @@
endif()
endif()
diff --git a/debian/patches/system-lockfree.patch b/debian/patches/system-lockfree.patch
index 6df7a4a..d743df9 100644
--- a/debian/patches/system-lockfree.patch
+++ b/debian/patches/system-lockfree.patch
@@ -2,9 +2,11 @@ Author: Felipe Sateler <fsateler at debian.org>
Description: Boost 1.5* includes the lockfree lib, so use the system one
Lockfree requires the atomic library in some archs, so include it in the supernova target
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -225,7 +225,7 @@
+Index: supercollider/CMakeLists.txt
+===================================================================
+--- supercollider.orig/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
++++ supercollider/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
+@@ -235,7 +235,7 @@
if(SYSTEM_BOOST)
set(Boost_USE_MULTITHREADED ON)
@@ -13,8 +15,10 @@ Lockfree requires the atomic library in some archs, so include it in the superno
endif()
if (Boost_FOUND)
---- a/lang/CMakeLists.txt
-+++ b/lang/CMakeLists.txt
+Index: supercollider/lang/CMakeLists.txt
+===================================================================
+--- supercollider.orig/lang/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
++++ supercollider/lang/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
@@ -6,7 +6,6 @@
${YAMLCPP_INCLUDE_DIR}
@@ -23,7 +27,7 @@ Lockfree requires the atomic library in some archs, so include it in the superno
${CMAKE_SOURCE_DIR}/external_libraries/threadpool
${CMAKE_SOURCE_DIR}/external_libraries/TLSF-2.4.6/src
LangSource/Bison)
-@@ -207,7 +206,7 @@
+@@ -217,7 +216,7 @@
endif()
if (Boost_FOUND)
@@ -32,8 +36,10 @@ Lockfree requires the atomic library in some archs, so include it in the superno
endif()
if (SCLANG_SERVER)
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
+Index: supercollider/server/CMakeLists.txt
+===================================================================
+--- supercollider.orig/server/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
++++ supercollider/server/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
@@ -4,7 +4,6 @@
endif()
@@ -42,9 +48,11 @@ Lockfree requires the atomic library in some archs, so include it in the superno
${CMAKE_SOURCE_DIR}/external_libraries/nova-simd
${CMAKE_SOURCE_DIR}/external_libraries/nova-tt
)
---- a/server/supernova/CMakeLists.txt
-+++ b/server/supernova/CMakeLists.txt
-@@ -159,7 +159,7 @@
+Index: supercollider/server/supernova/CMakeLists.txt
+===================================================================
+--- supercollider.orig/server/supernova/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
++++ supercollider/server/supernova/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
+@@ -160,7 +160,7 @@
target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES})
if (Boost_FOUND)
@@ -53,8 +61,10 @@ Lockfree requires the atomic library in some archs, so include it in the superno
else()
target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options)
endif()
---- a/testsuite/supernova/CMakeLists.txt
-+++ b/testsuite/supernova/CMakeLists.txt
+Index: supercollider/testsuite/supernova/CMakeLists.txt
+===================================================================
+--- supercollider.orig/testsuite/supernova/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
++++ supercollider/testsuite/supernova/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
@@ -45,7 +45,6 @@
${CMAKE_SOURCE_DIR}/server/supernova
${CMAKE_SOURCE_DIR}/external_libraries/boost
@@ -63,8 +73,10 @@ Lockfree requires the atomic library in some archs, so include it in the superno
${CMAKE_SOURCE_DIR}/external_libraries/oscpack
${CMAKE_SOURCE_DIR}/external_libraries/
${CMAKE_SOURCE_DIR}/external_libraries/nova-tt
---- a/server/scsynth/CMakeLists.txt
-+++ b/server/scsynth/CMakeLists.txt
+Index: supercollider/server/scsynth/CMakeLists.txt
+===================================================================
+--- supercollider.orig/server/scsynth/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
++++ supercollider/server/scsynth/CMakeLists.txt 2014-09-11 09:15:20.387357543 +0100
@@ -207,7 +207,7 @@
endif()
diff --git a/debian/patches/two-extra-dev-headers.patch b/debian/patches/two-extra-dev-headers.patch
deleted file mode 100644
index aa3dbb8..0000000
--- a/debian/patches/two-extra-dev-headers.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Dan Stowell <danstowell at users.sourceforge.net>
-Description: install two files that are needed in the -dev package for building sc3-plugins.
-This patch is expected to become unnecessary from upstream v3.6.6+.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -317,7 +317,10 @@
- if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
- install(DIRECTORY include/common include/plugin_interface include/server include/lang
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/SuperCollider
-- FILES_MATCHING PATTERN "*.h"
-+ FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
-+ )
-+ install(FILES SCVersion.txt
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/SuperCollider
- )
- endif()
-
--
supercollider packaging
More information about the pkg-multimedia-commits
mailing list