audio/supercollider: fix build with updated boost-libs

- we manually set DISTVERSION as git describe does not produce
   something usable
 - also add a missing include to fix the build on FreeBSD 13

PR:		284466
This commit is contained in:
Neal Nelson 2025-02-19 16:47:32 +01:00 committed by Robert Clausecker
parent 3d9903862d
commit c8abed2462
6 changed files with 74 additions and 37 deletions

View file

@ -1,9 +1,6 @@
PORTNAME= supercollider
DISTVERSION= 3.13.0
PORTREVISION= 1
DISTVERSION= 3.13.1-g20250219
CATEGORIES= audio
MASTER_SITES= https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/
DISTNAME= SuperCollider-${PORTVERSION}-Source
MAINTAINER= ports@nicandneal.net
COMMENT= Programming language for real time audio synthesis
@ -12,8 +9,6 @@ WWW= https://supercollider.github.io
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= fails to build with boost-1.85+
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libjack.so:audio/jack \
libsndfile.so:audio/libsndfile \
@ -22,6 +17,13 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
USES= cmake compiler:c++11-lang iconv localbase pkgconfig \
qt:5 readline shared-mime-info tar:bzip2 xorg
USE_GITHUB= yes
GH_TAGNAME= 066ef94c70903c440e010eb81d4ac6e85bb2d84c
GH_TUPLE= timblechmann:nova-simd:2bdc68bc5704a42578300a4c18411df2405cb307:novasimd/external_libraries/nova-simd \
timblechmann:nova-tt:692a8859fb94030f581b8a3d626a5f40c236114e:novatt/external_libraries/nova-tt \
supercollider:hidapi:hidapi-sc-0.8.0-10-g976cb11:hidapi/external_libraries/hidapi \
supercollider:yaml-cpp:release-0.5.3-35-g728e26e:yamlcpp/external_libraries/yaml-cpp \
ableton:link:Link-3.0.6:link/external_libraries/link:link
USE_QT_amd64= webengine
USE_QT_i386= webengine
USE_QT= buildtools:build concurrent core declarative gui linguisttools location \
@ -58,7 +60,4 @@ AVAHI_CMAKE_BOOL_OFF= NO_AVAHI
HELP_CMAKE_BOOL= INSTALL_HELP
SUPERNOVA_CMAKE_BOOL= SUPERNOVA
post-patch:
${CP} ${WRKSRC}/external_libraries/boost/boost/filesystem/string_file.hpp ${WRKSRC}/include/common
.include <bsd.port.mk>

View file

@ -1,5 +1,13 @@
TIMESTAMP = 1708353834
SHA256 (SuperCollider-3.13.0-Source.tar.bz2) = 0fc5dba5baeae37f9069ad28885aa405c6a25309e3886cbe111bd3b7c05531ce
SIZE (SuperCollider-3.13.0-Source.tar.bz2) = 18685091
SHA256 (b9dd70c4c8d61c93d7a70645e0bd18fa76e6834e.patch) = 49d15a62a467143412850595c11a910e70e5ff1e20d7d0608940f8ffa9ce586f
SIZE (b9dd70c4c8d61c93d7a70645e0bd18fa76e6834e.patch) = 9133
TIMESTAMP = 1740092854
SHA256 (supercollider-supercollider-3.13.1-g20250219-066ef94c70903c440e010eb81d4ac6e85bb2d84c_GH0.tar.gz) = c2404c4da6546700405444c55d3e726b4299936b3e3f044c48673c1bd6acf666
SIZE (supercollider-supercollider-3.13.1-g20250219-066ef94c70903c440e010eb81d4ac6e85bb2d84c_GH0.tar.gz) = 16401696
SHA256 (timblechmann-nova-simd-2bdc68bc5704a42578300a4c18411df2405cb307_GH0.tar.gz) = df9f280daaad56fdadb5fa75d492ee6a06762a41d7346aa473aa49c1ac9ec9c8
SIZE (timblechmann-nova-simd-2bdc68bc5704a42578300a4c18411df2405cb307_GH0.tar.gz) = 53005
SHA256 (timblechmann-nova-tt-692a8859fb94030f581b8a3d626a5f40c236114e_GH0.tar.gz) = a3e40d2cdf06dc6b29a6e1f3353c371dc3dc7ca08fe475697cc9659702ebc178
SIZE (timblechmann-nova-tt-692a8859fb94030f581b8a3d626a5f40c236114e_GH0.tar.gz) = 31253
SHA256 (supercollider-hidapi-hidapi-sc-0.8.0-10-g976cb11_GH0.tar.gz) = ccdea1468120976205719865218919c83cc8dd9505ed58dfd6890743720e79d2
SIZE (supercollider-hidapi-hidapi-sc-0.8.0-10-g976cb11_GH0.tar.gz) = 147854
SHA256 (supercollider-yaml-cpp-release-0.5.3-35-g728e26e_GH0.tar.gz) = b84cda403e26fc64e4973e907413b40c43a7e1485f2c223ed30a1a387cf0dae4
SIZE (supercollider-yaml-cpp-release-0.5.3-35-g728e26e_GH0.tar.gz) = 2022032
SHA256 (ableton-link-Link-3.0.6_GH0.tar.gz) = 4f4fae68bd9351cba603f07990b0d1d9cd7f986c1c78f748d97168c8ae5269b2
SIZE (ableton-link-Link-3.0.6_GH0.tar.gz) = 1905749

View file

@ -1,11 +0,0 @@
--- lang/LangSource/PyrLexer.cpp.orig 2024-03-15 10:40:00 UTC
+++ 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 "string_file.hpp"
#include "PyrParseNode.h"
#include "Bison/lang11d_tab.h"

View file

@ -1,11 +0,0 @@
--- server/scsynth/SC_GraphDef.cpp.orig 2024-03-15 10:33:57 UTC
+++ 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 "string_file.hpp" // load_string_file
namespace bfs = boost::filesystem;

View file

@ -0,0 +1,10 @@
--- server/supernova/utilities/hardware_topology.cpp.orig 2025-02-20 15:13:49 UTC
+++ server/supernova/utilities/hardware_topology.cpp
@@ -20,6 +20,7 @@
# include <windows.h>
# include <malloc.h>
#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+# include <sys/types.h>
# include <sys/sysctl.h>
# include <errno.h>
#else /* Linux */

View file

@ -13,7 +13,6 @@ include/SuperCollider/common/SC_Types.h
include/SuperCollider/common/SC_fftlib.h
include/SuperCollider/common/clz.h
include/SuperCollider/common/function_attributes.h
include/SuperCollider/common/string_file.hpp
include/SuperCollider/common/wintime.h
include/SuperCollider/lang/SC_LanguageClient.h
include/SuperCollider/plugin_interface/FFT_UGens.h
@ -246,6 +245,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/Dbufwr.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Dconst.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Ddup.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/DebugFrame.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/DebugNodeWatcher.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Decay.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Decay2.schelp
@ -853,6 +853,8 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/ReplaceOut.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Resonz.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Rest.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/RingBuffer.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/RingNumberAllocator.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Ringz.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/RootNode.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Rotate2.schelp
@ -935,6 +937,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/SplayZ.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Spring.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/StackLayout.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/StackNumberAllocator.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/StandardL.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/StandardN.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/StartUp.schelp
@ -958,6 +961,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/SynthDesc.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/SynthDescLib.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/SystemClock.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/SystemSynthDefs.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/T2A.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/T2K.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/TBall.schelp
@ -1117,6 +1121,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Overviews/GenericCollectors.schelp
%%HELP%%share/SuperCollider/HelpSource/Overviews/JITLib.schelp
%%HELP%%share/SuperCollider/HelpSource/Overviews/Methods.html
%%HELP%%share/SuperCollider/HelpSource/Overviews/MidiPatterns.schelp
%%HELP%%share/SuperCollider/HelpSource/Overviews/Operators.schelp
%%HELP%%share/SuperCollider/HelpSource/Overviews/SC3vsSC2.schelp
%%HELP%%share/SuperCollider/HelpSource/Overviews/Streams.schelp
@ -1147,6 +1152,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Reference/NodeProxy_roles.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/Partial-Application.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/Resize.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/SCDocStyling.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/SCDocSyntax.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/Scope.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/Server-Architecture.schelp
@ -1198,6 +1204,11 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Tutorials/A-Practical-Guide/PG_Cookbook07_Rhythmic_Variations.schelp
%%HELP%%share/SuperCollider/HelpSource/Tutorials/A-Practical-Guide/PG_Cookbook08_Swing.schelp
%%HELP%%share/SuperCollider/HelpSource/Tutorials/A-Practical-Guide/PG_Ref01_Pattern_Internals.schelp
%%HELP%%share/SuperCollider/HelpSource/Tutorials/GUI/compose_complex_view.schelp
%%HELP%%share/SuperCollider/HelpSource/Tutorials/GUI/create_simple_instrument_view.schelp
%%HELP%%share/SuperCollider/HelpSource/Tutorials/GUI/create_window.schelp
%%HELP%%share/SuperCollider/HelpSource/Tutorials/GUI/things_you_wanna_know.schelp
%%HELP%%share/SuperCollider/HelpSource/Tutorials/GUI/tutorial_intro.schelp
%%HELP%%share/SuperCollider/HelpSource/Tutorials/Getting-Started/00-Getting-Started-With-SC.schelp
%%HELP%%share/SuperCollider/HelpSource/Tutorials/Getting-Started/01-Introductory-Remarks.schelp
%%HELP%%share/SuperCollider/HelpSource/Tutorials/Getting-Started/02-First-Steps.schelp
@ -1302,9 +1313,40 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/lib/codemirror-5.39.2.min.js
%%HELP%%share/SuperCollider/HelpSource/lib/codemirror-addon-simple-5.39.2.min.js
%%HELP%%share/SuperCollider/HelpSource/lib/jquery.min.js
%%HELP%%share/SuperCollider/HelpSource/lib/katex/README.md
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_AMS-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Caligraphic-Bold.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Caligraphic-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Fraktur-Bold.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Fraktur-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Main-Bold.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Main-BoldItalic.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Main-Italic.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Main-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Math-BoldItalic.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Math-Italic.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_SansSerif-Bold.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_SansSerif-Italic.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_SansSerif-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Script-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Size1-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Size2-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Size3-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Size4-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/fonts/KaTeX_Typewriter-Regular.woff2
%%HELP%%share/SuperCollider/HelpSource/lib/katex/katex.min.css
%%HELP%%share/SuperCollider/HelpSource/lib/katex/katex.min.js
%%HELP%%share/SuperCollider/HelpSource/scdoc.css
%%HELP%%share/SuperCollider/HelpSource/scdoc.js
%%HELP%%share/SuperCollider/HelpSource/search.js
%%HELP%%share/SuperCollider/HelpSource/themes/README.md
%%HELP%%share/SuperCollider/HelpSource/themes/classic.css
%%HELP%%share/SuperCollider/HelpSource/themes/dark.css
%%HELP%%share/SuperCollider/HelpSource/themes/default.css
%%HELP%%share/SuperCollider/HelpSource/themes/dracula.css
%%HELP%%share/SuperCollider/HelpSource/themes/monokai.css
%%HELP%%share/SuperCollider/HelpSource/themes/solarizedDark.css
%%HELP%%share/SuperCollider/HelpSource/themes/solarizedLight.css
share/SuperCollider/README.md
share/SuperCollider/README_LINUX.md
share/SuperCollider/SCClassLibrary/Common/Audio/BEQSuite.sc