cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio/supercollider: Update to 3.11.0

Browse Source 
* Introduce additional default option AVAHI to make the use of the Avahi
  libraries optional.

* Remove one patch and the whole patching via "post-patch" - both is no
  longer needed.

* While I'm here: Prepare the port for Qt 5.15.0

Changelog:

https://github.com/supercollider/supercollider/releases/tag/Version-3.11.0

PR:		246320
Submitted by:	shamaz.mazum@gmail.com
Approved by:	Neal Nelson <ports@nicandneal.net> (maintainer)
MFH:		2020Q2 (blanket: unbreak broken port)
This commit is contained in:
Kai Knoblich 2020-06-15 15:50:11 +00:00
parent 671e33070e
commit ea418be18b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=538903
10 changed files with 108 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
audio/supercollider/Makefile
View File

@ -1,11 +1,10 @@
# $FreeBSD$
PORTNAME= supercollider
DISTVERSION= 3.10.2
PORTREVISION= 3
DISTVERSION= 3.11.0
CATEGORIES= audio
MASTER_SITES= https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/
DISTNAME= SuperCollider-${PORTVERSION}-Source-linux
DISTNAME= SuperCollider-${PORTVERSION}-Source
MAINTAINER= ports@nicandneal.net
COMMENT= Programming language for real time audio synthesis
@ -13,14 +12,11 @@ COMMENT= Programming language for real time audio synthesis
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_FreeBSD= fails to compile with Clang 8 due shipped Boost 1.66 libraries. Not compatible with Boost 1.70+, either
BUILD_DEPENDS= ${LOCALBASE}/include/boost/intrusive/unordered_set.hpp:devel/boost-libs
LIB_DEPENDS= libavahi-client.so:net/avahi-app \
libavahi-common.so:net/avahi-app \
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libjack.so:audio/jack \
libsndfile.so:audio/libsndfile \
libfftw3f.so:math/fftw3-float
libfftw3f.so:math/fftw3-float \
libyaml-cpp.so:devel/yaml-cpp
USES= cmake compiler:c++11-lang iconv localbase pkgconfig \
qt:5 readline shared-mime-info tar:bzip2 xorg
@ -30,23 +26,27 @@ USE_QT= buildtools_build concurrent core declarative gui linguisttools location
USE_XORG= x11
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/SuperCollider-Source
CMAKE_ARGS= -DCMAKE_PREFIX_PATH=${LOCALBASE}/lib/qt5 \
-DLIBUSB_1_INCLUDE_DIR=/usr/include \
-DLIBUSB_1_LIBRARY=/usr/lib/libusb.so \
-DLIBSCSYNTH=ON
-DLIBSCSYNTH=ON \
-DSYSTEM_BOOST=ON \
-DSYSTEM_YAMLCPP=ON \
-DSC_ABLETON_LINK=OFF
DESKTOP_ENTRIES="SuperCollider IDE" "" "${LOCALBASE}/share/pixmaps/sc_ide.svg" \
"scide" "" false
OPTIONS_DEFINE= HELP SUPERNOVA
OPTIONS_DEFAULT= HELP SUPERNOVA
OPTIONS_DEFINE= AVAHI HELP SUPERNOVA
OPTIONS_DEFAULT= AVAHI HELP SUPERNOVA
OPTIONS_SUB= yes
HELP_DESC= Install on-line help text
SUPERNOVA_DESC= Build with supernova as optional audio synthesis server
AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app \
libavahi-common.so:net/avahi-app
AVAHI_CMAKE_BOOL_OFF= NO_AVAHI
HELP_CMAKE_BOOL= INSTALL_HELP
SUPERNOVA_CMAKE_BOOL= SUPERNOVA
@ -56,13 +56,4 @@ SUPERNOVA_CMAKE_BOOL= SUPERNOVA
CMAKE_ARGS+= -DSSE:BOOL=FALSE -DSSE2:BOOL=FALSE
.endif
post-patch:
@${REINPLACE_CMD} -e 's|MATCHES "Linux" AND|MATCHES "FreeBSD" AND|' \
${WRKSRC}/CMakeLists.txt
@${REINPLACE_CMD} -e 's|if(DL)|if(TRUE)|; s|target_link_libraries(libsupernova $${DL})|#|' \
${WRKSRC}/server/supernova/CMakeLists.txt
@${REINPLACE_CMD} -e 's|CMAKE_SYSTEM_NAME MATCHES "Linux"|CMAKE_SYSTEM_NAME MATCHES "FreeBSD"|' \
${WRKSRC}/server/plugins/CMakeLists.txt
@${REINPLACE_CMD} -e 's|__linux__|__FreeBSD__|' ${WRKSRC}/server/supernova/server/main.cpp
.include <bsd.port.post.mk>

6
audio/supercollider/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1558424872
SHA256 (SuperCollider-3.10.2-Source-linux.tar.bz2) = 389a9b3ecad7907c31f97566a48a8b2c5c53b73a8ad8004f81a5e9cb9a0fdf7a
SIZE (SuperCollider-3.10.2-Source-linux.tar.bz2) = 11366481
TIMESTAMP = 1588924328
SHA256 (SuperCollider-3.11.0-Source.tar.bz2) = 37592a32108757bf282575f0d3b0e373bae9dbce6cf990282ea85299b13eb250
SIZE (SuperCollider-3.11.0-Source.tar.bz2) = 18125654

10
audio/supercollider/files/patch-QtCollider_primitives_prim__QPen.cpp Normal file
View File

@ -0,0 +1,10 @@
--- 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 <QPainter>
+#include <QPainterPath>
#include <QVector2D>
#include <QVector3D>
#include <cmath>

10
audio/supercollider/files/patch-QtCollider_widgets_QcGraph.cpp Normal file
View File

@ -0,0 +1,10 @@
--- 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 <QPainter>
+#include <QPainterPath>
#include <QMouseEvent>
#include <QApplication>
#include <QtCore/qmath.h>

10
audio/supercollider/files/patch-QtCollider_widgets_QcLevelIndicator.cpp Normal file
View File

@ -0,0 +1,10 @@
--- QtCollider/widgets/QcLevelIndicator.cpp.orig 2020-06-15 01:16:56 UTC
+++ QtCollider/widgets/QcLevelIndicator.cpp
@@ -23,6 +23,7 @@
#include "../QcWidgetFactory.h"
#include <QPainter>
+#include <QPainterPath>
QC_DECLARE_QWIDGET_FACTORY(QcLevelIndicator);

10
audio/supercollider/files/patch-QtCollider_widgets_QcMultiSlider.cpp Normal file
View File

@ -0,0 +1,10 @@
--- QtCollider/widgets/QcMultiSlider.cpp.orig 2020-06-15 00:48:09 UTC
+++ QtCollider/widgets/QcMultiSlider.cpp
@@ -26,6 +26,7 @@
#include <QApplication>
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
#include <cmath>

10
audio/supercollider/files/patch-QtCollider_widgets_QcScopeShm.cpp Normal file
View File

@ -0,0 +1,10 @@
--- QtCollider/widgets/QcScopeShm.cpp.orig 2020-06-15 01:00:40 UTC
+++ QtCollider/widgets/QcScopeShm.cpp
@@ -25,6 +25,7 @@
#include "../debug.h"
#include <QPainter>
+#include <QPainterPath>
#include <QTimer>
#include <QResizeEvent>
#include <QWindow>

10
audio/supercollider/files/patch-QtCollider_widgets_soundfileview_view.cpp Normal file
View File

@ -0,0 +1,10 @@
--- QtCollider/widgets/soundfileview/view.cpp.orig 2020-06-15 01:36:47 UTC
+++ QtCollider/widgets/soundfileview/view.cpp
@@ -24,6 +24,7 @@
#include <QGridLayout>
#include <QPainter>
+#include <QPainterPath>
#include <QApplication>
#include <QPaintEvent>
#include <QCursor>

14
audio/supercollider/files/patch-external__libraries_CMakeLists.txt
View File

@ -1,14 +0,0 @@
--- external_libraries/CMakeLists.txt.orig 2019-05-24 16:22:36.227027000 +0000
+++ external_libraries/CMakeLists.txt 2019-05-24 16:23:37.721453000 +0000
@@ -52,8 +52,10 @@
endif()
- if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
target_compile_options(boost_thread PRIVATE -fPIC)
+ target_compile_options(boost_system PRIVATE -fPIC)
+ target_compile_options(boost_filesystem PRIVATE -fPIC)
target_link_libraries(boost_thread rt)
endif()

34
audio/supercollider/pkg-plist
View File

@ -485,6 +485,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/Line.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/LineLayout.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Linen.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/LinkClock.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/LinkedList.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/LinkedListNode.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/List.schelp
@ -521,6 +522,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/Menu.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/MenuAction.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Message.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/MeterSync.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Method.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/MidEQ.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Mix.schelp
@ -697,6 +699,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/Pgauss.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Pgbrown.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Pgeom.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Pget.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Pgpar.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Pgroup.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Phasor.schelp
@ -716,6 +719,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/Plazy.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/PlazyEnvir.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/PlazyEnvirN.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Plet.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Plotter.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Plprand.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Pluck.schelp
@ -778,6 +782,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/Psync.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Ptime.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Ptpar.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Ptrace.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Ptuple.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Pulse.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/PulseCount.schelp
@ -930,7 +935,6 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/TChoose.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/TDelay.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/TDuty.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/TDuty_old.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/TExpRand.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/TGrains.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/TIRand.schelp
@ -1003,12 +1007,10 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/ZeroCrossing.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/chebyshevpolynomials.png
%%HELP%%share/SuperCollider/HelpSource/Guides/.placeholder
%%HELP%%share/SuperCollider/HelpSource/Guides/AggregateDevice.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/Backwards-Compatibility.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/Bundled-Messages.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/ClientVsServer.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/Debugging-tips.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/EmacsGUI.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/FFT-Overview.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/GUI-Introduction.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/GUI-Layout-Management.schelp
@ -1025,6 +1027,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Guides/MultiClient_Setups.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/Multichannel-Expansion.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/News-3_10.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/News-3_11.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/News-3_5.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/News-3_6.schelp
%%HELP%%share/SuperCollider/HelpSource/Guides/News-3_7.schelp
@ -1095,6 +1098,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Reference/.placeholder
%%HELP%%share/SuperCollider/HelpSource/Reference/Adverbs.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/Assignment.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/AudioDeviceSelection.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/Classes.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/Comments.schelp
%%HELP%%share/SuperCollider/HelpSource/Reference/Control-Structures.schelp
@ -1319,6 +1323,7 @@ share/SuperCollider/SCClassLibrary/Common/Audio/TestUGens.sc
share/SuperCollider/SCClassLibrary/Common/Audio/Trig.sc
share/SuperCollider/SCClassLibrary/Common/Audio/UGen.sc
share/SuperCollider/SCClassLibrary/Common/Audio/canFreeSynth.sc
share/SuperCollider/SCClassLibrary/Common/Audio/iphone/iPhoneUGens.sc
share/SuperCollider/SCClassLibrary/Common/Collections/Array.sc
share/SuperCollider/SCClassLibrary/Common/Collections/Array2D.sc
share/SuperCollider/SCClassLibrary/Common/Collections/ArrayedCollection.sc
@ -1346,6 +1351,8 @@ share/SuperCollider/SCClassLibrary/Common/Collections/SortedList.sc
share/SuperCollider/SCClassLibrary/Common/Collections/SparseArray.sc
share/SuperCollider/SCClassLibrary/Common/Collections/String.sc
share/SuperCollider/SCClassLibrary/Common/Collections/linux/extString_linux.sc
share/SuperCollider/SCClassLibrary/Common/Collections/osx/extString_osx.sc
share/SuperCollider/SCClassLibrary/Common/Collections/windows/extString_windows.sc
share/SuperCollider/SCClassLibrary/Common/Control/Buffer.sc
share/SuperCollider/SCClassLibrary/Common/Control/Bus.sc
share/SuperCollider/SCClassLibrary/Common/Control/Engine.sc
@ -1355,6 +1362,7 @@ share/SuperCollider/SCClassLibrary/Common/Control/HIDMatchers.sc
share/SuperCollider/SCClassLibrary/Common/Control/HID_API.sc
share/SuperCollider/SCClassLibrary/Common/Control/MIDIOut.sc
share/SuperCollider/SCClassLibrary/Common/Control/MIDIResponder.sc
share/SuperCollider/SCClassLibrary/Common/Control/MeterSync.sc
share/SuperCollider/SCClassLibrary/Common/Control/NetAddr.sc
share/SuperCollider/SCClassLibrary/Common/Control/Node.sc
share/SuperCollider/SCClassLibrary/Common/Control/NodeControl.sc
@ -1482,6 +1490,9 @@ share/SuperCollider/SCClassLibrary/Common/GUI/backwardsCompatibility/classNameRe
share/SuperCollider/SCClassLibrary/Common/GUI/backwardsCompatibility/deprecated-3.7.sc
share/SuperCollider/SCClassLibrary/Common/GUI/backwardsCompatibility/flowViewSupportQt.sc
share/SuperCollider/SCClassLibrary/Common/GUI/backwardsCompatibility/viewExtensions.sc
share/SuperCollider/SCClassLibrary/Common/GUI/iphone/Base/GUIScreen.sc
share/SuperCollider/SCClassLibrary/Common/GUI/iphone/Base/SCFont.sc
share/SuperCollider/SCClassLibrary/Common/GUI/iphone/Base/SCView.sc
share/SuperCollider/SCClassLibrary/Common/GUI/tools/HelpBrowser.sc
share/SuperCollider/SCClassLibrary/Common/GUI/tools/Inspector.sc
share/SuperCollider/SCClassLibrary/Common/GUI/tools/ServerMeter.sc
@ -1535,6 +1546,7 @@ share/SuperCollider/SCClassLibrary/Common/Streams/TabFileReader.sc
share/SuperCollider/SCClassLibrary/Common/Streams/TimePatterns.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
@ -1572,11 +1584,23 @@ share/SuperCollider/SCClassLibrary/JITLib/ProxySpace/extStoreOn.sc
share/SuperCollider/SCClassLibrary/JITLib/ProxySpace/operators.sc
share/SuperCollider/SCClassLibrary/JITLib/ProxySpace/wrapForNodeProxy.sc
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/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
share/SuperCollider/SCClassLibrary/Platform/osx/ApplicationStart.sc
share/SuperCollider/SCClassLibrary/Platform/osx/OSXPlatform.sc
share/SuperCollider/SCClassLibrary/Platform/osx/extMIDIOut.sc
share/SuperCollider/SCClassLibrary/Platform/osx/extMain.sc
share/SuperCollider/SCClassLibrary/Platform/windows/SystemOverwrites/overwrites.sc
share/SuperCollider/SCClassLibrary/Platform/windows/WindowsPlatform.sc
share/SuperCollider/SCClassLibrary/Platform/windows/extMIDIOut.sc
share/SuperCollider/SCClassLibrary/Platform/windows/extMain.sc
share/SuperCollider/SCClassLibrary/Platform/windows/extServerOptions.sc
share/SuperCollider/SCClassLibrary/SCDoc/Help.sc
share/SuperCollider/SCClassLibrary/SCDoc/SCDoc.sc
share/SuperCollider/SCClassLibrary/SCDoc/SCDocRenderer.sc
@ -1586,9 +1610,12 @@ 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/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
share/SuperCollider/SCClassLibrary/deprecated/3.11/deprecated-3.11.sc
share/SuperCollider/SCClassLibrary/scide_scqt/ScIDE.sc
share/SuperCollider/examples/GUI examples/ColorBrowser.scd
share/SuperCollider/examples/GUI examples/GUI_examples1.scd
@ -1669,3 +1696,4 @@ share/mime/packages/supercollider.xml
share/pixmaps/sc_ide.svg
share/pixmaps/supercollider.png
share/pixmaps/supercollider.xpm
@dir share/SuperCollider/SCClassLibrary/External