From 13707ce387b4b4b990331bdaecbb87fd2adaae67 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 22 Jul 2022 03:17:14 +0100 Subject: [PATCH] Fix win32 CI setup; Set port group hint Signed-off-by: falkTX --- .github/workflows/build.yml | 18 ++++++++++++++---- Makefile | 3 --- dpf | 2 +- plugins/glBars/DistrhoPluginGLBars.cpp | 9 ++++++++- plugins/glBars/DistrhoPluginGLBars.hpp | 3 ++- plugins/glBars/DistrhoPluginInfo.h | 2 +- plugins/glBars/DistrhoUIGLBars.hpp | 2 +- plugins/glBars/ResizeHandle.hpp | 4 ++++ 8 files changed, 31 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ccae50..a7508d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,8 @@ jobs: 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 + sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 - name: Set up dependencies run: | sudo dpkg --add-architecture arm64 @@ -60,7 +61,8 @@ jobs: 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 + sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 - name: Set up dependencies run: | sudo dpkg --add-architecture armhf @@ -98,7 +100,8 @@ jobs: 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 + sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 - name: Set up dependencies run: | sudo dpkg --add-architecture i386 @@ -193,7 +196,8 @@ jobs: 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 + sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 - name: Set up dependencies run: | sudo dpkg --add-architecture i386 @@ -226,6 +230,12 @@ jobs: - uses: actions/checkout@v2 with: 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 libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 - name: Set up dependencies run: | sudo apt-get update -qq diff --git a/Makefile b/Makefile index 0379ae8..c53723a 100644 --- a/Makefile +++ b/Makefile @@ -19,9 +19,6 @@ plugins: dgl ifneq ($(CROSS_COMPILING),true) gen: plugins dpf/utils/lv2_ttl_generator @$(CURDIR)/dpf/utils/generate-ttl.sh -ifeq ($(MACOS),true) - @$(CURDIR)/dpf/utils/generate-vst-bundles.sh -endif dpf/utils/lv2_ttl_generator: $(MAKE) -C dpf/utils/lv2-ttl-generator diff --git a/dpf b/dpf index 5d7fd17..1aa5892 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 5d7fd17f6a634ccd648a264743319c145928a27c +Subproject commit 1aa5892a13d7797935964443ae7dda6e08c470cd diff --git a/plugins/glBars/DistrhoPluginGLBars.cpp b/plugins/glBars/DistrhoPluginGLBars.cpp index d85a914..c7702e9 100644 --- a/plugins/glBars/DistrhoPluginGLBars.cpp +++ b/plugins/glBars/DistrhoPluginGLBars.cpp @@ -3,7 +3,7 @@ * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies * Copyright (C) 2000 Christian Zander * Copyright (C) 2015 Nedko Arnaudov - * Copyright (C) 2016 Filipe Coelho + * Copyright (C) 2016-2022 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -45,6 +45,13 @@ DistrhoPluginGLBars::~DistrhoPluginGLBars() // ----------------------------------------------------------------------- // Init +void DistrhoPluginGLBars::initAudioPort(bool input, uint32_t index, AudioPort& port) +{ + port.groupId = kPortGroupMono; + + Plugin::initAudioPort(input, index, port); +} + void DistrhoPluginGLBars::initParameter(uint32_t index, Parameter& parameter) { switch (index) diff --git a/plugins/glBars/DistrhoPluginGLBars.hpp b/plugins/glBars/DistrhoPluginGLBars.hpp index eb2517c..cd296b2 100644 --- a/plugins/glBars/DistrhoPluginGLBars.hpp +++ b/plugins/glBars/DistrhoPluginGLBars.hpp @@ -3,7 +3,7 @@ * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies * Copyright (C) 2000 Christian Zander * Copyright (C) 2015 Nedko Arnaudov - * Copyright (C) 2016 Filipe Coelho + * Copyright (C) 2016-2022 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -79,6 +79,7 @@ class DistrhoPluginGLBars : public Plugin // ------------------------------------------------------------------- // Init + void initAudioPort(bool input, uint32_t index, AudioPort& port) override; void initParameter(uint32_t, Parameter&) override; // ------------------------------------------------------------------- diff --git a/plugins/glBars/DistrhoPluginInfo.h b/plugins/glBars/DistrhoPluginInfo.h index e06c41d..3e85b65 100644 --- a/plugins/glBars/DistrhoPluginInfo.h +++ b/plugins/glBars/DistrhoPluginInfo.h @@ -3,7 +3,7 @@ * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies * Copyright (C) 2000 Christian Zander * Copyright (C) 2015 Nedko Arnaudov - * Copyright (C) 2016 Filipe Coelho + * Copyright (C) 2016-2022 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/plugins/glBars/DistrhoUIGLBars.hpp b/plugins/glBars/DistrhoUIGLBars.hpp index 34dfbcb..e1cf991 100644 --- a/plugins/glBars/DistrhoUIGLBars.hpp +++ b/plugins/glBars/DistrhoUIGLBars.hpp @@ -3,7 +3,7 @@ * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies * Copyright (C) 2000 Christian Zander * Copyright (C) 2015 Nedko Arnaudov - * Copyright (C) 2016-2021 Filipe Coelho + * Copyright (C) 2016-2022 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/plugins/glBars/ResizeHandle.hpp b/plugins/glBars/ResizeHandle.hpp index 88ee117..3e94963 100644 --- a/plugins/glBars/ResizeHandle.hpp +++ b/plugins/glBars/ResizeHandle.hpp @@ -19,6 +19,10 @@ #include "TopLevelWidget.hpp" #include "Color.hpp" +#if defined(DGL_OPENGL) && !defined(DGL_USE_OPENGL3) +#include "OpenGL-include.hpp" +#endif + START_NAMESPACE_DGL /** Resize handle for DPF windows, will sit on bottom-right. */