Browse Source

Update dpf and carla

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.0
falkTX 3 years ago
parent
commit
198e5da78a
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
5 changed files with 57 additions and 46 deletions
  1. +54
    -40
      .github/workflows/build.yml
  2. +1
    -1
      carla
  3. +1
    -1
      dpf
  4. +1
    -1
      dpf-widgets
  5. +0
    -3
      plugins/Common/IldaeilUI.cpp

+ 54
- 40
.github/workflows/build.yml View File

@@ -13,33 +13,34 @@ env:


jobs: jobs:
linux-arm64: linux-arm64:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: recursive submodules: recursive
- name: Fix GitHub's mess
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
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture arm64 sudo dpkg --add-architecture arm64
sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/ports-arm64.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/ports-arm64.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yq g++-aarch64-linux-gnu libasound2-dev:arm64 libcairo2-dev:arm64 libgl1-mesa-dev:arm64 liblo-dev:arm64 libpulse-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static
# fix broken Ubuntu packages missing pkg-config file in multi-arch package
sudo apt-get install -yq libasound2-dev libgl1-mesa-dev liblo-dev libpulse-dev libxcursor-dev libxrandr-dev
sudo ln -s /usr/lib/aarch64-linux-gnu/liblo.so.7 /usr/lib/aarch64-linux-gnu/liblo.so
sudo cp /usr/lib/x86_64-linux-gnu/pkgconfig/liblo.pc /usr/lib/aarch64-linux-gnu/pkgconfig/liblo.pc
sudo sed -i "s/x86_64-linux-gnu/aarch64-linux-gnu/" /usr/lib/aarch64-linux-gnu/pkgconfig/liblo.pc
sudo apt-get install -yqq g++-aarch64-linux-gnu libasound2-dev:arm64 libcairo2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 liblo-dev:arm64 libpulse-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static
- name: Build linux arm64 cross-compiled - name: Build linux arm64 cross-compiled
env: env:
CC: aarch64-linux-gnu-gcc CC: aarch64-linux-gnu-gcc
CXX: aarch64-linux-gnu-g++ CXX: aarch64-linux-gnu-g++
LDFLAGS: -static-libgcc -static-libstdc++ LDFLAGS: -static-libgcc -static-libstdc++
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
run: | run: |
make features make features
make -j $(nproc) HAVE_LIBMAGIC=false
make WITH_LTO=true -j $(nproc)
- name: Set sha8 - name: Set sha8
id: slug id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)" run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
@@ -50,33 +51,34 @@ jobs:
bin/* bin/*


linux-armhf: linux-armhf:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: recursive submodules: recursive
- name: Fix GitHub's mess
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
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture armhf sudo dpkg --add-architecture armhf
sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/ports-armhf.list
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/ports-armhf.list
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yq g++-arm-linux-gnueabihf libasound2-dev:armhf libcairo2-dev:armhf libgl1-mesa-dev:armhf liblo-dev:armhf libpulse-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf qemu-user-static
# fix broken Ubuntu packages missing pkg-config file in multi-arch package
sudo apt-get install -yq libasound2-dev libgl1-mesa-dev liblo-dev libpulse-dev libxcursor-dev libxrandr-dev
sudo ln -s /usr/lib/arm-linux-gnueabihf/liblo.so.7 /usr/lib/arm-linux-gnueabihf/liblo.so
sudo cp /usr/lib/x86_64-linux-gnu/pkgconfig/liblo.pc /usr/lib/arm-linux-gnueabihf/pkgconfig/liblo.pc
sudo sed -i "s/x86_64-linux-gnu/arm-linux-gnueabihf/" /usr/lib/arm-linux-gnueabihf/pkgconfig/liblo.pc
sudo apt-get install -yqq g++-arm-linux-gnueabihf libasound2-dev:armhf libcairo2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf liblo-dev:armhf libpulse-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf qemu-user-static
- name: Build linux armhf cross-compiled - name: Build linux armhf cross-compiled
env: env:
CC: arm-linux-gnueabihf-gcc CC: arm-linux-gnueabihf-gcc
CXX: arm-linux-gnueabihf-g++ CXX: arm-linux-gnueabihf-g++
LDFLAGS: -static-libgcc -static-libstdc++ LDFLAGS: -static-libgcc -static-libstdc++
PKG_CONFIG_PATH: /usr/lib/arm-linux-gnueabihf/pkgconfig
run: | run: |
make features make features
make -j $(nproc) HAVE_LIBMAGIC=false
make WITH_LTO=true -j $(nproc)
- name: Set sha8 - name: Set sha8
id: slug id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)" run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
@@ -86,37 +88,44 @@ jobs:
path: | path: |
bin/* bin/*


linux-x86:
runs-on: ubuntu-18.04
linux-i686:
runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: recursive submodules: recursive
- name: Fix GitHub's mess
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
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yq g++-multilib libasound2-dev:i386 libcairo2-dev:i386 libgl1-mesa-dev:i386 liblo-dev:i386 libpulse-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386
- name: Build linux x86
sudo apt-get install -yqq g++-i686-linux-gnu libasound2-dev:i386 libcairo2-dev:i386 libdbus-1-dev:i386 libgl1-mesa-dev:i386 liblo-dev:i386 libpulse-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386
- name: Build linux i686
env: env:
CC: i686-linux-gnu-gcc
CXX: i686-linux-gnu-g++
CFLAGS: -m32 CFLAGS: -m32
CXXFLAGS: -m32 CXXFLAGS: -m32
LDFLAGS: -m32 -static-libgcc -static-libstdc++ LDFLAGS: -m32 -static-libgcc -static-libstdc++
PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
run: | run: |
make features make features
make -j $(nproc) HAVE_LIBMAGIC=false
make WITH_LTO=true -j $(nproc)
- name: Set sha8 - name: Set sha8
id: slug id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)" run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: ${{ github.event.repository.name }}-linux-x86-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
name: ${{ github.event.repository.name }}-linux-i686-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: | path: |
bin/* bin/*


linux-x86_64: linux-x86_64:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@@ -124,13 +133,13 @@ jobs:
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yq libasound2-dev libcairo2-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
sudo apt-get install -yqq libasound2-dev libcairo2-dev libdbus-1-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
- name: Build linux x86_64 - name: Build linux x86_64
env: env:
LDFLAGS: -static-libgcc -static-libstdc++ LDFLAGS: -static-libgcc -static-libstdc++
run: | run: |
make features make features
make -j $(nproc)
make WITH_LTO=true -j $(nproc)
- name: Set sha8 - name: Set sha8
id: slug id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)" run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
@@ -157,7 +166,7 @@ jobs:
LDFLAGS: -arch x86_64 -arch arm64 -mmacosx-version-min=10.12 LDFLAGS: -arch x86_64 -arch arm64 -mmacosx-version-min=10.12
run: | run: |
make features make features
make NOOPT=true HAVE_SNDFILE=false -j $(sysctl -n hw.logicalcpu)
make NOOPT=true WITH_LTO=true -j $(sysctl -n hw.logicalcpu)
./dpf/utils/package-osx-bundles.sh ./dpf/utils/package-osx-bundles.sh
- name: Set sha8 - name: Set sha8
id: slug id: slug
@@ -180,11 +189,16 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: recursive submodules: recursive
- name: Fix GitHub's mess
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
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
- name: Build win32 cross-compiled - name: Build win32 cross-compiled
env: env:
CC: i686-w64-mingw32-gcc CC: i686-w64-mingw32-gcc
@@ -194,7 +208,7 @@ jobs:
WINEDEBUG: "-all" WINEDEBUG: "-all"
run: | run: |
make features make features
make -j $(nproc)
make WITH_LTO=true -j $(nproc)
- name: Set sha8 - name: Set sha8
id: slug id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)" run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
@@ -215,7 +229,7 @@ jobs:
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
sudo apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
- name: Build win64 cross-compiled - name: Build win64 cross-compiled
env: env:
CC: x86_64-w64-mingw32-gcc CC: x86_64-w64-mingw32-gcc
@@ -225,7 +239,7 @@ jobs:
WINEDEBUG: "-all" WINEDEBUG: "-all"
run: | run: |
make features make features
make -j $(nproc)
make WITH_LTO=true -j $(nproc)
- name: Set sha8 - name: Set sha8
id: slug id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)" run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
@@ -250,9 +264,9 @@ jobs:
sudo dpkg -i kxstudio-repos_10.0.3_all.deb sudo dpkg -i kxstudio-repos_10.0.3_all.deb
sudo apt-get update -qq sudo apt-get update -qq
# build-deps # build-deps
sudo apt-get install -yq libasound2-dev libcairo2-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
sudo apt-get install -yqq libasound2-dev libcairo2-dev libdbus-1-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
# runtime testing # runtime testing
sudo apt-get install -yq carla-git lilv-utils lv2-dev lv2lint valgrind
sudo apt-get install -yqq carla-git lilv-utils lv2-dev lv2lint valgrind
- name: Build plugins - name: Build plugins
env: env:
CFLAGS: -g CFLAGS: -g
@@ -313,14 +327,14 @@ jobs:
done done
- name: Test VST2 plugins - name: Test VST2 plugins
run: | run: |
for p in $(ls bin/ | grep vst.so); do \
for p in $(find bin/ | grep -e vst.so -e '.*\.vst/.*\.so'); do \
env CARLA_BRIDGE_DUMMY=1 CARLA_BRIDGE_TESTING=native \ env CARLA_BRIDGE_DUMMY=1 CARLA_BRIDGE_TESTING=native \
valgrind \ valgrind \
--error-exitcode=255 \ --error-exitcode=255 \
--leak-check=full \ --leak-check=full \
--track-origins=yes \ --track-origins=yes \
--suppressions=./dpf/utils/valgrind-dpf.supp \ --suppressions=./dpf/utils/valgrind-dpf.supp \
/usr/lib/carla/carla-bridge-native vst2 ./bin/${p} "" 1>/dev/null; \
/usr/lib/carla/carla-bridge-native vst2 ./${p} "" 1>/dev/null; \
done done
- name: Test VST3 plugins - name: Test VST3 plugins
run: | run: |


+ 1
- 1
carla

@@ -1 +1 @@
Subproject commit 1edb1bb172fce8ae89cf666675ff531fc5dca628
Subproject commit 613e6950581ad0cb3c037fac7f0db89633e099e6

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 4c62f76915478d7cf6ac89cbc1c9714d1fbeb044
Subproject commit 5d7fd17f6a634ccd648a264743319c145928a27c

+ 1
- 1
dpf-widgets

@@ -1 +1 @@
Subproject commit 6ec6c3b817e9fc9f23bdd9c555d03c1a86827f49
Subproject commit ccb6f822c3af55f58ce8472b0bb9b0221297c408

+ 0
- 3
plugins/Common/IldaeilUI.cpp View File

@@ -28,9 +28,6 @@


#include <vector> #include <vector>


// TODO remove this after JSFX is merged
#define PLUGIN_JSFX 99

// strcasestr // strcasestr
#ifdef DISTRHO_OS_WINDOWS #ifdef DISTRHO_OS_WINDOWS
# include <shlwapi.h> # include <shlwapi.h>


Loading…
Cancel
Save