From ff34566edadf60fbfa81519085ae4030e96bf7bb Mon Sep 17 00:00:00 2001 From: Weldon Goree Date: Fri, 29 Mar 2024 15:24:39 +0530 Subject: [PATCH 1/2] Update Supercollider to 3.13.0 --- srcpkgs/supercollider/patches/boost.patch | 39 ------------------- .../patches/libsndfile-0.2.2.patch | 26 ------------- srcpkgs/supercollider/template | 6 +-- 3 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 srcpkgs/supercollider/patches/boost.patch delete mode 100644 srcpkgs/supercollider/patches/libsndfile-0.2.2.patch diff --git a/srcpkgs/supercollider/patches/boost.patch b/srcpkgs/supercollider/patches/boost.patch deleted file mode 100644 index db5c874dc4637b..00000000000000 --- a/srcpkgs/supercollider/patches/boost.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cc873049ff9249a33567e4cbcdeffeb6806a30d6 Mon Sep 17 00:00:00 2001 -From: brianlheim -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; --#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; - diff --git a/srcpkgs/supercollider/patches/libsndfile-0.2.2.patch b/srcpkgs/supercollider/patches/libsndfile-0.2.2.patch deleted file mode 100644 index 7f023275194f75..00000000000000 --- a/srcpkgs/supercollider/patches/libsndfile-0.2.2.patch +++ /dev/null @@ -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 - --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)) diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index e7d61fc7d35fbe..af7eb9d0b52fb0 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,6 +1,6 @@ # Template file for 'supercollider' pkgname=supercollider -version=3.11.1 +version=3.13.0 revision=7 build_style=cmake make_cmd=make @@ -12,11 +12,11 @@ makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel qt5-plugin-tds qt5-sensors-devel qt5-tools-devel qt5-svg-devel qt5-webchannel-devel qt5-websockets-devel yaml-cpp-devel" short_desc="Environment and programming language for real time audio synthesis" -maintainer="Orphaned " +maintainer="Weldon Goree " license="GPL-3.0-or-later" homepage="https://github.com/supercollider/supercollider" distfiles="https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2" -checksum=2dd2f8179a55de4735ac940e2e2d0df4e68cc3a33172628e4dd99ae89c74856b +checksum=0fc5dba5baeae37f9069ad28885aa405c6a25309e3886cbe111bd3b7c05531ce export CMAKE_GENERATOR="Unix Makefiles" From aadd840334becd1447a734435a33ad9043358745 Mon Sep 17 00:00:00 2001 From: Weldon Goree Date: Fri, 29 Mar 2024 15:58:16 +0530 Subject: [PATCH 2/2] Update sc3-plugins --- srcpkgs/sc3-plugins/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/sc3-plugins/template b/srcpkgs/sc3-plugins/template index cdd0064b8ee915..7c668f6925162f 100644 --- a/srcpkgs/sc3-plugins/template +++ b/srcpkgs/sc3-plugins/template @@ -1,24 +1,24 @@ # Template file for 'sc3-plugins' pkgname=sc3-plugins -version=3.10.0 +version=3.13.0 revision=2 _nova_simd_hash=2bdc68bc5704a42578300a4c18411df2405cb307 create_wrksrc=yes build_wrksrc=sc3-plugins build_style=cmake -configure_args="-DSUPERNOVA=ON -DSYSTEM_STK=ON" +configure_args="-DSUPERNOVA=ON -DSYSTEM_STK=ON -Wno-dev" hostmakedepends="pkg-config" makedepends="fftw-devel libstk-devel" depends="supercollider" short_desc="Extension plugins for the SuperCollider3 audio synthesis server" -maintainer="Orphaned " +maintainer="Weldon Goree " license="GPL-2.0-or-later" homepage="https://github.com/supercollider/sc3-plugins" -distfiles="https://github.com/supercollider/sc3-plugins/archive/Version-${version}.tar.gz - https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2 +distfiles="https://github.com/supercollider/sc3-plugins/releases/download/Version-${version}/${pkgname}-${version}-Source.tar.bz2 + https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2 https://github.com/timblechmann/nova-simd/archive/${_nova_simd_hash}.tar.gz" -checksum="b8144231ea1bfc1c9d8aa6780c7e963dfb642868794abbfd8ccab418ffbbdfbe - 9b2035a3a7942c61cbe89b00c35c7e16ac281c06786fe1c30dfd333194be499a +checksum="f8deeb861d402e2a72db51d40b48c443690261b5a53af78983d4cf7ba76717a2 + 0fc5dba5baeae37f9069ad28885aa405c6a25309e3886cbe111bd3b7c05531ce df9f280daaad56fdadb5fa75d492ee6a06762a41d7346aa473aa49c1ac9ec9c8" post_extract() { @@ -28,7 +28,7 @@ post_extract() { } pre_configure() { - configure_args+=" -DSC_PATH=${wrksrc}/SuperCollider-Source " + configure_args+=" -DSC_PATH=${wrksrc}/SuperCollider-${version}-Source " } post_install() {