Skip to content

Commit 13707ce

Browse files
falkTXfalkTX
committed
Fix win32 CI setup; Set port group hint
Signed-off-by: falkTX <falktx@falktx.com>
1 parent d082460 commit 13707ce

8 files changed

Lines changed: 31 additions & 12 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ jobs:
2222
run: |
2323
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
2424
sudo apt-get update -qq
25-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
25+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
26+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
2627
- name: Set up dependencies
2728
run: |
2829
sudo dpkg --add-architecture arm64
@@ -60,7 +61,8 @@ jobs:
6061
run: |
6162
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
6263
sudo apt-get update -qq
63-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
64+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
65+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
6466
- name: Set up dependencies
6567
run: |
6668
sudo dpkg --add-architecture armhf
@@ -98,7 +100,8 @@ jobs:
98100
run: |
99101
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
100102
sudo apt-get update -qq
101-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
103+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
104+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
102105
- name: Set up dependencies
103106
run: |
104107
sudo dpkg --add-architecture i386
@@ -193,7 +196,8 @@ jobs:
193196
run: |
194197
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
195198
sudo apt-get update -qq
196-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
199+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
200+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
197201
- name: Set up dependencies
198202
run: |
199203
sudo dpkg --add-architecture i386
@@ -226,6 +230,12 @@ jobs:
226230
- uses: actions/checkout@v2
227231
with:
228232
submodules: recursive
233+
- name: Fix GitHub's mess
234+
run: |
235+
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
236+
sudo apt-get update -qq
237+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
238+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
229239
- name: Set up dependencies
230240
run: |
231241
sudo apt-get update -qq

‎Makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ plugins: dgl
1919
ifneq ($(CROSS_COMPILING),true)
2020
gen: plugins dpf/utils/lv2_ttl_generator
2121
@$(CURDIR)/dpf/utils/generate-ttl.sh
22-
ifeq ($(MACOS),true)
23-
@$(CURDIR)/dpf/utils/generate-vst-bundles.sh
24-
endif
2522

2623
dpf/utils/lv2_ttl_generator:
2724
$(MAKE) -C dpf/utils/lv2-ttl-generator

‎dpf‎

Submodule dpf updated 133 files

‎plugins/glBars/DistrhoPluginGLBars.cpp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
44
* Copyright (C) 2000 Christian Zander <phoenix@minion.de>
55
* Copyright (C) 2015 Nedko Arnaudov
6-
* Copyright (C) 2016 Filipe Coelho <falktx@falktx.com>
6+
* Copyright (C) 2016-2022 Filipe Coelho <falktx@falktx.com>
77
*
88
* This program is free software; you can redistribute it and/or
99
* modify it under the terms of the GNU General Public License as
@@ -45,6 +45,13 @@ DistrhoPluginGLBars::~DistrhoPluginGLBars()
4545
// -----------------------------------------------------------------------
4646
// Init
4747

48+
void DistrhoPluginGLBars::initAudioPort(bool input, uint32_t index, AudioPort& port)
49+
{
50+
port.groupId = kPortGroupMono;
51+
52+
Plugin::initAudioPort(input, index, port);
53+
}
54+
4855
void DistrhoPluginGLBars::initParameter(uint32_t index, Parameter& parameter)
4956
{
5057
switch (index)

‎plugins/glBars/DistrhoPluginGLBars.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
44
* Copyright (C) 2000 Christian Zander <phoenix@minion.de>
55
* Copyright (C) 2015 Nedko Arnaudov
6-
* Copyright (C) 2016 Filipe Coelho <falktx@falktx.com>
6+
* Copyright (C) 2016-2022 Filipe Coelho <falktx@falktx.com>
77
*
88
* This program is free software; you can redistribute it and/or
99
* modify it under the terms of the GNU General Public License as
@@ -79,6 +79,7 @@ class DistrhoPluginGLBars : public Plugin
7979
// -------------------------------------------------------------------
8080
// Init
8181

82+
void initAudioPort(bool input, uint32_t index, AudioPort& port) override;
8283
void initParameter(uint32_t, Parameter&) override;
8384

8485
// -------------------------------------------------------------------

‎plugins/glBars/DistrhoPluginInfo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
44
* Copyright (C) 2000 Christian Zander <phoenix@minion.de>
55
* Copyright (C) 2015 Nedko Arnaudov
6-
* Copyright (C) 2016 Filipe Coelho <falktx@falktx.com>
6+
* Copyright (C) 2016-2022 Filipe Coelho <falktx@falktx.com>
77
*
88
* This program is free software; you can redistribute it and/or
99
* modify it under the terms of the GNU General Public License as

‎plugins/glBars/DistrhoUIGLBars.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
44
* Copyright (C) 2000 Christian Zander <phoenix@minion.de>
55
* Copyright (C) 2015 Nedko Arnaudov
6-
* Copyright (C) 2016-2021 Filipe Coelho <falktx@falktx.com>
6+
* Copyright (C) 2016-2022 Filipe Coelho <falktx@falktx.com>
77
*
88
* This program is free software; you can redistribute it and/or
99
* modify it under the terms of the GNU General Public License as

‎plugins/glBars/ResizeHandle.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
#include "TopLevelWidget.hpp"
2020
#include "Color.hpp"
2121

22+
#if defined(DGL_OPENGL) && !defined(DGL_USE_OPENGL3)
23+
#include "OpenGL-include.hpp"
24+
#endif
25+
2226
START_NAMESPACE_DGL
2327

2428
/** Resize handle for DPF windows, will sit on bottom-right. */

0 commit comments

Comments
 (0)