Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jackaudio/jack2-releases
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.9.20
Choose a base ref
...
head repository: jackaudio/jack2-releases
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 9 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 27, 2022

  1. Copy the full SHA
    6a66cb0 View commit details

Commits on Apr 13, 2022

  1. Rebuild for new qjackctl release

    Signed-off-by: falkTX <[email protected]>
    falkTX committed Apr 13, 2022
    Copy the full SHA
    d5bd3e4 View commit details
  2. Fix up for LTO, can never be enabled :(

    Signed-off-by: falkTX <[email protected]>
    falkTX committed Apr 13, 2022
    Copy the full SHA
    85a5055 View commit details

Commits on Apr 15, 2022

  1. Tag 1.9.21 release

    Signed-off-by: falkTX <[email protected]>
    falkTX committed Apr 15, 2022
    Copy the full SHA
    8a33a68 View commit details

Commits on Feb 2, 2023

  1. Update to jack2 1.9.22 and qjackctl 0.9.9

    Signed-off-by: falkTX <[email protected]>
    falkTX committed Feb 2, 2023
    Copy the full SHA
    f1cf27b View commit details
  2. Fix GitHub's mess

    Signed-off-by: falkTX <[email protected]>
    falkTX committed Feb 2, 2023
    Copy the full SHA
    636a893 View commit details
  3. Add jack-example-tools, fixup CI

    Signed-off-by: falkTX <[email protected]>
    falkTX committed Feb 2, 2023
    Copy the full SHA
    1ac1f57 View commit details
  4. Fix build

    Signed-off-by: falkTX <[email protected]>
    falkTX committed Feb 2, 2023
    Copy the full SHA
    cb4b0f2 View commit details

Commits on Feb 3, 2023

  1. Real fix

    Signed-off-by: falkTX <[email protected]>
    falkTX committed Feb 3, 2023
    Copy the full SHA
    7e674a8 View commit details
Showing with 71 additions and 28 deletions.
  1. +66 −25 .github/workflows/release.yml
  2. +1 −1 PawPaw
  3. +4 −2 pack-jack2-version.sh
91 changes: 66 additions & 25 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -2,27 +2,23 @@ name: release

on:
push:
branches:
- '*'
pull_request:
branches:
- '*'

env:
CACHE_VERSION: 2
CACHE_VERSION: 5
DEBIAN_FRONTEND: noninteractive
HOMEBREW_NO_AUTO_UPDATE: 1
PAWPAW_SKIP_LTO: 1

jobs:
# macOS native intel build
macos:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
~/PawPawBuilds
@@ -36,25 +32,36 @@ jobs:
./PawPaw/bootstrap-jack2.sh macos && ./PawPaw/bootstrap-qt.sh macos && ./PawPaw/.cleanup.sh macos
- name: Build macOS intel
shell: bash
if: steps.cache.outputs.cache-hit == 'true'
run: |
./pack-jack2-version.sh macos
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: jack2-macOS-intel-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-macOS-*.tar.gz
- uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
tag_name: ${{ github.ref_name }}
name: ${{ github.ref_name }}
draft: false
prerelease: false
files: |
path: PawPaw/jack2-macOS-*.tar.gz
# macOS native universal build
macos_universal:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
~/PawPawBuilds
@@ -72,25 +79,36 @@ jobs:
./PawPaw/bootstrap-jack2.sh macos-universal && ./PawPaw/bootstrap-qt.sh macos-universal && ./PawPaw/.cleanup.sh macos-universal
- name: Build macOS universal
shell: bash
if: steps.cache.outputs.cache-hit == 'true'
run: |
./pack-jack2-version.sh macos-universal
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: jack2-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-macOS-*.tar.gz
- uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
tag_name: ${{ github.ref_name }}
name: ${{ github.ref_name }}
draft: false
prerelease: false
files: |
path: PawPaw/jack2-macOS-*.tar.gz
# linux with win32 cross-compilation
win32:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
~/PawPawBuilds
@@ -104,12 +122,13 @@ jobs:
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
sudo apt-get install -yqq --allow-downgrades libgd3/jammy
sudo apt-get purge -yqq libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 nuget
- name: Set up dependencies
run: |
sudo dpkg --add-architecture i386
sudo apt-get update -qq
sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev qttools5-dev-tools xvfb \
sudo apt-get install -y autopoint build-essential curl cmake jq llvm meson mingw-w64 qttools5-dev qttools5-dev-tools xvfb \
binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
- name: Cache debian packages
run: |
@@ -121,25 +140,36 @@ jobs:
./PawPaw/bootstrap-jack2.sh win32 && ./PawPaw/bootstrap-qt.sh win32 && ./PawPaw/.cleanup.sh win32
- name: Build win32 cross-compiled
shell: bash
if: steps.cache.outputs.cache-hit == 'true'
run: |
xvfb-run ./pack-jack2-version.sh win32
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: jack2-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-win*.exe
- uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
tag_name: ${{ github.ref_name }}
name: ${{ github.ref_name }}
draft: false
prerelease: false
files: |
path: PawPaw/jack2-win*.exe
# linux with win64 cross-compilation
win64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
~/PawPawBuilds
@@ -153,12 +183,13 @@ jobs:
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
sudo apt-get install -yqq --allow-downgrades libgd3/jammy
sudo apt-get purge -yqq libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 nuget
- name: Set up dependencies
run: |
sudo dpkg --add-architecture i386
sudo apt-get update -qq
sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev qttools5-dev-tools xvfb \
sudo apt-get install -y autopoint build-essential curl cmake jq llvm meson mingw-w64 qttools5-dev qttools5-dev-tools xvfb \
binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
- name: Cache debian packages
run: |
@@ -170,12 +201,22 @@ jobs:
./PawPaw/bootstrap-jack2.sh win64 && ./PawPaw/bootstrap-qt.sh win64 && ./PawPaw/.cleanup.sh win64
- name: Build win64 cross-compiled
shell: bash
if: steps.cache.outputs.cache-hit == 'true'
run: |
xvfb-run ./pack-jack2-version.sh win64
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: jack2-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-win*.exe
- uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
tag_name: ${{ github.ref_name }}
name: ${{ github.ref_name }}
draft: false
prerelease: false
files: |
path: PawPaw/jack2-win*.exe
2 changes: 1 addition & 1 deletion PawPaw
Submodule PawPaw updated 62 files
+483 −155 .github/workflows/bootstrap.yml
+1 −1 README.md
+8 −22 bootstrap-cardinal.sh
+118 −87 bootstrap-carla.sh
+50 −8 bootstrap-common.sh
+4 −0 bootstrap-jack2.sh
+348 −32 bootstrap-plugins.sh
+33 −10 bootstrap-qt.sh
+41 −10 build-jack2.sh
+12 −1 local.env
+2 −1 pack-jack2.sh
+0 −0 patches/Python/macos-universal
+26 −0 patches/Python/macos/01_fix-build-triplet.patch
+31 −16 patches/Python/win32/9001-pawpaw-needed-changes.patch
+36 −0 patches/cairo/01_undef-zlib-deflate-macro.patch
+19 −0 patches/flac/9001-fix-libs.patch
+62 −0 patches/flac/9002-hidden-flac-api.patch
+20 −0 patches/fluidsynth/01_force-empty-libsuffix.patch
+0 −0 patches/fluidsynth/03_skip-drivers-build.patch
+31 −0 patches/fluidsynth/04_hidden-fluidsynth-api.patch
+13 −0 patches/fluidsynth/wasm/11_skip-bigendian-check.patch
+53 −0 patches/fomp/wasm/11_wasm-setup.patch
+32 −0 patches/fontconfig/01_win32-local-address-handle.patch
+22 −0 patches/fontconfig/02_skip-tests.patch
+13 −0 patches/fontconfig/03_fix-wasm-build.patch
+1 −0 patches/glib/macos-universal
+0 −40 patches/glib/macos-universal/01_skip-gettext.patch
+0 −0 patches/glib/macos/02_aarch64-atomic-as-mutex.patch
+1 −0 patches/glib/wasm-2.45/01_skip-gettext.patch
+83 −0 patches/glib/wasm-2.45/02_fix-build.patch
+1 −0 patches/glib/wasm/01_skip-gettext.patch
+53 −0 patches/glib/wasm/02_fix-build.patch
+18 −0 patches/glib/wasm/03_no-pthread-helper.patch
+352 −0 patches/glib/wasm/04_force-build.patch
+25 −0 patches/libffi/wasm-3.4.2/11_force-build.patch
+12 −0 patches/libsndfile/02_fix-libs.patch
+28 −0 patches/libvorbis/0001-Fix-build-failure-with-DSO-link-changes.patch
+26 −0 patches/libvorbis/0002-Avoid-SIGFPE-when-bytespersample-is-zero.patch
+28 −0 patches/libvorbis/9001-Fix-libs.patch
+0 −25 patches/lilv/linux/01_fix-build.patch
+22 −0 patches/lilv/wasm/11_fix-build.patch
+0 −9 patches/lilv/win32/01_force-libs.patch
+0 −1 patches/lilv/win64
+0 −11 patches/lv2/01_plugin-is-project.patch
+0 −54 patches/lv2/03_lv2-validate-without-example-plugins.patch
+15 −0 patches/lv2/wasm/11_emscripten-keep-alive.patch
+53 −0 patches/mda-lv2/wasm/11_wasm-setup.patch
+0 −14 patches/mod-sdk/01_add-makefile.patch
+10 −0 patches/opus/01_force-libs.patch
+23 −0 patches/opus/02_hidden-opus-api.patch
+13 −0 patches/pixman/01_wasm-missing-sse2-calls-workaround.patch
+17 −0 patches/qtbase/macos-universal/02_fix-12.0-build.patch
+0 −71 patches/serd/c4c4ec510dbeff61982e4aee7d1b379539319cd9.patch
+22 −0 patches/serd/wasm/11_fix-build.patch
+0 −0 plugins/mda-lv2.json
+91 −7 setup/check_target.sh
+108 −39 setup/env.sh
+63 −20 setup/functions.sh
+1 −1 setup/macos/package.xml.in
+3 −3 setup/meson/macos-old.ini
+18 −0 setup/meson/wasm.ini
+49 −31 setup/versions.sh
6 changes: 4 additions & 2 deletions pack-jack2-version.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/bash

export JACK2_VERSION=v1.9.20
export QJACKCTL_VERSION=0.9.6
export JACK2_VERSION=v1.9.22
export JACK_EXAMPLE_TOOLS_VERSION=4b0b16a709475cf4a084e04a0849898a8421b636
export QJACKCTL_VERSION=0.9.9

set -e

@@ -21,6 +22,7 @@ fi

rm -rf ~/PawPawBuilds/builds/*/jack-router-*
rm -rf ~/PawPawBuilds/builds/*/jack2-${JACK2_VERSION}
rm -rf ~/PawPawBuilds/builds/*/jack-example-tools-${JACK_EXAMPLE_TOOLS_VERSION}
rm -rf ~/PawPawBuilds/builds/*/qjackctl-${QJACKCTL_VERSION}

# ---------------------------------------------------------------------------------------------------------------------