Skip to content

Commit 819d140

Browse files
dromerdromer
authored
update deps and build (#1)
* update deps and build * add makefile * update hvcc; add wasm modal
1 parent ac2f72b commit 819d140

File tree

11 files changed

+120
-999
lines changed

11 files changed

+120
-999
lines changed

‎.github/workflows/build.yml‎

Lines changed: 67 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -4,170 +4,92 @@ on:
44
push:
55

66
env:
7-
HVCC_VERSION: 424308377a8b0e4291e0bfda3bcf68ae9fd88f33
7+
HVCC_COMMIT_HASH: e04604782a027980f19b111439f434dc13098438
8+
CACHE_VERSION: 1
9+
DEBIAN_FRONTEND: noninteractive
10+
GIT_LFS_SKIP_SMUDGE: 1
811

912
jobs:
10-
linux-x86_64:
11-
runs-on: ubuntu-20.04
13+
linux:
14+
strategy:
15+
matrix:
16+
target: [linux-arm64, linux-armhf, linux-i686, linux-riscv64, linux-x86_64]
17+
runs-on: ubuntu-latest
18+
container:
19+
image: ubuntu:20.04
1220
steps:
13-
- name: Checkout repository
14-
uses: actions/checkout@v3
15-
with:
16-
submodules: recursive
17-
- name: Set up Python
18-
uses: actions/setup-python@v4
19-
with:
20-
python-version: 3.9
21-
- name: Install dependencies
21+
- name: Install git
2222
run: |
23-
python -m pip install --upgrade pip
24-
python -m pip install git+https://github.com/Wasted-Audio/hvcc.git@${{ env.HVCC_VERSION }}
25-
sudo apt-get update -qq
26-
sudo apt-get install -yqq libgl1-mesa-dev
27-
28-
- name: Build plugins
29-
run: |
30-
hvcc wstd_dlay.pd -n WSTD_DLAY -m wstd_dlay.json -o WSTD_DLAY -g dpf -p dep/heavylib/ dep/ --copyright "Copyright (c) Wasted Audio 2023 - GPL-3.0-or-later"
31-
cp override/* WSTD_DLAY/plugin/source/
32-
make -C WSTD_DLAY WITH_LTO=true -j $(nproc)
33-
34-
- name: Set sha8 (non-release)
35-
if: startsWith(github.ref, 'refs/tags/') != true
36-
id: slug1
37-
run: echo "action_tag=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
38-
- name: Set tag (release)
39-
if: startsWith(github.ref, 'refs/tags/')
40-
id: slug2
41-
run: echo "action_tag=$(echo ${{ github.ref_name }})" >> $GITHUB_ENV
42-
43-
- name: Pack binaries
23+
apt-get update -qq && apt-get install -yqq --no-install-recommends ca-certificates curl git openssl
24+
curl -sLO https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/git_2.34.1-1ubuntu1~bpo20.04.1~ppa1_amd64.deb
25+
curl -sLO https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/git-man_2.34.1-1ubuntu1~bpo20.04.1~ppa1_all.deb
26+
dpkg -i *.deb
27+
rm *.deb
28+
- name: Install and use python3.9
4429
run: |
45-
cd WSTD_DLAY
46-
mv bin WSTD_DLAY
47-
tar -c -h -z -f ${{ github.event.repository.name }}-linux-x86_64-${{ github.event.pull_request.number || env.action_tag }}.tar.gz WSTD_DLAY/
48-
- uses: actions/upload-artifact@v3
30+
apt-get install -yqq python3 python3.9
31+
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1
32+
- name: Install pip
33+
run: apt-get install -yqq --no-install-recommends python3-pip
34+
- name: Checkout repository
35+
uses: actions/checkout@v4
4936
with:
50-
name: ${{ github.event.repository.name }}-linux-x86_64-${{ github.event.pull_request.number || env.action_tag }}
51-
path: |
52-
WSTD_DLAY/*.tar.gz
53-
54-
- uses: softprops/action-gh-release@v1
55-
if: startsWith(github.ref, 'refs/tags/')
37+
submodules: recursive
38+
- uses: distrho/dpf-makefile-action@v1
5639
with:
57-
tag_name: ${{ github.ref_name }}
58-
name: ${{ github.ref_name }}
59-
draft: false
60-
prerelease: false
61-
files: |
62-
WSTD_DLAY/*.tar.gz
63-
64-
win64:
65-
runs-on: ubuntu-20.04
40+
target: ${{ matrix.target }}
41+
hvcc: True
42+
dpf_path: 'dep/dpf'
43+
44+
windows:
45+
strategy:
46+
matrix:
47+
target: [win32, win64]
48+
runs-on: ubuntu-22.04
6649
steps:
6750
- name: Checkout repository
68-
uses: actions/checkout@v3
51+
uses: actions/checkout@v4
6952
with:
7053
submodules: recursive
71-
- name: Set up Python
72-
uses: actions/setup-python@v4
54+
- uses: distrho/dpf-makefile-action@v1
7355
with:
74-
python-version: 3.9
75-
- name: Install dependencies
76-
run: |
77-
python -m pip install --upgrade pip
78-
python -m pip install git+https://github.com/Wasted-Audio/hvcc.git@${{ env.HVCC_VERSION }}
79-
sudo apt-get update -qq
80-
sudo apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
81-
82-
- name: Build win64 cross-compiled plugins
83-
env:
84-
CC: x86_64-w64-mingw32-gcc
85-
CXX: x86_64-w64-mingw32-g++
86-
EXE_WRAPPER: wine
87-
PKG_CONFIG: "false"
88-
WINEDEBUG: "-all"
89-
run: |
90-
hvcc wstd_dlay.pd -n WSTD_DLAY -m wstd_dlay.json -o WSTD_DLAY -g dpf -p dep/heavylib/ dep/ --copyright "Copyright (c) Wasted Audio 2023 - GPL-3.0-or-later"
91-
cp override/* WSTD_DLAY/plugin/source/
92-
make -C WSTD_DLAY WITH_LTO=true -j $(nproc)
93-
94-
- name: Set sha8 (non-release)
95-
if: startsWith(github.ref, 'refs/tags/') != true
96-
id: slug1
97-
run: echo "action_tag=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
98-
- name: Set tag (release)
99-
if: startsWith(github.ref, 'refs/tags/')
100-
id: slug2
101-
run: echo "action_tag=$(echo ${{ github.ref_name }})" >> $GITHUB_ENV
102-
- name: Pack binaries
103-
run: |
104-
cd WSTD_DLAY
105-
mv bin WSTD_DLAY
106-
tar -c -h -z -f ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.action_tag }}.tar.gz WSTD_DLAY/
107-
- uses: actions/upload-artifact@v3
56+
target: ${{ matrix.target }}
57+
hvcc: True
58+
dpf_path: 'dep/dpf'
59+
60+
macos:
61+
strategy:
62+
matrix:
63+
target: [macos-intel, macos-universal]
64+
runs-on: macos-13
65+
steps:
66+
- uses: actions/checkout@v4
10867
with:
109-
name: ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.action_tag }}
110-
path: |
111-
WSTD_DLAY/*.tar.gz
112-
113-
- uses: softprops/action-gh-release@v1
114-
if: startsWith(github.ref, 'refs/tags/')
68+
submodules: recursive
69+
- uses: distrho/dpf-makefile-action@v1
11570
with:
116-
tag_name: ${{ github.ref_name }}
117-
name: ${{ github.ref_name }}
118-
draft: false
119-
prerelease: false
120-
files: |
121-
WSTD_DLAY/*.tar.gz
71+
target: ${{ matrix.target }}
72+
hvcc: True
73+
dpf_path: 'dep/dpf'
12274

123-
macos-universal:
124-
runs-on: macos-11
75+
pluginval:
76+
runs-on: ubuntu-22.04
12577
steps:
126-
- uses: actions/checkout@v3
78+
- uses: actions/checkout@v4
12779
with:
12880
submodules: recursive
129-
- name: Set up Python
130-
uses: actions/setup-python@v4
81+
- uses: distrho/dpf-makefile-action@v1
13182
with:
132-
python-version: 3.9
133-
- name: Install dependencies
134-
run: |
135-
python -m pip install --upgrade pip
136-
python -m pip install git+https://github.com/Wasted-Audio/hvcc.git@${{ env.HVCC_VERSION }}
83+
target: pluginval
84+
hvcc: True
85+
dpf_path: 'dep/dpf'
13786

138-
- name: Build macOS universal plugins
139-
env:
140-
CFLAGS: -arch x86_64 -arch arm64 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12 -mmacosx-version-min=10.12 -mtune=generic -msse -msse2
141-
CXXFLAGS: -arch x86_64 -arch arm64 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12 -mmacosx-version-min=10.12 -mtune=generic -msse -msse2
142-
LDFLAGS: -arch x86_64 -arch arm64 -mmacosx-version-min=10.12
143-
run: |
144-
hvcc wstd_dlay.pd -n WSTD_DLAY -m wstd_dlay.json -o WSTD_DLAY -g dpf -p dep/heavylib/ dep/ --copyright "Copyright (c) Wasted Audio 2023 - GPL-3.0-or-later"
145-
cp override/* WSTD_DLAY/plugin/source/
146-
make -C WSTD_DLAY NOOPT=true WITH_LTO=true -j $(sysctl -n hw.logicalcpu)
147-
cd WSTD_DLAY
148-
../dep/dpf/utils/package-osx-bundles.sh
149-
150-
- name: Set sha8 (non-release)
151-
if: startsWith(github.ref, 'refs/tags/') != true
152-
id: slug1
153-
run: echo "action_tag=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
154-
- name: Set tag (release)
155-
if: startsWith(github.ref, 'refs/tags/')
156-
id: slug2
157-
run: echo "action_tag=$(echo ${{ github.ref_name }})" >> $GITHUB_ENV
158-
159-
- uses: actions/upload-artifact@v3
87+
source:
88+
runs-on: ubuntu-22.04
89+
steps:
90+
- uses: actions/checkout@v4
16091
with:
161-
name: ${{ github.event.repository.name }}-macOS-universal-${{ github.event.pull_request.number || env.action_tag }}
162-
path: |
163-
WSTD_DLAY/*-macOS.pkg
164-
165-
- uses: softprops/action-gh-release@v1
166-
if: startsWith(github.ref, 'refs/tags/')
92+
submodules: recursive
93+
- uses: distrho/dpf-makefile-action@v1
16794
with:
168-
tag_name: ${{ github.ref_name }}
169-
name: ${{ github.ref_name }}
170-
draft: false
171-
prerelease: false
172-
files: |
173-
WSTD_DLAY/*-macOS.pkg
95+
target: source

‎Makefile‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/usr/bin/make -f
2+
3+
include dep/dpf/Makefile.base.mk
4+
5+
PLUGINS = WSTD_DLAY
6+
PREGEN = $(PLUGINS:%=%/plugin/source)
7+
8+
all: build
9+
10+
build: pregen
11+
$(foreach p, $(PLUGINS), $(MAKE) -C $(p);)
12+
mkdir bin
13+
$(foreach p, $(PLUGINS), mv $(p)/bin/* bin/;)
14+
15+
pregen: $(PREGEN)
16+
17+
%/plugin/source: %.json %.pd override/*.*
18+
hvcc $*.pd -m $*.json -n $* -o $* -g dpf -p dep/heavylib/ dep/ --copyright "Copyright (c) Wasted Audio 2023 - GPL-3.0-or-later"
19+
cp override/*.* $*/plugin/source/

wstd_dlay.json renamed to WSTD_DLAY.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"wstd.clrs"
77
],
88
"enable_ui": true,
9-
"enable_modgui": true,
9+
"enable_modgui": false,
1010
"ui_size": {
1111
"width": 490,
1212
"height": 180
@@ -31,6 +31,10 @@
3131
]
3232
},
3333
"version": "1, 0, 0",
34+
"maker": "Wasted Audio",
35+
"brand_id": "Wstd",
36+
"brand_id_no_vst3": true,
37+
"unique_id": "Dlay",
3438
"license": "GPL-3.0-or-later",
3539
"homepage": "https://wasted.audio/software/wstd_dlay",
3640
"plugin_uri": "https://wasted.audio/software/wstd_dlay",

wstd_dlay.pd renamed to WSTD_DLAY.pd

File renamed without changes.

‎dep/dpf‎

Submodule dpf updated 196 files

‎dep/dpf-widgets‎

Submodule dpf-widgets updated 39 files

‎dep/wstd.clrs‎

‎dep/wstd.cmpnnts‎

0 commit comments

Comments
 (0)