commit: d40e8093ffb3878c266826acd0337684999d9324 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jul 28 19:24:19 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jul 28 19:27:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40e8093
media-sound/supercollider: drop 3.13.0-r2, 3.14.0_rc2 Closes: https://bugs.gentoo.org/955267 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/supercollider/Manifest | 3 - .../files/supercollider-3.13.0-boost-1.84.patch | 110 ---- .../files/supercollider-3.13.0-boost-1.87-1.patch | 584 --------------------- .../files/supercollider-3.13.0-boost-1.87-2.patch | 37 -- .../files/supercollider-3.13.0-gcc-13.patch | 15 - .../files/supercollider-3.13.0-no-ccache.patch | 169 ------ media-sound/supercollider/metadata.xml | 1 - .../supercollider/supercollider-3.13.0-r2.ebuild | 137 ----- .../supercollider/supercollider-3.14.0_rc2.ebuild | 115 ---- 9 files changed, 1171 deletions(-) diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest index 97dc7d71bbd5..bdef90f4514c 100644 --- a/media-sound/supercollider/Manifest +++ b/media-sound/supercollider/Manifest @@ -1,4 +1 @@ -DIST SuperCollider-3.13.0-Source.tar.bz2 18685091 BLAKE2B a5e57a17f93e40848b2044ee0791179f857d144eabb7f4d74580b2eebd49a31d6ec671a0526236c5b906aadeb455e5a7ad18cacb79ed214076d6bceca39ea2ae SHA512 a60a128f7646f077f91adae666fa4014529aa9df78cf0dfe5d68c9bd6447f008af7da2970b8736f3f29d0adbaf67bce680a8201fcbe7e1aba29c3499a57f89cd DIST SuperCollider-3.14.0-Source.tar.bz2 20936611 BLAKE2B 50c9829fcd17ceb97f2e53d9422318b413b93ae65a02a722a03cbe405c6fa4a1ea058e527f7c4e7b800f1a544710ba31b8102b48324778505d67dd2a8bb9d1ea SHA512 79dab27ed0787ab8ae1eeabf4baa87d360a91a41b256669be6b39f651d3cb2d33225d9c556348afbbead3b85c4f9640f9af6e6a323e4742bd22d9ea7668f836d -DIST SuperCollider-3.14.0-rc2-Source.tar.bz2 20937744 BLAKE2B a02ff7c7a00775732f56baa1afed1ec9d0c574f519ea401e9d3bc666526e4c6f682924e8df9cf931c315649c7dffd6e2bf0a3ea101672d11bbc2b3a20805be87 SHA512 8f6dd33d05bc9d5c6401b0e5ea9c9d474f966e893a6a19dd7bbaa7d0cd0b16b9ad29d26ad7cc523b9a6f6650ab0d3d0758a555529dc435579869bdcff7917976 -DIST supercollider-3.13.0-boost-1.85.patch.xz 11500 BLAKE2B 51a5210927df9199790ea64bbcdfe68aa233fb5777b57576295e2be7f7abd48baa9091e4139eef9ae23cbbc22613961ebd2ab60f26f0e02a8a62d68baa712af6 SHA512 dacd6fa4686a11ad06f2257155ee434173e343279170a3173a8173563309337f9a58075125acfaa53620e2a0a8fb445b5698f295ce53ac9f188e1502cebcb14f diff --git a/media-sound/supercollider/files/supercollider-3.13.0-boost-1.84.patch b/media-sound/supercollider/files/supercollider-3.13.0-boost-1.84.patch deleted file mode 100644 index d3b2340a3d61..000000000000 --- a/media-sound/supercollider/files/supercollider-3.13.0-boost-1.84.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 6e4e12826fd144c874c93c2efb669fbb119b831a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Tue, 30 Jan 2024 23:56:14 +0100 -Subject: [PATCH] Import boost_string_file.hpp from boost-1.83 and put it to - use immediately - -string_file.hpp was deprecated in boost-1.79.0 and removed in 1.84.0 - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - common/boost_string_file.hpp | 59 ++++++++++++++++++++++++++++++++++ - lang/LangSource/PyrLexer.cpp | 2 +- - server/scsynth/SC_GraphDef.cpp | 2 +- - 3 files changed, 61 insertions(+), 2 deletions(-) - create mode 100644 common/boost_string_file.hpp - -diff --git a/common/boost_string_file.hpp b/common/boost_string_file.hpp -new file mode 100644 -index 000000000..1ccb63de6 ---- /dev/null -+++ b/common/boost_string_file.hpp -@@ -0,0 +1,59 @@ -+// filesystem/string_file.hpp --------------------------------------------------------// -+ -+// Copyright Beman Dawes 2015 -+ -+// Distributed under the Boost Software License, Version 1.0. -+// See http://www.boost.org/LICENSE_1_0.txt -+ -+// Library home page: http://www.boost.org/libs/filesystem -+ -+#ifndef BOOST_FILESYSTEM_STRING_FILE_HPP -+#define BOOST_FILESYSTEM_STRING_FILE_HPP -+ -+#include <boost/filesystem/config.hpp> -+ -+#include <cstddef> -+#include <limits> -+#include <string> -+#include <ios> -+#include <stdexcept> -+#include <boost/cstdint.hpp> -+#include <boost/filesystem/path.hpp> -+#include <boost/filesystem/fstream.hpp> -+#include <boost/filesystem/operations.hpp> -+ -+#include <boost/filesystem/detail/header.hpp> // must be the last #include -+ -+namespace boost { -+namespace filesystem { -+ -+inline void save_string_file(path const& p, std::string const& str) -+{ -+ filesystem::ofstream file; -+ file.exceptions(std::ios_base::failbit | std::ios_base::badbit); -+ file.open(p, std::ios_base::binary); -+ const std::size_t sz = str.size(); -+ if (BOOST_UNLIKELY(sz > static_cast< boost::uintmax_t >((std::numeric_limits< std::streamsize >::max)()))) -+ BOOST_FILESYSTEM_THROW(std::length_error("String size exceeds max write size")); -+ file.write(str.c_str(), static_cast< std::streamsize >(sz)); -+} -+ -+inline void load_string_file(path const& p, std::string& str) -+{ -+ filesystem::ifstream file; -+ file.exceptions(std::ios_base::failbit | std::ios_base::badbit); -+ file.open(p, std::ios_base::binary); -+ const boost::uintmax_t sz = filesystem::file_size(p); -+ if (BOOST_UNLIKELY(sz > static_cast< boost::uintmax_t >((std::numeric_limits< std::streamsize >::max)()))) -+ BOOST_FILESYSTEM_THROW(std::length_error("File size exceeds max read size")); -+ str.resize(static_cast< std::size_t >(sz), '\0'); -+ if (sz > 0u) -+ file.read(&str[0], static_cast< std::streamsize >(sz)); -+} -+ -+} // namespace filesystem -+} // namespace boost -+ -+#include <boost/filesystem/detail/footer.hpp> -+ -+#endif // BOOST_FILESYSTEM_STRING_FILE_HPP -diff --git a/lang/LangSource/PyrLexer.cpp b/lang/LangSource/PyrLexer.cpp -index 7ebe3d726..06c1454ca 100644 ---- a/lang/LangSource/PyrLexer.cpp -+++ b/lang/LangSource/PyrLexer.cpp -@@ -38,7 +38,7 @@ - - #include <boost/filesystem/path.hpp> - #include <boost/filesystem/operations.hpp> --#include <boost/filesystem/string_file.hpp> -+#include "boost_string_file.hpp" - - #include "PyrParseNode.h" - #include "Bison/lang11d_tab.h" -diff --git a/server/scsynth/SC_GraphDef.cpp b/server/scsynth/SC_GraphDef.cpp -index 957aca193..5f8f15741 100644 ---- a/server/scsynth/SC_GraphDef.cpp -+++ b/server/scsynth/SC_GraphDef.cpp -@@ -46,7 +46,7 @@ - #include <string> - - #include <boost/filesystem/operations.hpp> // recursive_directory_iterator --#include <boost/filesystem/string_file.hpp> // load_string_file -+#include "boost_string_file.hpp" // load_string_file - - namespace bfs = boost::filesystem; - --- -2.43.0 - diff --git a/media-sound/supercollider/files/supercollider-3.13.0-boost-1.87-1.patch b/media-sound/supercollider/files/supercollider-3.13.0-boost-1.87-1.patch deleted file mode 100644 index e3aaee971e98..000000000000 --- a/media-sound/supercollider/files/supercollider-3.13.0-boost-1.87-1.patch +++ /dev/null @@ -1,584 +0,0 @@ -From 1bdc50ab4172c229e130120e9e075e5c3319f9f0 Mon Sep 17 00:00:00 2001 -From: Dennis Scheiba <[email protected]> -Date: Thu, 19 Dec 2024 15:58:01 +0100 -Subject: [PATCH 1/5] replace deprecated `boost::asio::io_service` with - `boost::asio::io_context` (#6572) - ---- - QtCollider/LanguageClient.cpp | 2 +- - lang/LangPrimSource/OSCData.cpp | 2 +- - lang/LangPrimSource/PyrSerialPrim.cpp | 4 ++-- - lang/LangPrimSource/SC_ComPort.cpp | 20 +++++++++---------- - lang/LangPrimSource/SC_ComPort.h | 2 +- - lang/LangSource/SC_TerminalClient.cpp | 24 +++++++++++------------ - lang/LangSource/SC_TerminalClient.h | 8 ++++---- - server/scsynth/SC_ComPort.cpp | 18 ++++++++--------- - server/supernova/sc/sc_osc_handler.hpp | 6 +++--- - server/supernova/utilities/osc_server.hpp | 13 ++++++------ - 10 files changed, 49 insertions(+), 50 deletions(-) - -diff --git a/QtCollider/LanguageClient.cpp b/QtCollider/LanguageClient.cpp -index 00576ebd04a..83c73a5bf83 100644 ---- a/QtCollider/LanguageClient.cpp -+++ b/QtCollider/LanguageClient.cpp -@@ -70,7 +70,7 @@ void LangClient::customEvent(QEvent* e) { - - case Event_SCRequest_Work: - QApplication::removePostedEvents(this, Event_SCRequest_Work); -- mIoService.poll(); -+ mIoContext.poll(); - break; - case Event_SCRequest_Quit: { - int code = static_cast<SCRequestEvent*>(e)->data.toInt(); -diff --git a/lang/LangPrimSource/OSCData.cpp b/lang/LangPrimSource/OSCData.cpp -index 0c0d7f9f7ff..bbb3caa8006 100644 ---- a/lang/LangPrimSource/OSCData.cpp -+++ b/lang/LangPrimSource/OSCData.cpp -@@ -934,7 +934,7 @@ void cleanup_OSC() { - #endif - } - --extern boost::asio::io_service ioService; -+extern boost::asio::io_context ioContext; - - static int prGetHostByName(VMGlobals* g, int numArgsPushed) { - PyrSlot* a = g->sp; -diff --git a/lang/LangPrimSource/PyrSerialPrim.cpp b/lang/LangPrimSource/PyrSerialPrim.cpp -index cc56abdcead..bcfbeda5551 100644 ---- a/lang/LangPrimSource/PyrSerialPrim.cpp -+++ b/lang/LangPrimSource/PyrSerialPrim.cpp -@@ -49,7 +49,7 @@ - using boost::uint8_t; - using boost::asio::serial_port; - --extern boost::asio::io_service ioService; // defined in SC_ComPort.cpp -+extern boost::asio::io_context ioContext; // defined in SC_ComPort.cpp - - /** - * \brief Serial port abstraction -@@ -104,7 +104,7 @@ class SerialPort { - */ - SerialPort(PyrObject* obj, const char* serialport, const Options& options): - m_obj(obj), -- m_port(ioService, serialport), -+ m_port(ioContext, serialport), - m_options(options), - m_rxErrors(0) { - using namespace boost::asio; -diff --git a/lang/LangPrimSource/SC_ComPort.cpp b/lang/LangPrimSource/SC_ComPort.cpp -index 78f01b389d9..aa48e078311 100644 ---- a/lang/LangPrimSource/SC_ComPort.cpp -+++ b/lang/LangPrimSource/SC_ComPort.cpp -@@ -46,12 +46,12 @@ void ProcessRawMessage(std::unique_ptr<char[]> inData, size_t inSize, ReplyAddre - ////////////////////////////////////////////////////////////////////////////////////////////////////////// - - SC_Thread gAsioThread; --boost::asio::io_service ioService; -+boost::asio::io_context ioContext; - - - static void asioFunction() { -- boost::asio::io_service::work work(ioService); -- ioService.run(); -+ boost::asio::io_context::work work(ioContext); -+ ioContext.run(); - } - - void startAsioThread() { -@@ -60,7 +60,7 @@ void startAsioThread() { - } - - void stopAsioThread() { -- ioService.stop(); -+ ioContext.stop(); - gAsioThread.join(); - } - -@@ -66,7 +66,7 @@ - - ////////////////////////////////////////////////////////////////////////////////////////////////////////// - --SC_UdpInPort::SC_UdpInPort(int inPortNum, int portsToCheck): mPortNum(inPortNum), udpSocket(ioService) { -+SC_UdpInPort::SC_UdpInPort(int inPortNum, int portsToCheck): mPortNum(inPortNum), udpSocket(ioContext) { - using namespace boost::asio; - - BOOST_AUTO(protocol, ip::udp::v4()); -@@ -142,7 +142,7 @@ - ////////////////////////////////////////////////////////////////////////////////////////////////////////// - - SC_TcpInPort::SC_TcpInPort(int inPortNum, int inMaxConnections, int inBacklog): -- acceptor(ioService, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), inPortNum)), -+ acceptor(ioContext, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), inPortNum)), - mPortNum(inPortNum) { - // FIXME: handle max connections - // FIXME: backlog??? -@@ -151,7 +151,7 @@ - } - - void SC_TcpInPort::startAccept() { -- SC_TcpConnection::pointer newConnection(new SC_TcpConnection(ioService, this)); -+ SC_TcpConnection::pointer newConnection(new SC_TcpConnection(ioContext, this)); - - acceptor.async_accept( - newConnection->socket, -@@ -210,7 +210,7 @@ - ////////////////////////////////////////////////////////////////////////////////////////////////////////// - - SC_TcpClientPort::SC_TcpClientPort(unsigned long inAddress, int inPort, ClientNotifyFunc notifyFunc, void* clientData): -- socket(ioService), -+ socket(ioContext), - endpoint(boost::asio::ip::address_v4(inAddress), inPort), - mClientNotifyFunc(notifyFunc), - mClientData(clientData) { -diff --git a/lang/LangPrimSource/SC_ComPort.h b/lang/LangPrimSource/SC_ComPort.h -index 0e192e91914..99d23b3b27b 100644 ---- a/lang/LangPrimSource/SC_ComPort.h -+++ b/lang/LangPrimSource/SC_ComPort.h -@@ -63,8 +63,8 @@ - typedef boost::shared_ptr<SC_TcpConnection> pointer; - boost::asio::ip::tcp::socket socket; - -- SC_TcpConnection(boost::asio::io_service& ioService, class SC_TcpInPort* parent): -- socket(ioService), -+ SC_TcpConnection(boost::asio::io_context& ioContext, class SC_TcpInPort* parent): -+ socket(ioContext), - mParent(parent) {} - - void start(); -diff --git a/lang/LangSource/SC_TerminalClient.cpp b/lang/LangSource/SC_TerminalClient.cpp -index 13f11a11176..3a091514ab5 100644 ---- a/lang/LangSource/SC_TerminalClient.cpp -+++ b/lang/LangSource/SC_TerminalClient.cpp -@@ -75,12 +75,12 @@ SC_TerminalClient::SC_TerminalClient(const char* name): - SC_LanguageClient(name), - mReturnCode(0), - mUseReadline(false), -- mWork(mIoService), -- mTimer(mIoService), -+ mWork(mIoContext), -+ mTimer(mIoContext), - #ifndef _WIN32 -- mStdIn(mInputService, STDIN_FILENO) -+ mStdIn(mInputContext, STDIN_FILENO) - #else -- mStdIn(mInputService, GetStdHandle(STD_INPUT_HANDLE)) -+ mStdIn(mInputContext, GetStdHandle(STD_INPUT_HANDLE)) - #endif - { - } -@@ -360,19 +360,19 @@ void SC_TerminalClient::onLibraryStartup() { - void SC_TerminalClient::sendSignal(Signal sig) { - switch (sig) { - case sig_input: -- mIoService.post(boost::bind(&SC_TerminalClient::interpretInput, this)); -+ mIoContext.post(boost::bind(&SC_TerminalClient::interpretInput, this)); - break; - - case sig_recompile: -- mIoService.post(boost::bind(&SC_TerminalClient::recompileLibrary, this)); -+ mIoContext.post(boost::bind(&SC_TerminalClient::recompileLibrary, this)); - break; - - case sig_sched: -- mIoService.post(boost::bind(&SC_TerminalClient::tick, this, boost::system::error_code())); -+ mIoContext.post(boost::bind(&SC_TerminalClient::tick, this, boost::system::error_code())); - break; - - case sig_stop: -- mIoService.post(boost::bind(&SC_TerminalClient::stopMain, this)); -+ mIoContext.post(boost::bind(&SC_TerminalClient::stopMain, this)); - break; - } - } -@@ -447,7 +447,7 @@ void SC_TerminalClient::tick(const boost::system::error_code& error) { - } - } - --void SC_TerminalClient::commandLoop() { mIoService.run(); } -+void SC_TerminalClient::commandLoop() { mIoContext.run(); } - - void SC_TerminalClient::daemonLoop() { commandLoop(); } - -@@ -614,8 +614,8 @@ void SC_TerminalClient::inputThreadFn() { - - startInputRead(); - -- boost::asio::io_service::work work(mInputService); -- mInputService.run(); -+ boost::asio::io_context::work work(mInputContext); -+ mInputContext.run(); - } - - -@@ -662,7 +662,7 @@ void SC_TerminalClient::startInput() { - } - - void SC_TerminalClient::endInput() { -- mInputService.stop(); -+ mInputContext.stop(); - mStdIn.cancel(); - #ifdef _WIN32 - // Note this breaks Windows XP compatibility, since this function is only defined in Vista and later -diff --git a/lang/LangSource/SC_TerminalClient.h b/lang/LangSource/SC_TerminalClient.h -index 373e82bb830..0ea3cdc35b3 100644 ---- a/lang/LangSource/SC_TerminalClient.h -+++ b/lang/LangSource/SC_TerminalClient.h -@@ -91,7 +91,7 @@ class SCLANG_DLLEXPORT SC_TerminalClient : public SC_LanguageClient { - // NOTE: It may be called from any thread, and with interpreter locked. - virtual void sendSignal(Signal code); - -- void stop() { mIoService.stop(); } -+ void stop() { mIoContext.stop(); } - - protected: - bool parseOptions(int& argc, char**& argv, Options& opt); -@@ -151,14 +151,14 @@ class SCLANG_DLLEXPORT SC_TerminalClient : public SC_LanguageClient { - - // app-clock io service - protected: -- boost::asio::io_service mIoService; -+ boost::asio::io_context mIoContext; - - private: -- boost::asio::io_service::work mWork; -+ boost::asio::io_context::work mWork; - boost::asio::basic_waitable_timer<std::chrono::system_clock> mTimer; - - // input io service -- boost::asio::io_service mInputService; -+ boost::asio::io_context mInputContext; - SC_Thread mInputThread; - void inputThreadFn(); - -diff --git a/server/scsynth/SC_ComPort.cpp b/server/scsynth/SC_ComPort.cpp -index 5541f509bbd..a8ebbfe71c6 100644 ---- a/server/scsynth/SC_ComPort.cpp -+++ b/server/scsynth/SC_ComPort.cpp -@@ -145,7 +145,7 @@ static bool UnrollOSCPacket(World* inWorld, int inSize, char* inData, OSC_Packet - ///////////////////////////////////////////////////////////////////////////////////////////////////////// - - SC_Thread gAsioThread; --boost::asio::io_service ioService; -+boost::asio::io_context ioContext; - - const int kTextBufSize = 65536; - -@@ -252,7 +252,7 @@ class SC_UdpInPort { - mWorld(world), - mPortNum(inPortNum), - mbindTo(bindTo), -- udpSocket(ioService) { -+ udpSocket(ioContext) { - using namespace boost::asio; - BOOST_AUTO(protocol, ip::udp::v4()); - udpSocket.open(protocol); -@@ -282,9 +282,9 @@ class SC_TcpConnection : public boost::enable_shared_from_this<SC_TcpConnection> - typedef boost::shared_ptr<SC_TcpConnection> pointer; - boost::asio::ip::tcp::socket socket; - -- SC_TcpConnection(struct World* world, boost::asio::io_service& ioService, class SC_TcpInPort* parent): -+ SC_TcpConnection(struct World* world, boost::asio::io_context& ioContext, class SC_TcpInPort* parent): - mWorld(world), -- socket(ioService), -+ socket(ioContext), - mParent(parent) {} - - ~SC_TcpConnection(); -@@ -400,7 +400,7 @@ class SC_TcpInPort { - public: - SC_TcpInPort(struct World* world, const std::string& bindTo, int inPortNum, int inMaxConnections, int inBacklog): - mWorld(world), -- acceptor(ioService, boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(bindTo), inPortNum)), -+ acceptor(ioContext, boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(bindTo), inPortNum)), - mAvailableConnections(inMaxConnections) { - // FIXME: backlog??? - -@@ -419,7 +419,7 @@ class SC_TcpInPort { - void startAccept() { - if (mAvailableConnections > 0) { - --mAvailableConnections; -- SC_TcpConnection::pointer newConnection(new SC_TcpConnection(mWorld, ioService, this)); -+ SC_TcpConnection::pointer newConnection(new SC_TcpConnection(mWorld, ioContext, this)); - - acceptor.async_accept( - newConnection->socket, -@@ -453,8 +453,8 @@ static void asioFunction() { - nova::thread_set_priority_rt(priority); - #endif - -- boost::asio::io_service::work work(ioService); -- ioService.run(); -+ boost::asio::io_context::work work(ioContext); -+ ioContext.run(); - } - - void startAsioThread() { -@@ -463,7 +463,7 @@ void startAsioThread() { - } - - void stopAsioThread() { -- ioService.stop(); -+ ioContext.stop(); - gAsioThread.join(); - } - -diff --git a/server/supernova/sc/sc_osc_handler.hpp b/server/supernova/sc/sc_osc_handler.hpp -index ae75c9dc05a..ce342c419e1 100644 ---- a/server/supernova/sc/sc_osc_handler.hpp -+++ b/server/supernova/sc/sc_osc_handler.hpp -@@ -95,7 +95,7 @@ class sc_notify_observers { - public: - typedef enum { no_error = 0, already_registered = -1, not_registered = -2 } error_code; - -- sc_notify_observers(boost::asio::io_service& io_service): udp_socket(io_service) {} -+ sc_notify_observers(boost::asio::io_context& io_context): udp_socket(io_context) {} - - int add_observer(endpoint_ptr const& ep); - int remove_observer(endpoint_ptr const& ep); -@@ -186,8 +186,8 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer - - public: - sc_osc_handler(server_arguments const& args): -- sc_notify_observers(detail::network_thread::io_service_), -- tcp_acceptor_(detail::network_thread::io_service_), -+ sc_notify_observers(detail::network_thread::io_context_), -+ tcp_acceptor_(detail::network_thread::io_context_), - tcp_password_(args.server_password.size() ? args.server_password.c_str() : nullptr) { - if (!args.non_rt) { - if (args.tcp_port && !open_socket(IPPROTO_TCP, args.socket_address, args.tcp_port)) -diff --git a/server/supernova/utilities/osc_server.hpp b/server/supernova/utilities/osc_server.hpp -index 1746fa172b3..d209fed8983 100644 ---- a/server/supernova/utilities/osc_server.hpp -+++ b/server/supernova/utilities/osc_server.hpp -@@ -30,7 +30,6 @@ - # define BOOST_ASIO_HAS_STD_STRING_VIEW 1 - #endif - --#include <boost/asio/io_service.hpp> - #include <boost/asio/ip/udp.hpp> - - #include "branch_hints.hpp" -@@ -56,8 +55,8 @@ class network_thread { - name_thread("Network Receive"); - - sem.post(); -- io_service::work work(io_service_); -- io_service_.run(); -+ io_context::work work(io_context_); -+ io_context_.run(); - }); - sem.wait(); - } -@@ -65,20 +64,20 @@ class network_thread { - ~network_thread(void) { - if (!thread_.joinable()) - return; -- io_service_.stop(); -+ io_context_.stop(); - thread_.join(); - } - -- io_service& get_io_service(void) { return io_service_; } -+ io_context& get_io_context(void) { return io_context_; } - - void send_udp(const char* data, unsigned int size, udp::endpoint const& receiver) { -- udp::socket socket(io_service_); -+ udp::socket socket(io_context_); - socket.open(udp::v4()); - socket.send_to(boost::asio::buffer(data, size), receiver); - } - - protected: -- io_service io_service_; -+ io_context io_context_; - - private: - semaphore sem; - -From 8015d8ebf26c1f95a0a646775f1e75397966b294 Mon Sep 17 00:00:00 2001 -From: Dennis Scheiba <[email protected]> -Date: Thu, 19 Dec 2024 16:41:44 +0100 -Subject: [PATCH 2/5] replace deprecated `boost::asio::io_context::work` with - `boost::asio::make_work_guard` - ---- - lang/LangPrimSource/SC_ComPort.cpp | 3 ++- - lang/LangSource/SC_TerminalClient.cpp | 5 +++-- - lang/LangSource/SC_TerminalClient.h | 2 +- - server/scsynth/SC_ComPort.cpp | 3 ++- - server/supernova/utilities/osc_server.hpp | 3 ++- - 5 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/lang/LangPrimSource/SC_ComPort.cpp b/lang/LangPrimSource/SC_ComPort.cpp -index aa48e078311..57b0fc5e89f 100644 ---- a/lang/LangPrimSource/SC_ComPort.cpp -+++ b/lang/LangPrimSource/SC_ComPort.cpp -@@ -50,7 +50,8 @@ boost::asio::io_context ioContext; - - - static void asioFunction() { -- boost::asio::io_context::work work(ioContext); -+ boost::asio::executor_work_guard<boost::asio::io_context::executor_type> work = -+ boost::asio::make_work_guard(ioContext); - ioContext.run(); - } - -diff --git a/lang/LangSource/SC_TerminalClient.cpp b/lang/LangSource/SC_TerminalClient.cpp -index 3a091514ab5..2c2a1a2eaac 100644 ---- a/lang/LangSource/SC_TerminalClient.cpp -+++ b/lang/LangSource/SC_TerminalClient.cpp -@@ -75,7 +75,7 @@ SC_TerminalClient::SC_TerminalClient(const char* name): - SC_LanguageClient(name), - mReturnCode(0), - mUseReadline(false), -- mWork(mIoContext), -+ mWork(boost::asio::make_work_guard(mIoContext)), - mTimer(mIoContext), - #ifndef _WIN32 - mStdIn(mInputContext, STDIN_FILENO) -@@ -614,7 +614,8 @@ void SC_TerminalClient::inputThreadFn() { - - startInputRead(); - -- boost::asio::io_context::work work(mInputContext); -+ boost::asio::executor_work_guard<boost::asio::io_context::executor_type> work = -+ boost::asio::make_work_guard(mInputContext); - mInputContext.run(); - } - -diff --git a/lang/LangSource/SC_TerminalClient.h b/lang/LangSource/SC_TerminalClient.h -index 0ea3cdc35b3..b4cf0e96482 100644 ---- a/lang/LangSource/SC_TerminalClient.h -+++ b/lang/LangSource/SC_TerminalClient.h -@@ -154,7 +154,7 @@ class SCLANG_DLLEXPORT SC_TerminalClient : public SC_LanguageClient { - boost::asio::io_context mIoContext; - - private: -- boost::asio::io_context::work mWork; -+ boost::asio::executor_work_guard<boost::asio::io_context::executor_type> mWork; - boost::asio::basic_waitable_timer<std::chrono::system_clock> mTimer; - - // input io service -diff --git a/server/scsynth/SC_ComPort.cpp b/server/scsynth/SC_ComPort.cpp -index a8ebbfe71c6..1e6f6d0784e 100644 ---- a/server/scsynth/SC_ComPort.cpp -+++ b/server/scsynth/SC_ComPort.cpp -@@ -453,7 +453,8 @@ static void asioFunction() { - nova::thread_set_priority_rt(priority); - #endif - -- boost::asio::io_context::work work(ioContext); -+ boost::asio::executor_work_guard<boost::asio::io_context::executor_type> work = -+ boost::asio::make_work_guard(ioContext); - ioContext.run(); - } - -diff --git a/server/supernova/utilities/osc_server.hpp b/server/supernova/utilities/osc_server.hpp -index d209fed8983..cbecfc23d7c 100644 ---- a/server/supernova/utilities/osc_server.hpp -+++ b/server/supernova/utilities/osc_server.hpp -@@ -55,7 +55,8 @@ class network_thread { - name_thread("Network Receive"); - - sem.post(); -- io_context::work work(io_context_); -+ boost::asio::executor_work_guard<boost::asio::io_context::executor_type> work = -+ boost::asio::make_work_guard(io_context_); - io_context_.run(); - }); - sem.wait(); - -From ec58a79c2f6bc474d6835d6228ccb7e397465fe5 Mon Sep 17 00:00:00 2001 -From: Dennis Scheiba <[email protected]> -Date: Fri, 20 Dec 2024 00:00:20 +0100 -Subject: [PATCH 3/5] replace deprecated `address::from_string` with - `make_address` - ---- - server/scsynth/SC_ComPort.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/server/scsynth/SC_ComPort.cpp b/server/scsynth/SC_ComPort.cpp -index 1e6f6d0784e..272eeebfbc2 100644 ---- a/server/scsynth/SC_ComPort.cpp -+++ b/server/scsynth/SC_ComPort.cpp -@@ -257,7 +257,7 @@ class SC_UdpInPort { - BOOST_AUTO(protocol, ip::udp::v4()); - udpSocket.open(protocol); - -- udpSocket.bind(ip::udp::endpoint(boost::asio::ip::address::from_string(bindTo), inPortNum)); -+ udpSocket.bind(ip::udp::endpoint(boost::asio::ip::make_address(bindTo), inPortNum)); - - boost::asio::socket_base::send_buffer_size option(65536); - udpSocket.set_option(option); -@@ -400,7 +400,7 @@ class SC_TcpInPort { - public: - SC_TcpInPort(struct World* world, const std::string& bindTo, int inPortNum, int inMaxConnections, int inBacklog): - mWorld(world), -- acceptor(ioContext, boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(bindTo), inPortNum)), -+ acceptor(ioContext, boost::asio::ip::tcp::endpoint(boost::asio::ip::make_address(bindTo), inPortNum)), - mAvailableConnections(inMaxConnections) { - // FIXME: backlog??? - - -From 2cadfb7de577defb1664d7cc846d379721f13fa7 Mon Sep 17 00:00:00 2001 -From: Dennis Scheiba <[email protected]> -Date: Fri, 20 Dec 2024 00:16:23 +0100 -Subject: [PATCH 4/5] replace deprecated `io_context.post` with - `boost::asio::post` - ---- - lang/LangSource/SC_TerminalClient.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lang/LangSource/SC_TerminalClient.cpp b/lang/LangSource/SC_TerminalClient.cpp -index 2c2a1a2eaac..551369304a9 100644 ---- a/lang/LangSource/SC_TerminalClient.cpp -+++ b/lang/LangSource/SC_TerminalClient.cpp -@@ -360,19 +360,19 @@ void SC_TerminalClient::onLibraryStartup() { - void SC_TerminalClient::sendSignal(Signal sig) { - switch (sig) { - case sig_input: -- mIoContext.post(boost::bind(&SC_TerminalClient::interpretInput, this)); -+ boost::asio::post(boost::bind(&SC_TerminalClient::interpretInput, this)); - break; - - case sig_recompile: -- mIoContext.post(boost::bind(&SC_TerminalClient::recompileLibrary, this)); -+ boost::asio::post(boost::bind(&SC_TerminalClient::recompileLibrary, this)); - break; - - case sig_sched: -- mIoContext.post(boost::bind(&SC_TerminalClient::tick, this, boost::system::error_code())); -+ boost::asio::post(boost::bind(&SC_TerminalClient::tick, this, boost::system::error_code())); - break; - - case sig_stop: -- mIoContext.post(boost::bind(&SC_TerminalClient::stopMain, this)); -+ boost::asio::post(boost::bind(&SC_TerminalClient::stopMain, this)); - break; - } - } - -From e085858742c1afcc9af9a3ecb6a98cc6f5a9269c Mon Sep 17 00:00:00 2001 -From: Dennis Scheiba <[email protected]> -Date: Fri, 20 Dec 2024 00:27:36 +0100 -Subject: [PATCH 5/5] replace deprecated `to_ulong` with `to_uint` - ---- - lang/LangPrimSource/OSCData.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lang/LangPrimSource/OSCData.cpp b/lang/LangPrimSource/OSCData.cpp -index bbb3caa8006..65229f1c3a7 100644 ---- a/lang/LangPrimSource/OSCData.cpp -+++ b/lang/LangPrimSource/OSCData.cpp -@@ -745,7 +745,7 @@ static PyrObject* ConvertReplyAddress(ReplyAddress* inReply) { - VMGlobals* g = gMainVMGlobals; - PyrObject* obj = instantiateObject(g->gc, s_netaddr->u.classobj, 2, true, false); - PyrSlot* slots = obj->slots; -- SetInt(slots + 0, inReply->mAddress.to_v4().to_ulong()); -+ SetInt(slots + 0, inReply->mAddress.to_v4().to_uint()); - SetInt(slots + 1, inReply->mPort); - return obj; - } diff --git a/media-sound/supercollider/files/supercollider-3.13.0-boost-1.87-2.patch b/media-sound/supercollider/files/supercollider-3.13.0-boost-1.87-2.patch deleted file mode 100644 index 87fdefce19db..000000000000 --- a/media-sound/supercollider/files/supercollider-3.13.0-boost-1.87-2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7d481eff478b1da1dc7048c90021f5fd7a83b35c Mon Sep 17 00:00:00 2001 -From: Dennis Scheiba <[email protected]> -Date: Wed, 15 Jan 2025 14:22:27 +0100 -Subject: [PATCH] fix asio post invocation for SC_TerminalClient - ---- - lang/LangSource/SC_TerminalClient.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lang/LangSource/SC_TerminalClient.cpp b/lang/LangSource/SC_TerminalClient.cpp -index 551369304a9..330716467a3 100644 ---- a/lang/LangSource/SC_TerminalClient.cpp -+++ b/lang/LangSource/SC_TerminalClient.cpp -@@ -360,19 +360,19 @@ void SC_TerminalClient::onLibraryStartup() { - void SC_TerminalClient::sendSignal(Signal sig) { - switch (sig) { - case sig_input: -- boost::asio::post(boost::bind(&SC_TerminalClient::interpretInput, this)); -+ boost::asio::post(mIoContext, [this] { this->interpretInput(); }); - break; - - case sig_recompile: -- boost::asio::post(boost::bind(&SC_TerminalClient::recompileLibrary, this)); -+ boost::asio::post(mIoContext, [this] { this->recompileLibrary(); }); - break; - - case sig_sched: -- boost::asio::post(boost::bind(&SC_TerminalClient::tick, this, boost::system::error_code())); -+ boost::asio::post(mIoContext, [this] { this->tick(boost::system::error_code()); }); - break; - - case sig_stop: -- boost::asio::post(boost::bind(&SC_TerminalClient::stopMain, this)); -+ boost::asio::post(mIoContext, [this] { this->stopMain(); }); - break; - } - } diff --git a/media-sound/supercollider/files/supercollider-3.13.0-gcc-13.patch b/media-sound/supercollider/files/supercollider-3.13.0-gcc-13.patch deleted file mode 100644 index 1ff8f5f92203..000000000000 --- a/media-sound/supercollider/files/supercollider-3.13.0-gcc-13.patch +++ /dev/null @@ -1,15 +0,0 @@ -Gentoo-bug: https://bugs.gentoo.org/905127 -Upstream issue: https://github.com/supercollider/supercollider/issues/6021 - -diff --git a/common/SC_PaUtils.cpp b/common/SC_PaUtils.cpp -index e0f562c..9e45c63 100644 ---- a/common/SC_PaUtils.cpp -+++ b/common/SC_PaUtils.cpp -@@ -3,6 +3,7 @@ - #include "SC_PaUtils.hpp" - #include <cstring> - #include <cstdio> -+#include <cstdint> - - #ifdef __APPLE__ - # include <pa_mac_core.h> diff --git a/media-sound/supercollider/files/supercollider-3.13.0-no-ccache.patch b/media-sound/supercollider/files/supercollider-3.13.0-no-ccache.patch deleted file mode 100644 index ad3b03509e61..000000000000 --- a/media-sound/supercollider/files/supercollider-3.13.0-no-ccache.patch +++ /dev/null @@ -1,169 +0,0 @@ -From bab60d91bd362fd1e46b79d64aaba747fe7c60fa Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 31 Jan 2024 00:31:11 +0100 -Subject: [PATCH] Make ccache detection an option - -Arguably it should not even be enabled by default, -but at least it should be optional. - -Consolidate ccache detection in one block. - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 122 +++++++++++++++++++++++++------------------------ - 1 file changed, 62 insertions(+), 60 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ad5ea5b49..73411ae9e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,32 +46,6 @@ CONFIGURE_FILE( - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) - --# workaround for using ccache with Xcode generator --# thanks to Craig Scott: https://crascit.com/2016/04/09/using-ccache-with-cmake/ --get_property(RULE_LAUNCH_COMPILE GLOBAL PROPERTY RULE_LAUNCH_COMPILE) --if(RULE_LAUNCH_COMPILE AND CMAKE_GENERATOR STREQUAL "Xcode") -- -- # find ccache -- find_program(CCACHE_PROGRAM ccache) -- -- message(STATUS "Xcode and ccache detected: using ccache to speed up build process") -- -- # Set up wrapper scripts -- set(SC_LAUNCH_C_SCRIPT "${CMAKE_BINARY_DIR}/launch-c") -- set(SC_LAUNCH_CXX_SCRIPT "${CMAKE_BINARY_DIR}/launch-cxx") -- -- configure_file("cmake_modules/launch-c.in" launch-c) -- configure_file("cmake_modules/launch-cxx.in" launch-cxx) -- execute_process(COMMAND chmod a+rx "${SC_LAUNCH_C_SCRIPT}" "${SC_LAUNCH_CXX_SCRIPT}") -- -- # Set Xcode project attributes to route compilation and linking -- # through our scripts -- set(CMAKE_XCODE_ATTRIBUTE_CC "${SC_LAUNCH_C_SCRIPT}") -- set(CMAKE_XCODE_ATTRIBUTE_CXX "${SC_LAUNCH_CXX_SCRIPT}") -- set(CMAKE_XCODE_ATTRIBUTE_LD "${SC_LAUNCH_C_SCRIPT}") -- set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${SC_LAUNCH_CXX_SCRIPT}") --endif() -- - ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - -@@ -147,44 +121,11 @@ endif() - - add_definitions(-DBOOST_CHRONO_HEADER_ONLY -DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE) - -- --############################################# --# 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}" ) -- if(NOT CMAKE_GENERATOR MATCHES "Xcode" AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio")) # we already post a message when using Xcode or MSVC -- message(STATUS "Found ccache at ${CCacheExectuable}: using ccache to speed up build process") -- endif() -- -- # fix for Visual Studio adapted from https://github.com/ccache/ccache/wiki/MS-Visual-Studio#usage -- # NOTE: there is an issue with ccache installed from chocolatey -- # since chocolatey puts a "shim" as opposed to the actual executable in the PATH -- # the solution is to add the path to the actual ccache executable earlier in the path -- # e.g. in bash: export PATH=`echo c:/ProgramData/chocolatey/lib/ccache/tools/ccache*`:$PATH -- if (MSVC) -- message(STATUS "Found ccache at ${CCacheExectuable}: using ccache with MSVC to speed up build process") -- file(COPY_FILE -- ${CCacheExectuable} ${CMAKE_BINARY_DIR}/cl.exe -- ONLY_IF_DIFFERENT) -- -- set(CMAKE_VS_GLOBALS -- "CLToolExe=cl.exe" -- "CLToolPath=${CMAKE_BINARY_DIR}" -- "TrackFileAccess=false" -- "UseMultiToolTask=true" -- "DebugInformationFormat=OldStyle" -- ) -- endif() --endif() -- - ############################################# - # Options - option(NOVA_SIMD "Build with nova-simd support." ON) - option(FINAL_BUILD "Build as single source file." OFF) -+option(USE_CCACHE "Use ccache if available." ON) - - option(FFT_GREEN "Use internal 'Green' FFT lib rather than FFTW. (Not recommended.)" OFF) - -@@ -285,6 +226,67 @@ if(APPLE) - option(SC_VERIFY_APP "Run verify_app on the app bundle" OFF) - endif() - -+############################################# -+# Detect CCache -+ -+if(USE_CCACHE) -+ # workaround for using ccache with Xcode generator -+ # thanks to Craig Scott: https://crascit.com/2016/04/09/using-ccache-with-cmake/ -+ get_property(RULE_LAUNCH_COMPILE GLOBAL PROPERTY RULE_LAUNCH_COMPILE) -+ if(RULE_LAUNCH_COMPILE AND CMAKE_GENERATOR STREQUAL "Xcode") -+ -+ # find ccache -+ find_program(CCACHE_PROGRAM ccache) -+ -+ message(STATUS "Xcode and ccache detected: using ccache to speed up build process") -+ -+ # Set up wrapper scripts -+ set(SC_LAUNCH_C_SCRIPT "${CMAKE_BINARY_DIR}/launch-c") -+ set(SC_LAUNCH_CXX_SCRIPT "${CMAKE_BINARY_DIR}/launch-cxx") -+ -+ configure_file("cmake_modules/launch-c.in" launch-c) -+ configure_file("cmake_modules/launch-cxx.in" launch-cxx) -+ execute_process(COMMAND chmod a+rx "${SC_LAUNCH_C_SCRIPT}" "${SC_LAUNCH_CXX_SCRIPT}") -+ -+ # Set Xcode project attributes to route compilation and linking -+ # through our scripts -+ set(CMAKE_XCODE_ATTRIBUTE_CC "${SC_LAUNCH_C_SCRIPT}") -+ set(CMAKE_XCODE_ATTRIBUTE_CXX "${SC_LAUNCH_CXX_SCRIPT}") -+ set(CMAKE_XCODE_ATTRIBUTE_LD "${SC_LAUNCH_C_SCRIPT}") -+ set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${SC_LAUNCH_CXX_SCRIPT}") -+ endif() -+ -+ find_program(CCacheExectuable ccache) -+ if( CCacheExectuable ) -+ # only used with >=cmake-3.4 -+ set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExectuable}" ) -+ set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" ) -+ if(NOT CMAKE_GENERATOR MATCHES "Xcode" AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio")) # we already post a message when using Xcode or MSVC -+ message(STATUS "Found ccache at ${CCacheExectuable}: using ccache to speed up build process") -+ endif() -+ -+ # fix for Visual Studio adapted from https://github.com/ccache/ccache/wiki/MS-Visual-Studio#usage -+ # NOTE: there is an issue with ccache installed from chocolatey -+ # since chocolatey puts a "shim" as opposed to the actual executable in the PATH -+ # the solution is to add the path to the actual ccache executable earlier in the path -+ # e.g. in bash: export PATH=`echo c:/ProgramData/chocolatey/lib/ccache/tools/ccache*`:$PATH -+ if (MSVC) -+ message(STATUS "Found ccache at ${CCacheExectuable}: using ccache with MSVC to speed up build process") -+ file(COPY_FILE -+ ${CCacheExectuable} ${CMAKE_BINARY_DIR}/cl.exe -+ ONLY_IF_DIFFERENT) -+ -+ set(CMAKE_VS_GLOBALS -+ "CLToolExe=cl.exe" -+ "CLToolPath=${CMAKE_BINARY_DIR}" -+ "TrackFileAccess=false" -+ "UseMultiToolTask=true" -+ "DebugInformationFormat=OldStyle" -+ ) -+ endif() -+ endif() -+endif() -+ - ############################################# - # some default libraries - --- -2.43.0 - diff --git a/media-sound/supercollider/metadata.xml b/media-sound/supercollider/metadata.xml index d9f848b2cdc0..a5c27a618f30 100644 --- a/media-sound/supercollider/metadata.xml +++ b/media-sound/supercollider/metadata.xml @@ -22,7 +22,6 @@ <flag name="ableton-link">Enable support for Ableton Link</flag> <flag name="vim">Enable the SCVIM user interface</flag> <flag name="emacs">Enable the SCEL user interface</flag> - <flag name="gedit">Enable the SCED user interface</flag> <flag name="gpl3">Build GPL-3 licensed code (recommended)</flag> <flag name="server">Build with internal server</flag> <flag name="webengine">Enable the internal help system using <pkg>dev-qt/qtwebengine</pkg></flag> diff --git a/media-sound/supercollider/supercollider-3.13.0-r2.ebuild b/media-sound/supercollider/supercollider-3.13.0-r2.ebuild deleted file mode 100644 index 8c483ae049f4..000000000000 --- a/media-sound/supercollider/supercollider-3.13.0-r2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Environment and programming language for real time audio synthesis" -HOMEPAGE="https://supercollider.github.io/"; -SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.tar.bz2"; -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.13.0-boost-1.85.patch.xz"; -S="${WORKDIR}/SuperCollider-${PV}-Source" - -LICENSE="GPL-2 gpl3? ( GPL-3 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ableton-link cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim X +zeroconf" - -REQUIRED_USE="qt5? ( X )" - -BDEPEND=" - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) -" -RDEPEND=" - dev-cpp/yaml-cpp:= - dev-libs/boost:= - media-libs/alsa-lib - sys-libs/readline:0= - virtual/libudev:= - fftw? ( sci-libs/fftw:3.0= ) - jack? ( virtual/jack ) - !jack? ( media-libs/portaudio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) - sndfile? ( media-libs/libsndfile ) - X? ( - x11-libs/libX11 - x11-libs/libXt - ) - zeroconf? ( net-dns/avahi ) -" -DEPEND="${RDEPEND} - dev-libs/icu - emacs? ( >=app-editors/emacs-23.1:* ) - gedit? ( app-editors/gedit ) - qt5? ( dev-qt/qtconcurrent:5 ) - vim? ( app-editors/vim ) -" - -PATCHES=( - "${FILESDIR}/${P}-boost-1.84.patch" # bug 921595 - "${FILESDIR}/${P}-gcc-13.patch" # bug 905127 - "${FILESDIR}/${P}-no-ccache.patch" # bug 922095 - "${WORKDIR}/${P}-boost-1.85.patch" # bug 932793 - "${FILESDIR}"/${P}-boost-1.87-{1,2}.patch # bug 946624 -) - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/927071 - # https://github.com/supercollider/supercollider/issues/6245 - append-flags -fno-strict-aliasing - filter-lto - - local mycmakeargs=( - -DSC_CLANG_USES_LIBSTDCPP=ON - -DINSTALL_HELP=ON - -DSYSTEM_BOOST=ON - -DSYSTEM_YAMLCPP=ON - -DUSE_CCACHE=OFF - -DSC_ABLETON_LINK=$(usex ableton-link) - -DSSE=$(usex cpu_flags_x86_sse) - -DSSE2=$(usex cpu_flags_x86_sse2) - -DSC_EL=$(usex emacs) - -DFFT_GREEN=$(usex !fftw) - -DSC_ED=$(usex gedit) - -DNO_GPL3=$(usex !gpl3) - -DAUDIOAPI=$(usex jack jack portaudio) - -DSC_IDE=$(usex qt5) - -DSC_QT=$(usex qt5) - -DSCLANG_SERVER=$(usex server) - -DSUPERNOVA=$(usex server) - -DNO_LIBSNDFILE=$(usex !sndfile) - -DLIBSCSYNTH=$(usex !static-libs) - -DSC_VIM=$(usex vim) - -DNO_X11=$(usex !X) - -DNO_AVAHI=$(usex !zeroconf) - ) - - use qt5 && mycmakeargs+=( -DSC_USE_QTWEBENGINE=OFF ) # bug 926680 - - use debug && mycmakeargs+=( - -DSC_MEMORY_DEBUGGING=ON - -DSN_MEMORY_DEBUGGING=ON - -DGC_SANITYCHECK=ON - ) - - append-flags $(usex debug '' -DNDEBUG) - - cmake_src_configure -} - -src_test() { - export QT_QPA_PLATFORM=offscreen - cmake_src_test -} - -src_install() { - cmake_src_install - - use emacs && newdoc editors/sc-el/README.md README.emacs - use gedit && newdoc editors/sced/README.md README.gedit - use vim && newdoc editors/scvim/README.md README.vim -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - einfo "Notice: SuperCollider is not very intuitive to get up and running." - einfo "The best course of action to make sure that the installation was" - einfo "successful and get you started with using SuperCollider is to take" - einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2" - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-sound/supercollider/supercollider-3.14.0_rc2.ebuild b/media-sound/supercollider/supercollider-3.14.0_rc2.ebuild deleted file mode 100644 index d099f570e5d2..000000000000 --- a/media-sound/supercollider/supercollider-3.14.0_rc2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Environment and programming language for real time audio synthesis" -HOMEPAGE="https://supercollider.github.io/"; -SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV/_/-}/SuperCollider-${PV/_/-}-Source.tar.bz2"; -S="${WORKDIR}/SuperCollider-${PV/_/-}-Source" - -LICENSE="GPL-2 gpl3? ( GPL-3 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ableton-link cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt6 server +sndfile static-libs vim webengine X +zeroconf" - -REQUIRED_USE="qt6? ( X ) webengine? ( qt6 )" - -BDEPEND=" - virtual/pkgconfig - qt6? ( dev-qt/qttools:6[linguist] ) -" -RDEPEND=" - dev-cpp/yaml-cpp:= - dev-libs/boost:= - media-libs/alsa-lib - sys-libs/readline:0= - virtual/libudev:= - fftw? ( sci-libs/fftw:3.0= ) - jack? ( virtual/jack ) - !jack? ( media-libs/portaudio ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - ) - sndfile? ( media-libs/libsndfile ) - X? ( - x11-libs/libX11 - x11-libs/libXt - ) - zeroconf? ( net-dns/avahi ) -" -DEPEND="${RDEPEND} - dev-libs/icu - emacs? ( >=app-editors/emacs-23.1:* ) - gedit? ( app-editors/gedit ) - qt6? ( dev-qt/qtbase:6[concurrent] ) - vim? ( app-editors/vim ) -" - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/927071 - # https://github.com/supercollider/supercollider/issues/6245 - append-flags -fno-strict-aliasing - filter-lto - - local mycmakeargs=( - -DSC_CLANG_USES_LIBSTDCPP=ON - -DINSTALL_HELP=ON - -DSYSTEM_BOOST=ON - -DSYSTEM_YAMLCPP=ON - -DUSE_CCACHE=OFF - -DSC_ABLETON_LINK=$(usex ableton-link) - -DSSE=$(usex cpu_flags_x86_sse) - -DSSE2=$(usex cpu_flags_x86_sse2) - -DSC_EL=$(usex emacs) - -DFFT_GREEN=$(usex !fftw) - -DSC_ED=$(usex gedit) - -DNO_GPL3=$(usex !gpl3) - -DAUDIOAPI=$(usex jack jack portaudio) - -DSC_IDE=$(usex qt6) - -DSC_QT=$(usex qt6) - -DSCLANG_SERVER=$(usex server) - -DSUPERNOVA=$(usex server) - -DNO_LIBSNDFILE=$(usex !sndfile) - -DLIBSCSYNTH=$(usex !static-libs) - -DSC_VIM=$(usex vim) - -DSC_USE_QTWEBENGINE=$(usex webengine) - -DNO_X11=$(usex !X) - -DNO_AVAHI=$(usex !zeroconf) - ) - - use debug && mycmakeargs+=( - -DSC_MEMORY_DEBUGGING=ON - -DSN_MEMORY_DEBUGGING=ON - -DGC_SANITYCHECK=ON - ) - - append-flags $(usex debug '' -DNDEBUG) - - cmake_src_configure -} - -src_test() { - export QT_QPA_PLATFORM=offscreen - cmake_src_test -} - -src_install() { - cmake_src_install - - use emacs && newdoc editors/sc-el/README.md README.emacs - use gedit && newdoc editors/sced/README.md README.gedit - use vim && newdoc editors/scvim/README.md README.vim -} - -pkg_postinst() { - einfo "Notice: SuperCollider is not very intuitive to get up and running." - einfo "The best course of action to make sure that the installation was" - einfo "successful and get you started with using SuperCollider is to take" - einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2" - xdg_pkg_postinst -}
