Merge pull request supercollider#5564 from supercollider/3.12

Merge 3.12 into main
BelaPlatform · Sep 5, 2021 · b678713 · b678713
2 parents 028ff1b + 3a6eabc
commit b678713
Show file tree

Hide file tree

Showing 9 changed files with 478 additions and 14 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -235,6 +235,7 @@ jobs:
       SHARED_LIBSCSYNTH: ${{ matrix.shared-libscsynth }}
       ARTIFACT_FILE: 'SuperCollider-${{ needs.lint.outputs.sc-version }}-${{ matrix.artifact-suffix }}.dmg'
       DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer'
+      MACOSX_DEPLOYMENT_TARGET: '${{ matrix.deployment-target }}'
     steps:
       - uses: actions/checkout@v2
         with:
@@ -274,14 +275,47 @@ jobs:
       - name: build libsndfile # to make it compatible with older OSes (lower deployment target)
         if: matrix.build-libsndfile == true
         run: |
-          brew uninstall --ignore-dependencies libsndfile
-          brew install automake mpg123
+          brew uninstall --ignore-dependencies libsndfile libvorbis libogg flac opus
+          brew install automake
+          cd $GITHUB_WORKSPACE/..
+          curl -L https://gitlab.xiph.org/xiph/ogg/-/archive/v1.3.5/ogg-v1.3.5.tar.bz2 --output ogg.tar.bz2
+          tar xfz ogg.tar.bz2
+          cd ogg*/
+          echo "*** building libogg ***"
+          mkdir build && cd build
+          cmake -G"Unix Makefiles" -DBUILD_FRAMEWORK=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" -DCMAKE_INSTALL_PREFIX=/usr/local ..
+          cmake --build . --target install
+          cd $GITHUB_WORKSPACE/..
+          curl -L https://github.com/xiph/flac/archive/refs/tags/1.3.3.tar.gz --output flac.tar.xz
+          tar xfz flac.tar.xz
+          cd flac*/
+          echo "*** building flac ***"
+          cd build # build directory already exists
+          cmake -G"Unix Makefiles" -DBUILD_SHARED_LIBS=OFF -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" -DCMAKE_INSTALL_PREFIX=/usr/local ..
+          cmake --build . --target install
+          cd $GITHUB_WORKSPACE/..
+          curl -L https://github.com/xiph/opus/archive/refs/tags/v1.3.1.tar.gz --output opus.tar.gz
+          tar xfz opus.tar.gz
+          cd opus*/
+          echo "*** building opus ***"
+          mkdir build && cd build
+          cmake -G"Unix Makefiles" -DBUILD_SHARED_LIBS=OFF -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" -DCMAKE_INSTALL_PREFIX=/usr/local ..
+          cmake --build . --target install
+          cd $GITHUB_WORKSPACE/..
+          curl -L https://github.com/xiph/vorbis/releases/download/v1.3.7/libvorbis-1.3.7.tar.gz --output libvorbis.tar.gz
+          tar xfz libvorbis.tar.gz
+          cd libvorbis*/
+          echo "building *** libvorbis ***"
+          mkdir build && cd build
+          cmake -G"Unix Makefiles" -DBUILD_FRAMEWORK=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" -DCMAKE_INSTALL_PREFIX=/usr/local ..
+          cmake --build . --target install
           cd $GITHUB_WORKSPACE/..
           curl -L https://github.com/libsndfile/libsndfile/releases/download/1.0.31/libsndfile-1.0.31.tar.bz2 --output libsndfile.tar.bz2
-          tar xfvz libsndfile.tar.bz2
+          tar xfz libsndfile.tar.bz2
           cd libsndfile*/
+          echo "building libsndfile"
           mkdir build && cd build
-          cmake -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.deployment-target }} -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_C_FLAGS="-Wall -Wextra" -DCMAKE_INSTALL_PREFIX=/usr/local ..
+          cmake -G"Unix Makefiles" -DBUILD_SHARED_LIBS=ON -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_C_FLAGS="-Wall -Wextra" -DCMAKE_INSTALL_PREFIX=/usr/local ..
           cmake --build . --target install
       - name: install system libraries
         if: env.USE_SYSLIBS == 'true'
@@ -311,7 +345,7 @@ jobs:
 
           echo "EXTRA_CMAKE_FLAGS:" $EXTRA_CMAKE_FLAGS
 
-          cmake -G"Xcode" -DRULE_LAUNCH_COMPILE=ccache -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.deployment-target }} -DSUPERNOVA=ON $EXTRA_CMAKE_FLAGS .. --debug-output
+          cmake -G"Xcode" -DRULE_LAUNCH_COMPILE=ccache -DSUPERNOVA=ON $EXTRA_CMAKE_FLAGS .. --debug-output
       - name: build
         run: cmake --build $BUILD_PATH --config Release --target install
       - name: create archive
@@ -325,7 +359,7 @@ jobs:
           # the following assumes that we end up with the build in the folder SuperCollider
           # hdiutil sometimes fails with "create failed - Resource busy"
           # when that happens, we run it again
-          hdiutil create -srcfolder SuperCollider -format UDZO $ARTIFACT_FILE || hdiutil create -srcfolder SuperCollider -format UDZO $ARTIFACT_FILE
+          hdiutil create -srcfolder SuperCollider -format UDZO -fs HFS+ $ARTIFACT_FILE || hdiutil create -srcfolder SuperCollider -format UDZO -fs HFS+ $ARTIFACT_FILE
       - name: upload artifacts
         uses: actions/upload-artifact@v2
         if: matrix.artifact-suffix
@@ -451,9 +485,9 @@ jobs:
           ASIO_PATH: ${{ env.LIBS_DOWNLOAD_PATH }}/asio_sdk
         run: |
           mkdir -p $ASIO_PATH && cd $ASIO_PATH
-          curl -L https://www.steinberg.net/sdk_downloads/asiosdk2.3.zip -o asio.zip
+          curl -L https://www.steinberg.net/asiosdk -o asio.zip
           7z x asio.zip -y
-          mv ASIOSDK2.3 $GITHUB_WORKSPACE/external_libraries/portaudio/asiosdk
+          mv asiosdk_* $GITHUB_WORKSPACE/external_libraries/portaudio/asiosdk
       - name: configure
         shell: bash
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,7 +41,15 @@ Release dates of 3.x versions:
 - 3.9: 2018-01-13
 - 3.10: 2018-11-24
 - 3.11: 2020-03-08
-- 3.12: 2020-08-02
+- 3.12: 2021-08-02
+
+3.12.1 (2021-09-05)
+===================
+
+The 3.12.1 release fixes compatibility with older macOS systems (10.13 and below)
+
+### General: Fixed
+Builds for older macOS systems ([#5537](https://github.com/supercollider/supercollider/pull/5537))
 
 3.12.0 (2021-08-02)
 ===================
@@ -105,6 +113,7 @@ macOS builds include a custom build of libsndfile to support older macOS version
 
 ### UGens: Fixed
 PanAz: initialize amps in Ctor ([#4973](https://github.com/supercollider/supercollider/pull/4973))
+
 EnvGen fixes ([#5217](https://github.com/supercollider/supercollider/pull/5217), [#4921](https://github.com/supercollider/supercollider/pull/4921), [#4793](https://github.com/supercollider/supercollider/pull/4793))
 
 ### IDE: Fixed

diff --git a/HelpSource/Classes/Server.schelp b/HelpSource/Classes/Server.schelp
@@ -28,6 +28,8 @@ code::
 s.serverRunning // returns true if it is true
 ::
 
+Some insights about common Server issues can be found on the FAQ link::Guides/UserFAQ#Server Issues#Server Issues::
+
 
 ClassMethods::
 private:: initClass

diff --git a/HelpSource/Classes/SynthDef.schelp b/HelpSource/Classes/SynthDef.schelp
@@ -11,6 +11,8 @@ The SynthDef class encapsulates the client-side representation of a given def, a
 
 SynthDef is one of the more complicated classes in SC and an exhaustive explanation of it is beyond the scope of this document. As such, the examples at the bottom of this document and those found in the various tutorials accessible from link::Help:: may be necessary to make some aspects of its use clear.
 
+Some insights about common SynthDef issues can be found on the FAQ link::Guides/UserFAQ#SynthDef Issues#SynthDef Issues::
+
 subsection:: UGen Graph Functions and Special Argument Forms
 
 The core of a def is its link::Classes/UGen##unit generator:: graph function.

diff --git a/HelpSource/Guides/GUI-Introduction.schelp b/HelpSource/Guides/GUI-Introduction.schelp
@@ -390,4 +390,6 @@ Routine{
 }.play(SystemClock)
 ::
 
-As mentioned above, using the GUI system is also not allowed in code performed directly in response to OSC messages (this includes functions given to all kinds of OSC responder classes). The same solutions as above apply:
+As mentioned above, using the GUI system is also not allowed in code performed directly in response to OSC messages (this includes functions given to all kinds of OSC responder classes). The same solutions as above apply.
+
+Another example for addressing this issue can be found in the FAQ link::Guides/UserFAQ#Language (client) Issues#Language (client) Issues::
diff --git a/HelpSource/Guides/News-3_12.schelp b/HelpSource/Guides/News-3_12.schelp
@@ -2,7 +2,7 @@ title:: News in 3.12
 summary:: A summary of news in SC 3.12
 categories:: News
 
-The 3.12.0 release brings new features, countless bugfixes, as well as project and documentation updates. See the repository for all the changes. A big thank you to all developers for your contributions!
+The 3.12 release brings new features, countless bugfixes, as well as project and documentation updates. See the repository for all the changes. A big thank you to all developers for your contributions!
 
 Change log highlights:
 
@@ -26,6 +26,9 @@ Move CI from Travis/AppVeyor to GitHub Actions (#5261, #5273 #5371, #5377)
 
 Run TestSuite in CI (#5332)
 
+section::  General: Fixed
+Builds for older macOS systems (#5537)
+
 section::  sclang: Changed
 Exclude default paths: change from command line parameter to language file flag (#3733)
 
@@ -61,6 +64,7 @@ macOS builds include a custom build of libsndfile to support older macOS version
 
 section::  UGens: Fixed
 PanAz: initialize amps in Ctor (#4973)
+
 EnvGen fixes (#5217, #4921, #4793)
 
 section::  IDE: Fixed