From cb6e0a0079772979c6c03cf2d727ecdc90db04e4 Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Sat, 16 Aug 2025 17:58:28 +0200 Subject: [PATCH 1/8] Upgrade to libsndfile 1.2.2 --- ci/build-small-libsndfile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build-small-libsndfile.sh b/ci/build-small-libsndfile.sh index 36dc8d44..672cdeed 100755 --- a/ci/build-small-libsndfile.sh +++ b/ci/build-small-libsndfile.sh @@ -4,7 +4,7 @@ set -euo pipefail git clone https://github.com/libsndfile/libsndfile.git cd libsndfile -git checkout 1.1.0 +git checkout 1.2.2 autoreconf -vif ./configure \ --disable-sqlite \ From 584c0dc5406b5bfc60669e49d3a2e200c3b3bf0c Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Sat, 16 Aug 2025 18:17:13 +0200 Subject: [PATCH 2/8] libsndfile: cherry-pick fix for bool/true/false error --- ci/build-small-libsndfile.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/build-small-libsndfile.sh b/ci/build-small-libsndfile.sh index 672cdeed..7e1e324b 100755 --- a/ci/build-small-libsndfile.sh +++ b/ci/build-small-libsndfile.sh @@ -5,6 +5,10 @@ set -euo pipefail git clone https://github.com/libsndfile/libsndfile.git cd libsndfile git checkout 1.2.2 +# https://github.com/libsndfile/libsndfile/issues/1049 +git config user.name "Dummy Name for cherry-pick" +git config --global user.email "cherry-pick@example.com" +git cherry-pick 2251737b3b175925684ec0d37029ff4cb521d302 autoreconf -vif ./configure \ --disable-sqlite \ From da55701c36b95c971e6ebc61cdadf32b944ec37a Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Sat, 16 Aug 2025 18:04:27 +0200 Subject: [PATCH 3/8] CI: update Xcode versions --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ce5dd25..7e8d528e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,9 +27,11 @@ jobs: CXX: clang++-9 CXXFLAGS: -fno-builtin - os: macos-15 # arm64 - xcode: Xcode_16.0 + xcode: Xcode_26.0 + - os: macos-15 # arm64 + xcode: Xcode_16.4 - os: macos-14 # arm64 - xcode: Xcode_16.0 + xcode: Xcode_16.2 - os: macos-13 # Intel xcode: Xcode_15.2 - os: macos-13 # Intel From d9d665b53fbcf06d7b894704ff5dbe8451866a74 Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Sat, 16 Aug 2025 18:52:43 +0200 Subject: [PATCH 4/8] CircleCI: update yarn installation --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b6813b3c..200f0688 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,8 +30,8 @@ jobs: - run: name: Installing apt Packages command: | - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list + curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/yarn.gpg + echo "deb [signed-by=/etc/apt/trusted.gpg.d/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list apt-get update apt-get install -y --no-install-recommends \ automake \ From 972e2187f6f990e1c6478b07fe9678defb694afe Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Sun, 17 Aug 2025 09:54:15 +0200 Subject: [PATCH 5/8] CI: manually build websocketpp --- .github/workflows/main.yml | 7 +++++-- ci/build-websocketpp.sh | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100755 ci/build-websocketpp.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7e8d528e..522cf138 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -65,7 +65,6 @@ jobs: libqt5opengl5-dev libsndfile1-dev libtool - libwebsocketpp-dev libxml2-dev pkg-config ) @@ -97,7 +96,6 @@ jobs: pkg-config qt@5 vrpn - websocketpp ) brew install ${PACKAGES[@]} echo CPPFLAGS="-I$(brew --prefix)/include" >> $GITHUB_ENV @@ -121,6 +119,11 @@ jobs: if: startsWith(matrix.os, 'ubuntu') run: | ci/build-deps-ubuntu.sh + - name: Build websocketpp + # This is needed until https://github.com/zaphoyd/websocketpp/pull/1164 + # is merged and available as apt and brew packages. + run: | + ci/build-websocketpp.sh - name: upload VRPN logs if: failure() && startsWith(matrix.os, 'ubuntu') uses: actions/upload-artifact@v4 diff --git a/ci/build-websocketpp.sh b/ci/build-websocketpp.sh new file mode 100755 index 00000000..0b7a3fc9 --- /dev/null +++ b/ci/build-websocketpp.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +set -euo pipefail + +git clone https://github.com/zaphoyd/websocketpp.git +cd websocketpp +# https://github.com/zaphoyd/websocketpp/pull/1164 +git fetch origin pull/1164/head +git checkout FETCH_HEAD +mkdir build +cd build +cmake .. +make +sudo make install +cd .. +cd .. From 09e87185080cc72489ae9c3483fe822a7ddb5150 Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Mon, 18 Aug 2025 09:19:38 +0200 Subject: [PATCH 6/8] CI: update Ubuntu versions --- .github/workflows/main.yml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 522cf138..831360b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,27 +5,36 @@ jobs: strategy: matrix: include: + - os: ubuntu-24.04 + compiler-pkg: g++-14 + env: + CC: gcc-14 + CXX: g++-14 - os: ubuntu-22.04 compiler-pkg: g++-12 env: CC: gcc-12 CXX: g++-12 - - os: ubuntu-20.04 - compiler-pkg: g++-9 + - os: ubuntu-22.04 + compiler-pkg: g++-10 env: - CC: gcc-9 - CXX: g++-9 + CC: gcc-10 + CXX: g++-10 + - os: ubuntu-24.04 + compiler-pkg: clang-18 + env: + CC: clang-18 + CXX: clang++-18 - os: ubuntu-22.04 - compiler-pkg: clang-14 + compiler-pkg: clang-15 env: - CC: clang-14 - CXX: clang++-14 - - os: ubuntu-20.04 - compiler-pkg: clang-9 + CC: clang-15 + CXX: clang++-15 + - os: ubuntu-22.04 + compiler-pkg: clang-13 env: - CC: clang-9 - CXX: clang++-9 - CXXFLAGS: -fno-builtin + CC: clang-13 + CXX: clang++-13 - os: macos-15 # arm64 xcode: Xcode_26.0 - os: macos-15 # arm64 From 8a25550057ad9d81e9fe6f7dfb5c07cbf5309a6e Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Mon, 18 Aug 2025 09:24:42 +0200 Subject: [PATCH 7/8] CI: use Deken Docker image --- .github/workflows/pd-externals.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pd-externals.yml b/.github/workflows/pd-externals.yml index d83fb315..08538c7c 100644 --- a/.github/workflows/pd-externals.yml +++ b/.github/workflows/pd-externals.yml @@ -133,16 +133,22 @@ jobs: path: ssr/flext/build/* deken-package: - # Deken is not available on 22.04, - # see https://github.com/pure-data/deken/issues/260 - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest + container: registry.git.iem.at/pd/deken needs: [linux, macos, windows] steps: + - name: Install Git + run: | + apt-get update + apt-get install --assume-yes --no-install-recommends git - name: Clone Git repository uses: actions/checkout@v4 with: # check out all tags to get proper version in Deken package fetch-depth: 0 + - name: git clone fix + # https://github.com/actions/checkout/issues/1169: + run: git config --system --add safe.directory $GITHUB_WORKSPACE - name: Retrieve Linux externals uses: actions/download-artifact@v4 with: @@ -158,12 +164,6 @@ jobs: with: name: windows-externals path: ssr - - name: Install deken - run: | - sudo apt-get install --no-install-recommends deken - # work-arounds from https://github.com/pure-data/deken/issues/247: - mkdir ~/.deken - python3 -m pip install hy==0.19 - name: Run deken run: | deken package -v $(git describe --tags --always) --objects flext/objects.txt ssr From 7997e9b54f750f785184098545bac4839c6d1cb5 Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Mon, 18 Aug 2025 10:46:09 +0200 Subject: [PATCH 8/8] linkcheck: ignore AUR URL --- doc/manual/conf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/manual/conf.py b/doc/manual/conf.py index a1e0b51b..cb018189 100644 --- a/doc/manual/conf.py +++ b/doc/manual/conf.py @@ -36,6 +36,8 @@ r'http://localhost:\d+', # This works in the browser, but not with linkcheck: 'https://github.com/AudioSceneDescriptionFormat/asdf-rust#building-the-c-api', + # "Read timed out": + 'https://aur.archlinux.org', ] # -- Options for HTML output ---------------------------------------------------