Browse Source

Install libglib2.0-dev on CI static builds; Fix Prism conflicts

Signed-off-by: falkTX <falktx@falktx.com>
pull/93/head
falkTX 4 years ago
parent
commit
8e29d4f47f
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 7 additions and 8 deletions
  1. +5
    -5
      .github/workflows/build.yml
  2. +1
    -1
      deps/PawPaw
  3. +0
    -1
      plugins/Makefile
  4. +1
    -1
      plugins/Prism

+ 5
- 5
.github/workflows/build.yml View File

@@ -36,7 +36,7 @@ jobs:
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 install -yqq g++-aarch64-linux-gnu libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 liblo-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static
sudo apt-get install -yqq g++-aarch64-linux-gnu libdbus-1-dev:arm64 libglib2.0-dev:arm64 libgl1-mesa-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static
- name: Install ccache
run: |
sudo apt-get install -yqq ccache
@@ -89,7 +89,7 @@ jobs:
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 install -yqq g++-arm-linux-gnueabihf libdbus-1-dev:armhf libgl1-mesa-dev:armhf liblo-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf qemu-user-static
sudo apt-get install -yqq g++-arm-linux-gnueabihf libdbus-1-dev:armhf libglib2.0-dev:armhf libgl1-mesa-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf qemu-user-static
- name: Install ccache
run: |
sudo apt-get install -yqq ccache
@@ -138,7 +138,7 @@ jobs:
run: |
sudo dpkg --add-architecture i386
sudo apt-get update -qq
sudo apt-get install -yqq g++-i686-linux-gnu libdbus-1-dev:i386 libgl1-mesa-dev:i386 liblo-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386
sudo apt-get install -yqq g++-i686-linux-gnu libdbus-1-dev:i386 libglib2.0-dev:i386 libgl1-mesa-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386
- name: Install ccache
run: |
sudo apt-get install -yqq ccache
@@ -186,7 +186,7 @@ jobs:
- name: Set up dependencies
run: |
sudo apt-get update -qq
sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
sudo apt-get install -yqq libdbus-1-dev libglib2.0-dev libgl1-mesa-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
- name: Install ccache
run: |
sudo apt-get install -yqq ccache
@@ -266,7 +266,7 @@ jobs:
- name: Set up dependencies
run: |
sudo apt-get update -qq
sudo apt-get install -yqq libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev libarchive-dev libjansson-dev libsamplerate0-dev libspeexdsp-dev
sudo apt-get install -yqq libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev libarchive-dev libfluidsynth-dev libjansson-dev libsamplerate0-dev libsndfile1-dev libspeexdsp-dev
- name: Build linux x86_64 (sysdeps)
run: |
make features


+ 1
- 1
deps/PawPaw

@@ -1 +1 @@
Subproject commit c251326a972a5b1920305a5f46d74ca7a67ef093
Subproject commit 58a6a69385a3e4b41d45c3d898a54e9bb1785457

+ 0
- 1
plugins/Makefile View File

@@ -544,7 +544,6 @@ PLUGIN_FILES += $(wildcard Prism/src/scales/*.cpp)

# modules/types which are present in other plugins
PRISM_CUSTOM = bogaudio Scale
PRISM_CUSTOM_PER_FILE = Envelope Filter FilterBank FilterSetting Inputs IO LEDRing Levels Q Rotation Tuning

# --------------------------------------------------------------
# rackwindows


+ 1
- 1
plugins/Prism

@@ -1 +1 @@
Subproject commit 6b2510c601db8bd3b57cd5eef8c2924cb8badfc7
Subproject commit 112da337214d5be1f14640066fe1d08b8ec740dc

Loading…
Cancel
Save