diff options
Diffstat (limited to 'media-sound/supercollider')
4 files changed, 83 insertions, 1 deletions
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest index 3711ff81d7e6..64e8c327c66d 100644 --- a/media-sound/supercollider/Manifest +++ b/media-sound/supercollider/Manifest @@ -1,10 +1,12 @@ AUX supercollider-3.10.2-boost-1.67.patch 1521 BLAKE2B 0e63a18647b85cede59cf8dcda9f9834122f7cc6cd0ebc6722aa94e55ae0f8e1d1cf68ad7a5ac05c0a43d993e10decae034e8d17b09c14caa31314a131b3ff9e SHA512 6e57040b2ab9df0ee9c64d72b95ed5cee2d9f6c76231ff36d72ea8662df1cd49f96cfde68e6ba76b0f15ef2a1d9c78386fd886fcfc337630e47a9d35d036d7b1 +AUX supercollider-3.10.2-boost-1.70.patch 1882 BLAKE2B 48fdf58789d37a296a28f11045d3f224c29a3bdfd39d5377101d2a1bb501f8a648307b0546daadea3d46213d6847098a1128101b1bd990c6ffe203aac6bdd6fc SHA512 0a999fbd53de6c7c2fb81451c6a1f4ce909220a257eefccce1d2246238637d661757795dfc4be7dd69c0553bdf1a02db9311da6033fe7b17230800d06fd291b4 +AUX supercollider-3.10.2-no-ccache.patch 927 BLAKE2B 661610049aab5c077cbff57fa476d08ef7170440135362dafa96b4ab312d778154acdcccd93562822c7d6078d55c6c5eaf59eeadc85e61cc85f1e50a76c908e8 SHA512 5a1f6f074adcb77b9958ff47e855378f9ec180201e32cc417925320ee7fbeedd5b2a163b300286bf0344bb6bb47743598c59c95f28573f4a309696ca5e44af8d AUX supercollider-3.10.2-system-boost.patch 15055 BLAKE2B d6b3b2c9f13829ff5b2af037f4204fff519efe67bcb7b705090a2883d97738f0cc8b4a66fe39f88d5fe676081ed44fe3132d23e404c821353d1e9b31d1e0d764 SHA512 d9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae AUX supercollider-3.8.0-no-opengl.patch 2146 BLAKE2B 0697fcad3f277072459d40675509b223e5b7e35d8ecd94e200817bceeea12e224201376c8db61b46159f8b18e3f27b28549458bdfc0793c994d17943ae4cb3b8 SHA512 33dabf5ce200b783d3c54e8ddbb1217d4d4269ae4b8f82627264737377c786fc049e6b9309b97ba06eced7e313d39a57129dea98915b4a0106a8f413b9e86fd2 AUX supercollider-3.8.0-no-qtpositioning.patch 1840 BLAKE2B cf4ee13c08e81f3ae19d50b23f8416a5045bd60ab64f8b6c0903f40addf7701b30792f9d4de0c57f3b4f4b2b661eec19eb5b8faa520997b263215dfee6df5a8e SHA512 df86ee0e3c190283b9ed79a3bc4f1108ee0279c1d6f44bea6ffdeb7fc77b38163f2d9ab199b8124e2f06d436d68d217995b46c580740951e5e13cbd56618b635 AUX supercollider-3.8.0-no-qtsensors.patch 2675 BLAKE2B 0fae3883eddbf2bc025e7dab0600915d3770e20c28fedc51522d1dff7e9b3fab2e4d920762b252d2af711ea4f2b010e8b532d90595c4594a757437cbc6a907ce SHA512 4574101c4c41522ebeb7a747f29734beec7a7d4eb0751d959718e0a040e1fb7fc76685d53e2cdf5e027ad91b7a0c7465714acc951bd4d4d8023145008f0b314c DIST SuperCollider-3.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46 DIST SuperCollider-3.9.3-Source-linux.tar.bz2 11060240 BLAKE2B 5da51bece13d2a3e4ca1ff6b79637122a46c1f590aa7e4ebf52d7a663506c6f4bae4f3d618bb7f947c73828402f329be68e435a4de2ecc092c312cb2c993742c SHA512 5b0c29941907d5ca45c1676e34184664c03891051bba0ee50d9e8311400824054de7b6daba6d29fd875ff38f42ee9654504ea2f0b5bf0a36ae9605e6a79a0841 -EBUILD supercollider-3.10.2.ebuild 2982 BLAKE2B d1ef0c71025087b75d46edf3ed95013afa1468bc9cbbce4d14713480b43ef2d497ac9051229f5c895223069ee1f2fffc7d3ed46120536047ca8bec0c46538d98 SHA512 c40b75978895ed49d83ae7a423d87af26191520073edcc6339ad698fda510f6721cdeecbab9e2eaa492a32f2fe60007311a462cfbe35ac15e251b6ab4ea79d29 +EBUILD supercollider-3.10.2.ebuild 3055 BLAKE2B 3569094c88762fde957ff9c979f3d6bb777b859a0f4bbb4c7a893b14acae31b32bd5a319867407488fde390c00261591bded8143ead4835866e7b64dd2599eb8 SHA512 01e2f6979578cba5736c415594e805ce36db7c797b02fe22932ad7320a11fc7242fda2b87c09021797517a20b0f8353e4b6cea877b4f8990c603f45bc8d85277 EBUILD supercollider-3.9.3-r1.ebuild 2836 BLAKE2B 164dd68cf7178fca42bb1a650ddee93dc9ff90db43f4f4c95a09530ac02305c176a450430fa956d094a6368e6e0e81ab1d379cf10ea6e801a9e762edc61fb9c8 SHA512 25ca2d3f3a14fc11db4cb6626bbdaa43ded4e1ee2bf2a616e3c83cf34e171eff22ce831ca6d4087477140fcb92a3f2283a1dff6374a5d2d4a65226e3da23060f MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895 diff --git a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch new file mode 100644 index 000000000000..74fc05ac45cd --- /dev/null +++ b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch @@ -0,0 +1,53 @@ +From ea95d667907e1c9d4ee3ad8b33b452d60059e3c8 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 16 Jul 2019 17:30:38 +0200 +Subject: [PATCH] Fix build with boost-1.70 (get_io_service() removed) + +Fixes https://github.com/supercollider/supercollider/issues/4490 + +--- + server/supernova/sc/sc_osc_handler.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp +index 5116a1be8..8c2418b09 100644 +--- a/server/supernova/sc/sc_osc_handler.cpp ++++ b/server/supernova/sc/sc_osc_handler.cpp +@@ -728,7 +728,7 @@ void sc_osc_handler::tcp_connection::handle_message() { + + void sc_osc_handler::start_tcp_accept(void) + { +- tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service()); ++ tcp_connection::pointer new_connection = tcp_connection::create((boost::asio::io_context&)tcp_acceptor_.get_executor().context()); + + tcp_acceptor_.async_accept( + new_connection->socket(), +-- +2.22.0 + +From 53909b1ff2983442dd8d2fdeff6b4331767237f1 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 16 Jul 2019 17:47:44 +0200 +Subject: [PATCH] Fix build with boost-1.70 (missing checked_delete.hpp + include) + +See also: https://www.boost.org/doc/libs/1_70_0/libs/core/doc/html/core/checked_delete.html +--- + server/supernova/utilities/utils.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp +index 35b8ab5ad..a7c191f2d 100644 +--- a/server/supernova/utilities/utils.hpp ++++ b/server/supernova/utilities/utils.hpp +@@ -23,6 +23,7 @@ + + #include <type_traits> + ++#include <boost/checked_delete.hpp> + #include <boost/intrusive_ptr.hpp> + #include <boost/noncopyable.hpp> + #include <boost/detail/atomic_count.hpp> +-- +2.22.0 + diff --git a/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch b/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch new file mode 100644 index 000000000000..66a765a8b9ea --- /dev/null +++ b/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch @@ -0,0 +1,25 @@ +disabled the use of ccache, to prevent FTBFS; as the compilation is done once +it has no backdraws to make the debian package. +Index: supercollider/CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -150,12 +150,12 @@ add_definitions(-DBOOST_CHRONO_HEADER_ON + ############################################# + # Detect CCache + +-find_program(CCacheExectuable ccache) +-if( CCacheExectuable ) +- # only used with >=cmake-3.4 +- set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExectuable}" ) +- set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" ) +-endif() ++## find_program(CCacheExecutable ccache) ++## if( CCacheExecutable ) ++## # only used with >=cmake-3.4 ++## set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExecutable}" ) ++## set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExecutable}" ) ++## endif() + + ############################################# + # Options diff --git a/media-sound/supercollider/supercollider-3.10.2.ebuild b/media-sound/supercollider/supercollider-3.10.2.ebuild index 83ab1fcb862c..6ea80528297c 100644 --- a/media-sound/supercollider/supercollider-3.10.2.ebuild +++ b/media-sound/supercollider/supercollider-3.10.2.ebuild @@ -62,8 +62,10 @@ DEPEND="${RDEPEND} " PATCHES=( + "${FILESDIR}"/${P}-no-ccache.patch "${FILESDIR}"/${P}-system-boost.patch "${FILESDIR}"/${P}-boost-1.67.patch + "${FILESDIR}"/${P}-boost-1.70.patch ) S="${WORKDIR}/SuperCollider-Source" |