diff --git a/srcpkgs/sc3-plugins/patches/cstdio.patch b/srcpkgs/sc3-plugins/patches/cstdio.patch deleted file mode 100644 index ae5880b68f76cb..00000000000000 --- a/srcpkgs/sc3-plugins/patches/cstdio.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/sc3-plugins/source/NHUGens/NHHall.cpp 2018-11-18 23:18:46.000000000 +0100 -+++ b/sc3-plugins/source/NHUGens/NHHall.cpp 2020-09-13 07:57:48.084435095 +0200 -@@ -25,6 +25,7 @@ - For more information, please refer to - */ - -+#include - #include "nh_hall.hpp" - #include "SC_PlugIn.hpp" - diff --git a/srcpkgs/sc3-plugins/template b/srcpkgs/sc3-plugins/template index cdd0064b8ee915..18abc8585a69e3 100644 --- a/srcpkgs/sc3-plugins/template +++ b/srcpkgs/sc3-plugins/template @@ -1,35 +1,24 @@ # Template file for 'sc3-plugins' pkgname=sc3-plugins -version=3.10.0 -revision=2 -_nova_simd_hash=2bdc68bc5704a42578300a4c18411df2405cb307 +version=3.14.0 +revision=1 create_wrksrc=yes -build_wrksrc=sc3-plugins +build_wrksrc=sc3-plugins-${version}-Source build_style=cmake -configure_args="-DSUPERNOVA=ON -DSYSTEM_STK=ON" hostmakedepends="pkg-config" -makedepends="fftw-devel libstk-devel" +makedepends="fftw-devel libstk-devel supercollider-devel" depends="supercollider" short_desc="Extension plugins for the SuperCollider3 audio synthesis server" maintainer="Orphaned " 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 - https://github.com/timblechmann/nova-simd/archive/${_nova_simd_hash}.tar.gz" -checksum="b8144231ea1bfc1c9d8aa6780c7e963dfb642868794abbfd8ccab418ffbbdfbe - 9b2035a3a7942c61cbe89b00c35c7e16ac281c06786fe1c30dfd333194be499a - df9f280daaad56fdadb5fa75d492ee6a06762a41d7346aa473aa49c1ac9ec9c8" - -post_extract() { - mv sc3-plugins-* sc3-plugins - rm -rf sc3-plugins/external_libraries/nova-simd - mv nova-simd-${_nova_simd_hash} sc3-plugins/external_libraries/nova-simd -} - -pre_configure() { - configure_args+=" -DSC_PATH=${wrksrc}/SuperCollider-Source " -} +distfiles="https://github.com/supercollider/sc3-plugins/releases/download/Version-${version}/sc3-plugins-${version}-Source.tar.bz2" +checksum="096f495557607884e0dbfd132e9af0d55f165b856106608dd8db3c5e68992a1d" +if [ "$XBPS_TARGET_MACHINE" = "armv6l-musl" ] || [ "$XBPS_TARGET_MACHINE" = "armv7l-musl" ]; then + configure_args="-DSUPERNOVA=OFF -DSYSTEM_STK=ON" +else + configure_args="-DSUPERNOVA=ON -DSYSTEM_STK=ON" +fi post_install() { vmkdir usr/lib/SuperCollider/Extensions/SC3plugins/LadspaUGen diff --git a/srcpkgs/supercollider-devel b/srcpkgs/supercollider-devel new file mode 120000 index 00000000000000..94966970fa8aac --- /dev/null +++ b/srcpkgs/supercollider-devel @@ -0,0 +1 @@ +supercollider \ No newline at end of file diff --git a/srcpkgs/supercollider/patches/boost-1.89.patch b/srcpkgs/supercollider/patches/boost-1.89.patch deleted file mode 100644 index 02caa80b20a698..00000000000000 --- a/srcpkgs/supercollider/patches/boost-1.89.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -319,7 +319,7 @@ if(SYSTEM_BOOST) - # Boost >= 1.71 ships with its own Boost config file, we ignore it for now. - set(Boost_NO_BOOST_CMAKE ON) - set(Boost_USE_MULTITHREADED ON) -- find_package( Boost 1.50.0 COMPONENTS thread system filesystem program_options regex test_exec_monitor ) -+ find_package( Boost 1.50.0 COMPONENTS thread filesystem program_options test_exec_monitor ) - if (Boost_FOUND) - # we're specifically setting up the boost libraries here, so we can - # name them -@@ -327,14 +327,12 @@ if(SYSTEM_BOOST) - set_property(TARGET boost_thread_lib PROPERTY IMPORTED_LOCATION - ${Boost_THREAD_LIBRARY}) - add_library(boost_system_lib SHARED IMPORTED) -- set_property(TARGET boost_system_lib PROPERTY IMPORTED_LOCATION -- ${Boost_SYSTEM_LIBRARY}) -+ set_property(TARGET boost_system_lib PROPERTY IMPORTED_LOCATION -lc) - add_library(boost_program_options_lib SHARED IMPORTED) - set_property(TARGET boost_program_options_lib PROPERTY - IMPORTED_LOCATION ${Boost_PROGRAM_OPTIONS_LIBRARY}) - add_library(boost_regex_lib SHARED IMPORTED) -- set_property(TARGET boost_regex_lib PROPERTY IMPORTED_LOCATION -- ${Boost_REGEX_LIBRARY}) -+ set_property(TARGET boost_regex_lib PROPERTY IMPORTED_LOCATION -lc) - add_library(boost_test_exec_monitor_lib SHARED IMPORTED) - set_property(TARGET boost_test_exec_monitor_lib PROPERTY - IMPORTED_LOCATION ${Boost_TEST_EXEC_MONITOR_LIBRARY}) ---- a/external_libraries/nova-tt/nova-tt/spin_lock.hpp -+++ b/external_libraries/nova-tt/nova-tt/spin_lock.hpp -@@ -24,6 +24,7 @@ - #include - - #include -+#include - - #include "pause.hpp" - diff --git a/srcpkgs/supercollider/patches/conversion.patch b/srcpkgs/supercollider/patches/conversion.patch new file mode 100644 index 00000000000000..3de41b73bbf17a --- /dev/null +++ b/srcpkgs/supercollider/patches/conversion.patch @@ -0,0 +1,34 @@ +# Authored on Alpine Linux +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/supercollider/conversion.patch?ref_type=heads + +diff --git a/editors/sc-ide/widgets/code_editor/editor.cpp b/editors/sc-ide/widgets/code_editor/editor.cpp +index a2f99389781..e8cee85eef9 100644 +--- a/editors/sc-ide/widgets/code_editor/editor.cpp ++++ b/editors/sc-ide/widgets/code_editor/editor.cpp +@@ -698,7 +698,7 @@ void GenericCodeEditor::mousePressEvent(QMouseEvent* e) { + .arg(e->position().x()) + .arg(e->position().y()) + #endif +- .arg(e->modifiers()) ++ .arg(static_cast(e->modifiers())) + .arg(button), + true); + } +@@ -732,7 +732,7 @@ void GenericCodeEditor::mouseDoubleClickEvent(QMouseEvent* e) { + .arg(e->position().x()) + .arg(e->position().y()) + #endif +- .arg(e->modifiers()) ++ .arg(static_cast(e->modifiers())) + .arg(button), + true); + } +@@ -766,7 +766,7 @@ void GenericCodeEditor::mouseReleaseEvent(QMouseEvent* e) { + .arg(e->position().x()) + .arg(e->position().y()) + #endif +- .arg(e->modifiers()) ++ .arg(static_cast(e->modifiers())) + .arg(button), + true); + } diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index 959a32e764abc9..c94de4f6193121 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,47 +1,55 @@ # Template file for 'supercollider' pkgname=supercollider -version=3.14.0 -revision=4 +version=3.14.1 +revision=1 +# Please update the sc3-plugins template with the new version of supercollider, even if sc3-plugins itself does not have an update. build_style=cmake make_cmd=make -configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON" -hostmakedepends="emacs pkg-config qt5-host-tools qt5-qmake" -makedepends="avahi-libs-devel boost-devel-minimal fftw-devel jack-devel - libsndfile-devel libXt-devel qt5-declarative-devel qt5-location-devel - qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite - qt5-plugin-tds qt5-sensors-devel qt5-tools-devel qt5-svg-devel - qt5-webchannel-devel qt5-websockets-devel yaml-cpp-devel" +configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON + -DSYSTEM_PORTAUDIO=ON -DLIBSCSYNTH=ON" +hostmakedepends="pkg-config" +makedepends="alsa-lib-devel boost-devel-minimal jack-devel libsndfile-devel libXt-devel + qt6-base-devel qt6-declarative-devel qt6-svg-devel qt6-tools-devel qt6-websockets-devel + readline-devel yaml-cpp-devel" short_desc="Environment and programming language for real time audio synthesis" 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" -checksum=ab710e84376f5c082c92fcea7465b85d375934f3da7deed583457a0a48b0a918 +checksum=ee640c68777ae697682066ce5c4a8b7e56c5b223e76c79c13b5be5387ee55bb2 export CMAKE_GENERATOR="Unix Makefiles" build_options="webengine" -desc_option_webengine="Build Qt5 WebEngine support" +desc_option_webengine="Build Qt6 WebEngine support" if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then - if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then + if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ] && [ "$XBPS_WORDSIZE" != 32 ]; then build_options_default="webengine" fi fi if [ "$build_option_webengine" ]; then - makedepends+=" qt5-webengine-devel" + makedepends+=" qt6-webengine-devel" else configure_args+=" -DSC_USE_QTWEBENGINE=OFF" fi +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt6-base qt6-tools" + configure_args+=" -DQt6LinguistTools_DIR=/usr/lib/cmake/Qt6LinguistTools" +fi + case "$XBPS_TARGET_MACHINE" in x86_64*|i686*);; *) configure_args+=" -DSSE=OFF -DSSE2=OFF";; esac -pre_patch() { - # https://github.com/supercollider/supercollider/issues/4096 - rm -rf external_libraries/boost - sed -i 's/yaml/yaml-cpp/g' CMakeLists.txt editors/sc-ide/CMakeLists.txt +supercollider-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } }