From nobody Sun May 22 20:17:35 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 303B81B4A354; Sun, 22 May 2022 20:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L5sFr3qQ3z3hPm; Sun, 22 May 2022 20:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653250656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YyouIs5ngvP5Xaz6M7l/DvML7th8f14mFDrTJsylV18=; b=hT2Vbt/V48FW/0fKuXJqPlJsrcYLmZQHwrf25Hr/+S8ftE8LtnZUEAQTQTIsbixfEdfqVM bxm7OqYlI3rYls6I1vPLMNCHWmm00MUJEhtMCH4L83+J+QCYCJdJZl1B+IPDhtMmAsNuvq BwhvGFyjSMx2R77ewERIfVjh4o+k5N0h8e07W3LAl77ZC2lkzoi6hRT2CkG6kHhw0HVFym 370WjxGvo7RAyaEu8JM2PYAmlnmx5aEgfkUVfdev1K7ul9L3GsQOL2XpOp4My2fYWlfERn XkiWcXmKRNsJtcMDwF0bs4veZhfHFYU83GLgQxPTN7gaZbbUb/cx9hoNmuD/bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D5D0A21BEA; Sun, 22 May 2022 20:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24MKHZ5g092178; Sun, 22 May 2022 20:17:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24MKHZeI092177; Sun, 22 May 2022 20:17:35 GMT (envelope-from git) Date: Sun, 22 May 2022 20:17:35 GMT Message-Id: <202205222017.24MKHZeI092177@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 210bd08ae292 - main - audio/supercollider: upfate to 3.11.2 release to unbreak build after boost upgrade List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 210bd08ae29261c014bca5192ee5753b0fc14169 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653250656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YyouIs5ngvP5Xaz6M7l/DvML7th8f14mFDrTJsylV18=; b=weIU1x/zJRKTaCNYqeEkaUAn22lRHaU0y+UwRIXRG10wORa1FN+P7KAiJG+V3T+VR6QbTZ P+htlfEjoQiL/pz0Bh5ZWbomvouwi0tYliT9T02PFSxnMo9qmPZMfz9pm4dOdv6ubegMiB a7zqr1+3IYqKf2kbtrVSlQ+nBMlCKNH2Ts1UL3vqtCgDTWfwqfhOsbC1ZP/SVjGY7DDSLY 3AXKz73UxNM+OPG4fr6DVDIrTi0ioir1/rFb9FrwaaKJC+Vcx1Aw3FBubRtTjbUqM3OltQ 0cy9T30+RhaIlAzQ1Vg5RYMGakjLP3LzAD2sNnP0X6xTOWCT/1s1/Iwn8mBU6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653250656; a=rsa-sha256; cv=none; b=gyNt7yfPuzyUsceU1nhSaDXFjJiQ+j2oTNewGkaf0SNh6tG0XFtO9kHniBtkH15pMNgkmB 5EA7RFDapmRMoClvyviksP4gqs2vwf1FdiBQ08WhdwlsDMhuIPC+WhbXAdCYk04qu51doj 64VsY1wSgqm2RKUh5Gv47Uzy53JjOgPcxkVE1KZvAnBydrupZGhxqLumtL9fYJ5CiWbaWZ pxD3o50LZjkiH5JT4tTy2AS0lQqig4uHBdHRWNpzXEMhfo40GWoPp+U60WIu/7L61vaH25 EPBWwJnKh1TVxSrKPShBZpHN/01uP+ig6LoW2qOr6Cb1h+zA6v4n/Li1drVXoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=210bd08ae29261c014bca5192ee5753b0fc14169 commit 210bd08ae29261c014bca5192ee5753b0fc14169 Author: Dima Panov AuthorDate: 2022-05-22 18:07:10 +0000 Commit: Dima Panov CommitDate: 2022-05-22 20:17:02 +0000 audio/supercollider: upfate to 3.11.2 release to unbreak build after boost upgrade PR: 246106 --- audio/supercollider/Makefile | 3 +- audio/supercollider/distinfo | 6 +- .../patch-QtCollider_primitives_prim__QPen.cpp | 10 --- .../files/patch-QtCollider_widgets_QcGraph.cpp | 10 --- .../patch-QtCollider_widgets_QcLevelIndicator.cpp | 10 --- .../patch-QtCollider_widgets_QcMultiSlider.cpp | 10 --- .../files/patch-QtCollider_widgets_QcScopeShm.cpp | 10 --- ...patch-QtCollider_widgets_soundfileview_view.cpp | 10 --- .../supercollider/files/patch-common_SC__Apple.hpp | 22 ++++++ .../supercollider/files/patch-common_SC__Apple.mm | 68 ++++++++++++++++++ .../files/patch-common_SC__AppleEventLoop.hpp | 37 ++++++++++ .../files/patch-common_SC__AppleEventLoop.mm | 83 ++++++++++++++++++++++ .../files/patch-common_SC__EventLoop.hpp | 19 +++++ ...t_math_special__functions_detail_fp__traits.hpp | 11 +++ .../files/patch-server_scsynth_CMakeLists.txt | 17 +++++ .../files/patch-server_supernova_CMakeLists.txt | 18 +++++ .../patch-server_supernova_sc_sc__osc__handler.hpp | 27 +++++++ audio/supercollider/pkg-plist | 10 +-- 18 files changed, 312 insertions(+), 69 deletions(-) diff --git a/audio/supercollider/Makefile b/audio/supercollider/Makefile index 9cd950f971a3..b902676aaa81 100644 --- a/audio/supercollider/Makefile +++ b/audio/supercollider/Makefile @@ -1,6 +1,5 @@ PORTNAME= supercollider -DISTVERSION= 3.11.0 -PORTREVISION= 3 +DISTVERSION= 3.11.2 CATEGORIES= audio MASTER_SITES= https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/ DISTNAME= SuperCollider-${PORTVERSION}-Source diff --git a/audio/supercollider/distinfo b/audio/supercollider/distinfo index edf97212fa98..0b6551a1b479 100644 --- a/audio/supercollider/distinfo +++ b/audio/supercollider/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588924328 -SHA256 (SuperCollider-3.11.0-Source.tar.bz2) = 37592a32108757bf282575f0d3b0e373bae9dbce6cf990282ea85299b13eb250 -SIZE (SuperCollider-3.11.0-Source.tar.bz2) = 18125654 +TIMESTAMP = 1619062594 +SHA256 (SuperCollider-3.11.2-Source.tar.bz2) = c22c32c6bc482671d4fb8f51672df712d97a6a6277235c4da2312910303a0506 +SIZE (SuperCollider-3.11.2-Source.tar.bz2) = 18130954 diff --git a/audio/supercollider/files/patch-QtCollider_primitives_prim__QPen.cpp b/audio/supercollider/files/patch-QtCollider_primitives_prim__QPen.cpp deleted file mode 100644 index 659f0a02ea97..000000000000 --- a/audio/supercollider/files/patch-QtCollider_primitives_prim__QPen.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- QtCollider/primitives/prim_QPen.cpp.orig 2020-06-15 00:38:04 UTC -+++ QtCollider/primitives/prim_QPen.cpp -@@ -27,6 +27,7 @@ - #include "PyrKernel.h" - - #include -+#include - #include - #include - #include diff --git a/audio/supercollider/files/patch-QtCollider_widgets_QcGraph.cpp b/audio/supercollider/files/patch-QtCollider_widgets_QcGraph.cpp deleted file mode 100644 index c96ea0711b02..000000000000 --- a/audio/supercollider/files/patch-QtCollider_widgets_QcGraph.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- QtCollider/widgets/QcGraph.cpp.orig 2020-06-15 01:27:43 UTC -+++ QtCollider/widgets/QcGraph.cpp -@@ -24,6 +24,7 @@ - #include "../style/routines.hpp" - - #include -+#include - #include - #include - #include diff --git a/audio/supercollider/files/patch-QtCollider_widgets_QcLevelIndicator.cpp b/audio/supercollider/files/patch-QtCollider_widgets_QcLevelIndicator.cpp deleted file mode 100644 index e8d262acb9a0..000000000000 --- a/audio/supercollider/files/patch-QtCollider_widgets_QcLevelIndicator.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- QtCollider/widgets/QcLevelIndicator.cpp.orig 2020-06-15 01:16:56 UTC -+++ QtCollider/widgets/QcLevelIndicator.cpp -@@ -23,6 +23,7 @@ - #include "../QcWidgetFactory.h" - - #include -+#include - - QC_DECLARE_QWIDGET_FACTORY(QcLevelIndicator); - diff --git a/audio/supercollider/files/patch-QtCollider_widgets_QcMultiSlider.cpp b/audio/supercollider/files/patch-QtCollider_widgets_QcMultiSlider.cpp deleted file mode 100644 index 13d9eb44dd29..000000000000 --- a/audio/supercollider/files/patch-QtCollider_widgets_QcMultiSlider.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- QtCollider/widgets/QcMultiSlider.cpp.orig 2020-06-15 00:48:09 UTC -+++ QtCollider/widgets/QcMultiSlider.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - diff --git a/audio/supercollider/files/patch-QtCollider_widgets_QcScopeShm.cpp b/audio/supercollider/files/patch-QtCollider_widgets_QcScopeShm.cpp deleted file mode 100644 index 8747519c2d45..000000000000 --- a/audio/supercollider/files/patch-QtCollider_widgets_QcScopeShm.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- QtCollider/widgets/QcScopeShm.cpp.orig 2020-06-15 01:00:40 UTC -+++ QtCollider/widgets/QcScopeShm.cpp -@@ -25,6 +25,7 @@ - #include "../debug.h" - - #include -+#include - #include - #include - #include diff --git a/audio/supercollider/files/patch-QtCollider_widgets_soundfileview_view.cpp b/audio/supercollider/files/patch-QtCollider_widgets_soundfileview_view.cpp deleted file mode 100644 index 7ab2c8eee956..000000000000 --- a/audio/supercollider/files/patch-QtCollider_widgets_soundfileview_view.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- QtCollider/widgets/soundfileview/view.cpp.orig 2020-06-15 01:36:47 UTC -+++ QtCollider/widgets/soundfileview/view.cpp -@@ -24,6 +24,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/audio/supercollider/files/patch-common_SC__Apple.hpp b/audio/supercollider/files/patch-common_SC__Apple.hpp new file mode 100644 index 000000000000..3cdb2829f943 --- /dev/null +++ b/audio/supercollider/files/patch-common_SC__Apple.hpp @@ -0,0 +1,22 @@ +--- common/SC_Apple.hpp.orig 2020-11-15 17:38:25 UTC ++++ common/SC_Apple.hpp +@@ -23,19 +23,5 @@ namespace SC { namespace Apple { + + void disableAppNap(); + +-namespace EventLoop { +- +-// Setup the main application. This function must be called in the +-// main thread and before any other calls to Cocoa methods. +-void setup(); +-// Run the event loop. This function must be called in the main thread. +-// It blocks until the event loop finishes. +-void run(); +-// Ask the event loop to stop and terminate the program. +-// This function can be called from any thread. +-void quit(); +- +-} // EventLoop +- + } // namespace Apple + } // namespace SC diff --git a/audio/supercollider/files/patch-common_SC__Apple.mm b/audio/supercollider/files/patch-common_SC__Apple.mm new file mode 100644 index 000000000000..7143d22694f1 --- /dev/null +++ b/audio/supercollider/files/patch-common_SC__Apple.mm @@ -0,0 +1,68 @@ +--- common/SC_Apple.mm.orig 2020-11-15 17:38:25 UTC ++++ common/SC_Apple.mm +@@ -42,65 +42,5 @@ void disableAppNap() { + } + } + +-namespace EventLoop { +- +-static std::atomic_bool g_running; +- +-void setup() { +- // The following code would transform the process into a foreground application. +- // For now it's the plugin's responsibility to do this (early or lazily) +- // because we don't want to always show an icon in the docker. +- // ProcessSerialNumber psn = { 0, kCurrentProcess }; +- // TransformProcessType(&psn, kProcessTransformToForegroundApplication); +- +- // Create NSApplication +- [NSApplication sharedApplication]; +-} +- +-void run() { +-#if 0 +- // this doesn't work... +- [NSApp run]; +-#else +- // Kudos to https://www.cocoawithlove.com/2009/01/demystifying-nsapplication-by.html +- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; +- +- [NSApp finishLaunching]; +- g_running = true; +- +- while (g_running) { +- [pool release]; +- pool = [[NSAutoreleasePool alloc] init]; +- NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask +- untilDate:[NSDate distantFuture] +- inMode:NSDefaultRunLoopMode +- dequeue:YES]; +- if (event) { +- [NSApp sendEvent:event]; +- [NSApp updateWindows]; +- } +- } +- [pool release]; +-#endif +-} +- +-void quit() { +- // break from event loop instead of [NSApp terminate:nil] +- g_running = false; +- // send dummy event to wake up event loop +- NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined +- location:NSMakePoint(0, 0) +- modifierFlags:0 +- timestamp:0 +- windowNumber:0 +- context:nil +- subtype:0 +- data1:0 +- data2:0]; +- [NSApp postEvent:event atStart:NO]; +-} +- +-} // EventLoop +- + } // namespace Apple + } // namespace SC diff --git a/audio/supercollider/files/patch-common_SC__AppleEventLoop.hpp b/audio/supercollider/files/patch-common_SC__AppleEventLoop.hpp new file mode 100644 index 000000000000..f38374250805 --- /dev/null +++ b/audio/supercollider/files/patch-common_SC__AppleEventLoop.hpp @@ -0,0 +1,37 @@ +--- common/SC_AppleEventLoop.hpp.orig 2021-04-22 03:41:58 UTC ++++ common/SC_AppleEventLoop.hpp +@@ -0,0 +1,34 @@ ++/************************************************************************ ++ * ++ * Copyright 2019 Christof Ressi ++ * ++ * This program is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ * ++ ************************************************************************/ ++ ++#pragma once ++ ++namespace SC { namespace Apple { namespace EventLoop { ++ ++// Setup the main application. This function must be called in the ++// main thread and before any other calls to Cocoa methods. ++void setup(); ++// Run the event loop. This function must be called in the main thread. ++// It blocks until the event loop finishes. ++void run(); ++// Ask the event loop to stop and terminate the program. ++// This function can be called from any thread. ++void quit(); ++ ++}}} // namespace SC::Apple::EventLoop diff --git a/audio/supercollider/files/patch-common_SC__AppleEventLoop.mm b/audio/supercollider/files/patch-common_SC__AppleEventLoop.mm new file mode 100644 index 000000000000..d0505523b8ae --- /dev/null +++ b/audio/supercollider/files/patch-common_SC__AppleEventLoop.mm @@ -0,0 +1,83 @@ +--- common/SC_AppleEventLoop.mm.orig 2021-04-22 03:41:58 UTC ++++ common/SC_AppleEventLoop.mm +@@ -0,0 +1,80 @@ ++/************************************************************************ ++ * ++ * Copyright 2019 Christof Ressi ++ * ++ * This program is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ * ++ ************************************************************************/ ++ ++#include "SC_AppleEventLoop.hpp" ++#include ++ ++#import ++ ++namespace SC { namespace Apple { namespace EventLoop { ++ ++static std::atomic_bool g_running; ++ ++void setup() { ++ // The following code would transform the process into a foreground application. ++ // For now it's the plugin's responsibility to do this (early or lazily) ++ // because we don't want to always show an icon in the docker. ++ // ProcessSerialNumber psn = { 0, kCurrentProcess }; ++ // TransformProcessType(&psn, kProcessTransformToForegroundApplication); ++ ++ // Create NSApplication ++ [NSApplication sharedApplication]; ++} ++ ++void run() { ++ // this doesn't work... ++ // [NSApp run]; ++ // Kudos to https://www.cocoawithlove.com/2009/01/demystifying-nsapplication-by.html ++ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; ++ ++ [NSApp finishLaunching]; ++ g_running = true; ++ ++ while (g_running) { ++ [pool release]; ++ pool = [[NSAutoreleasePool alloc] init]; ++ NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask ++ untilDate:[NSDate distantFuture] ++ inMode:NSDefaultRunLoopMode ++ dequeue:YES]; ++ if (event) { ++ [NSApp sendEvent:event]; ++ [NSApp updateWindows]; ++ } ++ } ++ [pool release]; ++} ++ ++void quit() { ++ // break from event loop instead of [NSApp terminate:nil] ++ g_running = false; ++ // send dummy event to wake up event loop ++ NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined ++ location:NSMakePoint(0, 0) ++ modifierFlags:0 ++ timestamp:0 ++ windowNumber:0 ++ context:nil ++ subtype:0 ++ data1:0 ++ data2:0]; ++ [NSApp postEvent:event atStart:NO]; ++} ++ ++}}} // namespace SC::Apple::EventLoop diff --git a/audio/supercollider/files/patch-common_SC__EventLoop.hpp b/audio/supercollider/files/patch-common_SC__EventLoop.hpp new file mode 100644 index 000000000000..cb3e4377bbb2 --- /dev/null +++ b/audio/supercollider/files/patch-common_SC__EventLoop.hpp @@ -0,0 +1,19 @@ +--- common/SC_EventLoop.hpp.orig 2020-11-15 17:38:25 UTC ++++ common/SC_EventLoop.hpp +@@ -2,7 +2,7 @@ + + #include + #ifdef __APPLE__ +-# include "SC_Apple.hpp" ++# include "SC_AppleEventLoop.hpp" + # include + #endif + +@@ -21,6 +21,7 @@ class EventLoop { (public) + SC::Apple::EventLoop::setup(); + #endif + } ++ + // Run the event loop until 'waitFunction' returns. + static void run(std::function waitFunction) { + #ifdef __APPLE__ diff --git a/audio/supercollider/files/patch-external__libraries_boost_boost_math_special__functions_detail_fp__traits.hpp b/audio/supercollider/files/patch-external__libraries_boost_boost_math_special__functions_detail_fp__traits.hpp new file mode 100644 index 000000000000..1dea3fa42625 --- /dev/null +++ b/audio/supercollider/files/patch-external__libraries_boost_boost_math_special__functions_detail_fp__traits.hpp @@ -0,0 +1,11 @@ +--- external_libraries/boost/boost/math/special_functions/detail/fp_traits.hpp.orig 2020-04-01 20:16:40 UTC ++++ external_libraries/boost/boost/math/special_functions/detail/fp_traits.hpp +@@ -24,7 +24,7 @@ With these techniques, the code could be simplified. + + #include + #include +-#include ++#include + #include + #include + diff --git a/audio/supercollider/files/patch-server_scsynth_CMakeLists.txt b/audio/supercollider/files/patch-server_scsynth_CMakeLists.txt new file mode 100644 index 000000000000..3cc443c0cc15 --- /dev/null +++ b/audio/supercollider/files/patch-server_scsynth_CMakeLists.txt @@ -0,0 +1,17 @@ +--- server/scsynth/CMakeLists.txt.orig 2020-11-15 17:38:26 UTC ++++ server/scsynth/CMakeLists.txt +@@ -230,7 +230,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") + target_link_libraries(libscsynth rt) + endif() + +-add_executable(scsynth scsynth_main.cpp) ++add_executable(scsynth ++ scsynth_main.cpp ++ ++ # these files contain code only used in main() ++ ${CMAKE_SOURCE_DIR}/common/SC_ServerBootDelayWarning.cpp ++ $<$: ${CMAKE_SOURCE_DIR}/common/SC_AppleEventLoop.mm > ++ ) + target_link_libraries(scsynth libscsynth) + + if (PTHREADS_FOUND) diff --git a/audio/supercollider/files/patch-server_supernova_CMakeLists.txt b/audio/supercollider/files/patch-server_supernova_CMakeLists.txt new file mode 100644 index 000000000000..895769be7795 --- /dev/null +++ b/audio/supercollider/files/patch-server_supernova_CMakeLists.txt @@ -0,0 +1,18 @@ +--- server/supernova/CMakeLists.txt.orig 2020-11-15 17:38:26 UTC ++++ server/supernova/CMakeLists.txt +@@ -182,7 +182,14 @@ if(WIN32) + endif() + + +-add_executable(supernova server/main.cpp ${supernova_headers}) ++add_executable(supernova ++ server/main.cpp ++ ${supernova_headers} ++ ++ # these files contain code only used in main() ++ ${CMAKE_SOURCE_DIR}/common/SC_ServerBootDelayWarning.cpp ++ $<$: ${CMAKE_SOURCE_DIR}/common/SC_AppleEventLoop.mm > ++ ) + target_link_libraries(supernova libsupernova) + + if(WIN32) diff --git a/audio/supercollider/files/patch-server_supernova_sc_sc__osc__handler.hpp b/audio/supercollider/files/patch-server_supernova_sc_sc__osc__handler.hpp new file mode 100644 index 000000000000..70b0a05823c8 --- /dev/null +++ b/audio/supercollider/files/patch-server_supernova_sc_sc__osc__handler.hpp @@ -0,0 +1,27 @@ +--- server/supernova/sc/sc_osc_handler.hpp.orig 2020-11-15 17:38:26 UTC ++++ server/supernova/sc/sc_osc_handler.hpp +@@ -229,11 +229,7 @@ class sc_osc_handler : private detail::network_thread, + 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)); } + +@@ -244,11 +240,7 @@ class sc_osc_handler : private detail::network_thread, + 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/audio/supercollider/pkg-plist b/audio/supercollider/pkg-plist index 93575576e858..4d8e444b33bf 100644 --- a/audio/supercollider/pkg-plist +++ b/audio/supercollider/pkg-plist @@ -679,6 +679,8 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml %%HELP%%share/SuperCollider/HelpSource/Classes/PdegreeToKey.schelp %%HELP%%share/SuperCollider/HelpSource/Classes/Pdfsm.schelp %%HELP%%share/SuperCollider/HelpSource/Classes/Pdict.schelp +%%HELP%%share/SuperCollider/HelpSource/Classes/Pdiff.schelp +%%HELP%%share/SuperCollider/HelpSource/Classes/Pdrop.schelp %%HELP%%share/SuperCollider/HelpSource/Classes/PdurStutter.schelp %%HELP%%share/SuperCollider/HelpSource/Classes/Peak.schelp %%HELP%%share/SuperCollider/HelpSource/Classes/PeakFollower.schelp @@ -1513,10 +1515,10 @@ share/SuperCollider/SCClassLibrary/Common/Math/Number.sc share/SuperCollider/SCClassLibrary/Common/Math/Polar.sc share/SuperCollider/SCClassLibrary/Common/Math/Signal.sc share/SuperCollider/SCClassLibrary/Common/Math/SimpleNumber.sc +share/SuperCollider/SCClassLibrary/Common/Quarks/GUI/QuarksGui.sc share/SuperCollider/SCClassLibrary/Common/Quarks/Git.sc share/SuperCollider/SCClassLibrary/Common/Quarks/Quark.sc share/SuperCollider/SCClassLibrary/Common/Quarks/Quarks.sc -share/SuperCollider/SCClassLibrary/Common/Quarks/QuarksGui.sc share/SuperCollider/SCClassLibrary/Common/Quarks/packages.sc share/SuperCollider/SCClassLibrary/Common/Streams/BasicOpsStream.sc share/SuperCollider/SCClassLibrary/Common/Streams/EventStreamCleanup.sc @@ -1544,9 +1546,9 @@ share/SuperCollider/SCClassLibrary/Common/Streams/Rest.sc share/SuperCollider/SCClassLibrary/Common/Streams/Stream.sc share/SuperCollider/SCClassLibrary/Common/Streams/TabFileReader.sc share/SuperCollider/SCClassLibrary/Common/Streams/TimePatterns.sc +share/SuperCollider/SCClassLibrary/Common/UnitTesting/GUI/UnitTestGUI.sc share/SuperCollider/SCClassLibrary/Common/UnitTesting/MixedBundleTester.sc share/SuperCollider/SCClassLibrary/Common/UnitTesting/UnitTest.sc -share/SuperCollider/SCClassLibrary/Common/UnitTesting/UnitTestGUI.sc share/SuperCollider/SCClassLibrary/Common/Unix/Unix.sc share/SuperCollider/SCClassLibrary/Common/Unix/UnixFILE.sc share/SuperCollider/SCClassLibrary/DefaultLibrary/Main.sc @@ -1587,8 +1589,8 @@ share/SuperCollider/SCClassLibrary/Platform/Platform.sc share/SuperCollider/SCClassLibrary/Platform/iphone/SystemOverwrites/extFile.sc share/SuperCollider/SCClassLibrary/Platform/iphone/extMain.sc share/SuperCollider/SCClassLibrary/Platform/iphone/iPhonePlatform.sc +share/SuperCollider/SCClassLibrary/Platform/linux/GUI/LIDGui.sc share/SuperCollider/SCClassLibrary/Platform/linux/LID.sc -share/SuperCollider/SCClassLibrary/Platform/linux/LIDGui.sc share/SuperCollider/SCClassLibrary/Platform/linux/LinuxPlatform.sc share/SuperCollider/SCClassLibrary/Platform/linux/SystemOverwrites/extMIDIOut.sc share/SuperCollider/SCClassLibrary/Platform/linux/extMain.sc @@ -1609,9 +1611,9 @@ share/SuperCollider/SCClassLibrary/backwards_compatibility/PMOsc.sc share/SuperCollider/SCClassLibrary/deprecated/3.10/AudioIn.sc share/SuperCollider/SCClassLibrary/deprecated/3.10/File.sc share/SuperCollider/SCClassLibrary/deprecated/3.10/GUI/File.sc +share/SuperCollider/SCClassLibrary/deprecated/3.10/GUI/Plotter.sc share/SuperCollider/SCClassLibrary/deprecated/3.10/GUI/QWebView.sc share/SuperCollider/SCClassLibrary/deprecated/3.10/Main.sc -share/SuperCollider/SCClassLibrary/deprecated/3.10/Plotter.sc share/SuperCollider/SCClassLibrary/deprecated/3.10/deprecated-3.10.sc share/SuperCollider/SCClassLibrary/deprecated/3.10/osc/OSCpathResponder.sc share/SuperCollider/SCClassLibrary/deprecated/3.10/osc/OSCresponder.sc