supercollider: update to 3.13.0
This commit is contained in:
parent
8556414a5f
commit
047143ca71
|
@ -1,39 +0,0 @@
|
||||||
From cc873049ff9249a33567e4cbcdeffeb6806a30d6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: brianlheim <self@brianlheim.com>
|
|
||||||
Date: Tue, 25 Aug 2020 17:14:29 -0500
|
|
||||||
Subject: [PATCH] remove workarounds for old boost versions
|
|
||||||
|
|
||||||
we don't need to support boost pre-1.70 anymore, and tcp::socket::executor_type was always the right typealias to use
|
|
||||||
---
|
|
||||||
server/supernova/sc/sc_osc_handler.hpp | 10 +---------
|
|
||||||
1 file changed, 1 insertion(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/server/supernova/sc/sc_osc_handler.hpp b/server/supernova/sc/sc_osc_handler.hpp
|
|
||||||
index f17e99a5573..676c94dbf15 100644
|
|
||||||
--- a/server/supernova/sc/sc_osc_handler.hpp
|
|
||||||
+++ b/server/supernova/sc/sc_osc_handler.hpp
|
|
||||||
@@ -234,11 +234,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer
|
|
||||||
class tcp_connection : public nova_endpoint {
|
|
||||||
public:
|
|
||||||
using pointer = std::shared_ptr<tcp_connection>;
|
|
||||||
-#if BOOST_VERSION >= 107000
|
|
||||||
- using executor = boost::asio::executor;
|
|
||||||
-#else
|
|
||||||
- using executor = boost::asio::io_context::executor_type;
|
|
||||||
-#endif
|
|
||||||
+ using executor = tcp::socket::executor_type;
|
|
||||||
|
|
||||||
static pointer create(const executor& executor) { return pointer(new tcp_connection(executor)); }
|
|
||||||
|
|
||||||
@@ -249,11 +245,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer
|
|
||||||
bool operator==(tcp_connection const& rhs) const { return &rhs == this; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
-#if BOOST_VERSION >= 107000
|
|
||||||
tcp_connection(const executor& executor): socket_(executor) {}
|
|
||||||
-#else
|
|
||||||
- tcp_connection(const executor& executor): socket_(executor.context()) {}
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
void send(const char* data, size_t length) override final;
|
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
Index: supercollider-3.11.1/include/plugin_interface/SC_SndBuf.h
|
|
||||||
===================================================================
|
|
||||||
--- supercollider-3.11.1.orig/include/plugin_interface/SC_SndBuf.h
|
|
||||||
+++ supercollider-3.11.1/include/plugin_interface/SC_SndBuf.h
|
|
||||||
@@ -22,7 +22,7 @@
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
-typedef struct SNDFILE_tag SNDFILE;
|
|
||||||
+typedef struct sf_private_tag SNDFILE;
|
|
||||||
|
|
||||||
#ifdef SUPERNOVA
|
|
||||||
|
|
||||||
Index: supercollider-3.11.1/include/plugin_interface/SC_sndfile_stub.h
|
|
||||||
===================================================================
|
|
||||||
--- supercollider-3.11.1.orig/include/plugin_interface/SC_sndfile_stub.h
|
|
||||||
+++ supercollider-3.11.1/include/plugin_interface/SC_sndfile_stub.h
|
|
||||||
@@ -25,7 +25,7 @@
|
|
||||||
|
|
||||||
/* A SNDFILE* pointer can be passed around much like stdio.h's FILE* pointer. */
|
|
||||||
|
|
||||||
-typedef struct SNDFILE_tag SNDFILE;
|
|
||||||
+typedef struct sf_private_tag SNDFILE;
|
|
||||||
|
|
||||||
|
|
||||||
#if (defined(_MSCVER) || defined(_MSC_VER))
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'supercollider'
|
# Template file for 'supercollider'
|
||||||
pkgname=supercollider
|
pkgname=supercollider
|
||||||
version=3.11.1
|
version=3.13.0
|
||||||
revision=7
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
make_cmd=make
|
make_cmd=make
|
||||||
configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON"
|
configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON"
|
||||||
|
@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="GPL-3.0-or-later"
|
license="GPL-3.0-or-later"
|
||||||
homepage="https://github.com/supercollider/supercollider"
|
homepage="https://github.com/supercollider/supercollider"
|
||||||
distfiles="https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"
|
distfiles="https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"
|
||||||
checksum=2dd2f8179a55de4735ac940e2e2d0df4e68cc3a33172628e4dd99ae89c74856b
|
checksum=0fc5dba5baeae37f9069ad28885aa405c6a25309e3886cbe111bd3b7c05531ce
|
||||||
|
|
||||||
export CMAKE_GENERATOR="Unix Makefiles"
|
export CMAKE_GENERATOR="Unix Makefiles"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue