Skip to content

Commit

Permalink
Cleanup, update carla, dpf and pawpaw
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <[email protected]>
  • Loading branch information
falkTX committed Dec 31, 2023
1 parent 8bb5dcc commit d7c2236
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ name: build
on: [push, pull_request]

env:
CACHE_VERSION: 4
CACHE_VERSION: 5
CARDINAL_UNDER_WINE: 1
CIBUILD: true
EMSCRIPTEN_VERSION: 3.1.27
LIBGL_ALWAYS_SOFTWARE: true
PAWPAW_SKIP_LTO: 1
PAWPAW_SKIP_GLIB: 1
Expand Down Expand Up @@ -335,18 +334,14 @@ jobs:
sudo apt-get update -qq
sudo apt-get install -yqq brotli gperf meson
sudo apt-get clean
[ -e ~/PawPawBuilds/emsdk ] || git clone https://github.com/emscripten-core/emsdk.git ~/PawPawBuilds/emsdk
cd ~/PawPawBuilds/emsdk && ./emsdk install ${{ env.EMSCRIPTEN_VERSION }} && ./emsdk activate ${{ env.EMSCRIPTEN_VERSION }}
- name: Build extra dependencies
run: |
${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1
source ~/PawPawBuilds/emsdk/emsdk_env.sh
./deps/PawPaw/bootstrap-cardinal.sh wasm && ./deps/PawPaw/.cleanup.sh wasm
- name: Build wasm cross-compiled
if: steps.cache.outputs.cache-hit == 'true'
run: |
${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1
source ~/PawPawBuilds/emsdk/emsdk_env.sh
source deps/PawPaw/local.env wasm
# FIXME send patch upstream, assuming this works..
sed -i -e 's/defined(__riscv)/defined(__riscv) || defined(__EMSCRIPTEN__)/' plugins/surgext/surge/src/common/globals.h
Expand All @@ -356,7 +351,6 @@ jobs:
if: steps.cache.outputs.cache-hit == 'true'
run: |
${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1
source ~/PawPawBuilds/emsdk/emsdk_env.sh
source deps/PawPaw/local.env wasm
make HAVE_LIBLO=false NOOPT=true NOSIMD=${{ matrix.target == 'nosimd' }} -j $(nproc) -C src/CardinalMiniSep modgui
- name: Make wasm versioned and compress
Expand Down
2 changes: 1 addition & 1 deletion deps/PawPaw
Submodule PawPaw updated 77 files
+156 −0 .github/workflows/bootstrap-deps.sh
+723 −734 .github/workflows/bootstrap.yml
+6 −0 bootstrap-cardinal.sh
+5 −201 bootstrap-carla.sh
+130 −11 bootstrap-common.sh
+35 −7 bootstrap-jack2.sh
+489 −0 bootstrap-mod.sh
+33 −32 bootstrap-plugins.sh
+332 −0 bootstrap-python.sh
+64 −14 bootstrap-qt.sh
+65 −0 build-mod-plugin.sh
+17 −7 local.env
+3 −0 mingw-compat/condition_variable
+3 −0 mingw-compat/future
+3 −0 mingw-compat/invoke
+9 −0 mingw-compat/latch
+3 −0 mingw-compat/mutex
+3 −0 mingw-compat/shared_mutex
+3 −0 mingw-compat/thread
+59 −0 patches/Pillow/01_fix-build.patch
+29 −0 patches/Python/linux/9001-pawpaw-needed-changes.patch
+1 −0 patches/Python/macos-10.15
+0 −1 patches/Python/macos-universal-10.15
+28 −0 patches/Python/macos/9001-pawpaw-needed-changes.patch
+17 −0 patches/Python/win32/9001-pawpaw-needed-changes.patch
+0 −556 patches/Python/win32/PKGBUILD
+0 −128 patches/Python/win32/smoketests.py
+38 −0 patches/aggdraw/01_fix-build.patch
+1 −0 patches/artyfx/macos-10.15
+0 −1 patches/artyfx/macos-universal-10.15
+1 −0 patches/cx_Freeze/macos-10.15
+1 −0 patches/cx_Freeze/macos-universal
+0 −1 patches/cx_Freeze/macos-universal-10.15
+0 −0 patches/cx_Freeze/macos/01_pawpaw-aetup.patch
+0 −1 patches/db/macos-universal-10.15
+0 −1 patches/flac/macos-universal-10.15
+1 −0 patches/glib/macos-10.15
+0 −1 patches/glib/macos-universal-10.15
+17 −0 patches/host-Python/win32/9001-pawpaw-needed-changes.patch
+1 −0 patches/host-Python/win64
+42 −0 patches/jack2/02_ignore-missing-internals.patch
+15 −0 patches/jack2/03_skip-alsa-plugins-client.patch
+13 −0 patches/juce-6.0/01_mod-build.patch
+25 −0 patches/juce-6.0/02_less-deps.patch
+84 −0 patches/juce-6.0/03_versioned-juceaide.patch
+17 −0 patches/juce-6.0/04_copy-to-destdir.patch
+13 −0 patches/juce-6.0/05_disable-xinerama.patch
+20 −0 patches/juce-6.0/06_no-lto.patch
+13 −0 patches/juce-6.1/01_mod-build.patch
+25 −0 patches/juce-6.1/02_less-deps.patch
+98 −0 patches/juce-6.1/03_versioned-juceaide.patch
+17 −0 patches/juce-6.1/04_copy-to-destdir.patch
+13 −0 patches/juce-6.1/05_disable-xinerama.patch
+20 −0 patches/juce-6.1/06_no-lto.patch
+13 −0 patches/juce-7.0/01_mod-build.patch
+25 −0 patches/juce-7.0/02_less-deps.patch
+84 −0 patches/juce-7.0/03_versioned-juceaide.patch
+19 −0 patches/juce-7.0/04_copy-to-destdir.patch
+13 −0 patches/juce-7.0/05_disable-xinerama.patch
+22 −0 patches/liblo/02_fix-use-after-free.patch
+0 −1 patches/libsamplerate/macos-universal-10.15
+13 −0 patches/lvtk1/01_fix-python3-compat.patch
+2,726 −0 patches/portaudio19/04_jackbridge-mod-app.patch
+13 −0 patches/portaudio19/05_skip-jack-asio-bridge.patch
+0 −0 patches/qtbase/macos-10.15/01_force-10.12-universal-build.patch
+0 −0 patches/qtbase/macos-10.15/02_fix-12.0-build.patch
+1 −0 patches/qtbase/macos-universal
+0 −1 patches/qtbase/macos-universal-10.15
+31 −5 setup/check_target.sh
+30 −21 setup/env.sh
+246 −85 setup/functions.sh
+19 −0 setup/meson/linux-aarch64.ini
+19 −0 setup/meson/linux-armhf.ini
+19 −0 setup/meson/linux-i686.ini
+19 −0 setup/meson/linux-riscv64.ini
+19 −0 setup/meson/linux-x86_64.ini
+10 −4 setup/versions.sh
2 changes: 1 addition & 1 deletion dpf

0 comments on commit d7c2236

Please sign in to comment.