brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup, update carla, dpf and pawpaw

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-12-31 02:27:05 +01:00
parent 8bb5dcce1e
commit d7c223686d
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

@ -3,10 +3,9 @@ name: build
on: [push, pull_request] on: [push, pull_request]
env: env:
CACHE_VERSION: 4 CACHE_VERSION: 5
CARDINAL_UNDER_WINE: 1 CARDINAL_UNDER_WINE: 1
CIBUILD: true CIBUILD: true
EMSCRIPTEN_VERSION: 3.1.27
LIBGL_ALWAYS_SOFTWARE: true LIBGL_ALWAYS_SOFTWARE: true
PAWPAW_SKIP_LTO: 1 PAWPAW_SKIP_LTO: 1
PAWPAW_SKIP_GLIB: 1 PAWPAW_SKIP_GLIB: 1
@ -335,18 +334,14 @@ jobs:
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yqq brotli gperf meson sudo apt-get install -yqq brotli gperf meson
sudo apt-get clean 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 - name: Build extra dependencies
run: | run: |
${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1 ${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1
source ~/PawPawBuilds/emsdk/emsdk_env.sh
./deps/PawPaw/bootstrap-cardinal.sh wasm && ./deps/PawPaw/.cleanup.sh wasm ./deps/PawPaw/bootstrap-cardinal.sh wasm && ./deps/PawPaw/.cleanup.sh wasm
- name: Build wasm cross-compiled - name: Build wasm cross-compiled
if: steps.cache.outputs.cache-hit == 'true' if: steps.cache.outputs.cache-hit == 'true'
run: | run: |
${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1 ${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1
source ~/PawPawBuilds/emsdk/emsdk_env.sh
source deps/PawPaw/local.env wasm source deps/PawPaw/local.env wasm
# FIXME send patch upstream, assuming this works.. # FIXME send patch upstream, assuming this works..
sed -i -e 's/defined(__riscv)/defined(__riscv) || defined(__EMSCRIPTEN__)/' plugins/surgext/surge/src/common/globals.h sed -i -e 's/defined(__riscv)/defined(__riscv) || defined(__EMSCRIPTEN__)/' plugins/surgext/surge/src/common/globals.h
@ -356,7 +351,6 @@ jobs:
if: steps.cache.outputs.cache-hit == 'true' if: steps.cache.outputs.cache-hit == 'true'
run: | run: |
${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1 ${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1
source ~/PawPawBuilds/emsdk/emsdk_env.sh
source deps/PawPaw/local.env wasm source deps/PawPaw/local.env wasm
make HAVE_LIBLO=false NOOPT=true NOSIMD=${{ matrix.target == 'nosimd' }} -j $(nproc) -C src/CardinalMiniSep modgui make HAVE_LIBLO=false NOOPT=true NOSIMD=${{ matrix.target == 'nosimd' }} -j $(nproc) -C src/CardinalMiniSep modgui
- name: Make wasm versioned and compress - name: Make wasm versioned and compress

2
carla

@ -1 +1 @@
Subproject commit 41f07e119252b8b14627bec8345cb7304485a815 Subproject commit c2031edc1c82c3e760394b6363627caf25a7c256

2
deps/PawPaw vendored

@ -1 +1 @@
Subproject commit 6a3c6a65a89abe221858c3f7635140074506bfc3 Subproject commit 1369e1f84e6391df761b5ac5e143ab6841e57f7e

2
dpf

@ -1 +1 @@
Subproject commit df2afed246113e4459808b112583d54cf7e433e9 Subproject commit 1d5a31c1e2fec45b23e05543c646ae6092693914