From ff34566edadf60fbfa81519085ae4030e96bf7bb Mon Sep 17 00:00:00 2001 From: Weldon Goree Date: Fri, 29 Mar 2024 15:24:39 +0530 Subject: [PATCH 1/4] 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 ecbdd272ec0aa1ebd83b8a11ca3ec0adf8d85282 Mon Sep 17 00:00:00 2001 From: Weldon Goree Date: Fri, 29 Mar 2024 15:58:16 +0530 Subject: [PATCH 2/4] supercollider, sc3-plugins: update to 3.13.0 --- 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() { From ecc903b1ef6bfa7f8f45f45ebabfb5e49c27dd30 Mon Sep 17 00:00:00 2001 From: Weldon Goree Date: Sat, 30 Mar 2024 08:14:38 +0530 Subject: [PATCH 3/4] rebranching --- srcpkgs/mixxx/template | 6 +++--- srcpkgs/sc3-plugins/template | 4 ++-- srcpkgs/smalltalk/template | 15 +++++++++++++++ srcpkgs/supercollider/template | 4 ++-- srcpkgs/wmg-mixxx/template | 25 +++++++++++++++++++++++++ srcpkgs/wmg-mixxx/update | 1 + 6 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/smalltalk/template create mode 100644 srcpkgs/wmg-mixxx/template create mode 100644 srcpkgs/wmg-mixxx/update diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 6a79b328c1abf0..5d0aaec06462d0 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx -version=2.3.3 -revision=7 +version=2.3.6 +revision=1 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=Release" hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake" @@ -19,4 +19,4 @@ maintainer="prez " license="GPL-2.0-or-later" homepage="https://www.mixxx.org" distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz" -checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c +checksum=0030d07c1506ccc13daa63d851921381b5bf838e9407cd666557d951ac093c52 diff --git a/srcpkgs/sc3-plugins/template b/srcpkgs/sc3-plugins/template index 7c668f6925162f..8cb59154b4d84a 100644 --- a/srcpkgs/sc3-plugins/template +++ b/srcpkgs/sc3-plugins/template @@ -1,7 +1,7 @@ # Template file for 'sc3-plugins' pkgname=sc3-plugins version=3.13.0 -revision=2 +revision=1 _nova_simd_hash=2bdc68bc5704a42578300a4c18411df2405cb307 create_wrksrc=yes build_wrksrc=sc3-plugins @@ -11,7 +11,7 @@ hostmakedepends="pkg-config" makedepends="fftw-devel libstk-devel" depends="supercollider" short_desc="Extension plugins for the SuperCollider3 audio synthesis server" -maintainer="Weldon Goree " +maintainer=maintainer="Weldon Goree " license="GPL-2.0-or-later" homepage="https://github.com/supercollider/sc3-plugins" distfiles="https://github.com/supercollider/sc3-plugins/releases/download/Version-${version}/${pkgname}-${version}-Source.tar.bz2 diff --git a/srcpkgs/smalltalk/template b/srcpkgs/smalltalk/template new file mode 100644 index 00000000000000..69f51f06274e77 --- /dev/null +++ b/srcpkgs/smalltalk/template @@ -0,0 +1,15 @@ +# Template file for 'smalltalk' +pkgname=smalltalk +version=3.2.5 +revision=1 +build_style=gnu-configure +hostmakedepends="m4 zip pkg-config" +makedepends="libffi-devel libsigsegv-devel readline-devel gmp-devel gtk+-devel SDL-devel sqlite-devel" +short_desc="GNU Smalltalk, a free implementation of the Smalltalk-80 language." +maintainer="Weldon Goree " +license="GPL-2.0-or-Later, LGPL-2.0-or-Later, GFDL-1.3-or-Later" +homepage="https://www.gnu.org/software/smalltalk/" +distfiles="${GNU_SITE}/smalltalk/smalltalk-${version}.tar.gz" +checksum=06e574e818ec49f0555d948ae53b1453d8c1df59ef597dad911a4fd1ffba1cce +disable_parallel_build=yes + diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index af7eb9d0b52fb0..3ab6ce02c4a463 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,7 +1,7 @@ # Template file for 'supercollider' pkgname=supercollider version=3.13.0 -revision=7 +revision=1 build_style=cmake make_cmd=make configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON" @@ -12,7 +12,7 @@ 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="Weldon Goree " +maintainer="Orphaned " 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" diff --git a/srcpkgs/wmg-mixxx/template b/srcpkgs/wmg-mixxx/template new file mode 100644 index 00000000000000..5922ae8807e3fe --- /dev/null +++ b/srcpkgs/wmg-mixxx/template @@ -0,0 +1,25 @@ +# Template file for 'mixxx' +pkgname=wmg-mixxx +version=2.3.6 +revision=1 +build_style=cmake +configure_args="-DCMAKE_BUILD_TYPE=Release" +build_wrksrc=mixxx-${version} +hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake" +makedepends="chromaprint-devel faad2-devel ffmpeg-devel libkeyfinder-devel glu-devel + lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel + opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel + wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel + qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel + vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel + speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc + qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel gtest-devel" +depends="qt5-plugin-sqlite" +short_desc="Open source digital DJing software that allows mixing music" +maintainer="prez " +license="GPL-2.0-or-later" +homepage="https://www.mixxx.org" +distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz" +checksum=0030d07c1506ccc13daa63d851921381b5bf838e9407cd666557d951ac093c52 + + diff --git a/srcpkgs/wmg-mixxx/update b/srcpkgs/wmg-mixxx/update new file mode 100644 index 00000000000000..d309484699391d --- /dev/null +++ b/srcpkgs/wmg-mixxx/update @@ -0,0 +1 @@ +pkgname=release From be5c7221a26ce3278f40140f5055b9009bb49ce9 Mon Sep 17 00:00:00 2001 From: Weldon Goree Date: Sat, 30 Mar 2024 08:22:21 +0530 Subject: [PATCH 4/4] supercollider and sc3-plugins: update to 3.13.0 --- srcpkgs/sc3-plugins/template | 2 +- srcpkgs/smalltalk/template | 15 --------------- srcpkgs/wmg-mixxx/template | 25 ------------------------- srcpkgs/wmg-mixxx/update | 1 - 4 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 srcpkgs/smalltalk/template delete mode 100644 srcpkgs/wmg-mixxx/template delete mode 100644 srcpkgs/wmg-mixxx/update diff --git a/srcpkgs/sc3-plugins/template b/srcpkgs/sc3-plugins/template index 8cb59154b4d84a..6f2db86a76e725 100644 --- a/srcpkgs/sc3-plugins/template +++ b/srcpkgs/sc3-plugins/template @@ -11,7 +11,7 @@ hostmakedepends="pkg-config" makedepends="fftw-devel libstk-devel" depends="supercollider" short_desc="Extension plugins for the SuperCollider3 audio synthesis server" -maintainer=maintainer="Weldon Goree " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/supercollider/sc3-plugins" distfiles="https://github.com/supercollider/sc3-plugins/releases/download/Version-${version}/${pkgname}-${version}-Source.tar.bz2 diff --git a/srcpkgs/smalltalk/template b/srcpkgs/smalltalk/template deleted file mode 100644 index 69f51f06274e77..00000000000000 --- a/srcpkgs/smalltalk/template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'smalltalk' -pkgname=smalltalk -version=3.2.5 -revision=1 -build_style=gnu-configure -hostmakedepends="m4 zip pkg-config" -makedepends="libffi-devel libsigsegv-devel readline-devel gmp-devel gtk+-devel SDL-devel sqlite-devel" -short_desc="GNU Smalltalk, a free implementation of the Smalltalk-80 language." -maintainer="Weldon Goree " -license="GPL-2.0-or-Later, LGPL-2.0-or-Later, GFDL-1.3-or-Later" -homepage="https://www.gnu.org/software/smalltalk/" -distfiles="${GNU_SITE}/smalltalk/smalltalk-${version}.tar.gz" -checksum=06e574e818ec49f0555d948ae53b1453d8c1df59ef597dad911a4fd1ffba1cce -disable_parallel_build=yes - diff --git a/srcpkgs/wmg-mixxx/template b/srcpkgs/wmg-mixxx/template deleted file mode 100644 index 5922ae8807e3fe..00000000000000 --- a/srcpkgs/wmg-mixxx/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'mixxx' -pkgname=wmg-mixxx -version=2.3.6 -revision=1 -build_style=cmake -configure_args="-DCMAKE_BUILD_TYPE=Release" -build_wrksrc=mixxx-${version} -hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake" -makedepends="chromaprint-devel faad2-devel ffmpeg-devel libkeyfinder-devel glu-devel - lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel - opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel - wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel - qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel - vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel - speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc - qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel gtest-devel" -depends="qt5-plugin-sqlite" -short_desc="Open source digital DJing software that allows mixing music" -maintainer="prez " -license="GPL-2.0-or-later" -homepage="https://www.mixxx.org" -distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz" -checksum=0030d07c1506ccc13daa63d851921381b5bf838e9407cd666557d951ac093c52 - - diff --git a/srcpkgs/wmg-mixxx/update b/srcpkgs/wmg-mixxx/update deleted file mode 100644 index d309484699391d..00000000000000 --- a/srcpkgs/wmg-mixxx/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=release