Browse Source

Fix win32 CI setup; Set port group hint

Signed-off-by: falkTX <falktx@falktx.com>
master
falkTX 2 years ago
parent
commit
13707ce387
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
8 changed files with 31 additions and 12 deletions
  1. +14
    -4
      .github/workflows/build.yml
  2. +0
    -3
      Makefile
  3. +1
    -1
      dpf
  4. +8
    -1
      plugins/glBars/DistrhoPluginGLBars.cpp
  5. +2
    -1
      plugins/glBars/DistrhoPluginGLBars.hpp
  6. +1
    -1
      plugins/glBars/DistrhoPluginInfo.h
  7. +1
    -1
      plugins/glBars/DistrhoUIGLBars.hpp
  8. +4
    -0
      plugins/glBars/ResizeHandle.hpp

+ 14
- 4
.github/workflows/build.yml View File

@@ -22,7 +22,8 @@ jobs:
run: | run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq 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 - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture arm64 sudo dpkg --add-architecture arm64
@@ -60,7 +61,8 @@ jobs:
run: | run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq 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 - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture armhf sudo dpkg --add-architecture armhf
@@ -98,7 +100,8 @@ jobs:
run: | run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq 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 - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
@@ -193,7 +196,8 @@ jobs:
run: | run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq 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 - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
@@ -226,6 +230,12 @@ 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 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 - name: Set up dependencies
run: | run: |
sudo apt-get update -qq sudo apt-get update -qq


+ 0
- 3
Makefile View File

@@ -19,9 +19,6 @@ plugins: dgl
ifneq ($(CROSS_COMPILING),true) ifneq ($(CROSS_COMPILING),true)
gen: plugins dpf/utils/lv2_ttl_generator gen: plugins dpf/utils/lv2_ttl_generator
@$(CURDIR)/dpf/utils/generate-ttl.sh @$(CURDIR)/dpf/utils/generate-ttl.sh
ifeq ($(MACOS),true)
@$(CURDIR)/dpf/utils/generate-vst-bundles.sh
endif


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


+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 5d7fd17f6a634ccd648a264743319c145928a27c
Subproject commit 1aa5892a13d7797935964443ae7dda6e08c470cd

+ 8
- 1
plugins/glBars/DistrhoPluginGLBars.cpp View File

@@ -3,7 +3,7 @@
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
* Copyright (C) 2000 Christian Zander <phoenix@minion.de> * Copyright (C) 2000 Christian Zander <phoenix@minion.de>
* Copyright (C) 2015 Nedko Arnaudov * Copyright (C) 2015 Nedko Arnaudov
* Copyright (C) 2016 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2016-2022 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -45,6 +45,13 @@ DistrhoPluginGLBars::~DistrhoPluginGLBars()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Init // 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) void DistrhoPluginGLBars::initParameter(uint32_t index, Parameter& parameter)
{ {
switch (index) switch (index)


+ 2
- 1
plugins/glBars/DistrhoPluginGLBars.hpp View File

@@ -3,7 +3,7 @@
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
* Copyright (C) 2000 Christian Zander <phoenix@minion.de> * Copyright (C) 2000 Christian Zander <phoenix@minion.de>
* Copyright (C) 2015 Nedko Arnaudov * Copyright (C) 2015 Nedko Arnaudov
* Copyright (C) 2016 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2016-2022 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -79,6 +79,7 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Init // Init
void initAudioPort(bool input, uint32_t index, AudioPort& port) override;
void initParameter(uint32_t, Parameter&) override; void initParameter(uint32_t, Parameter&) override;
// ------------------------------------------------------------------- // -------------------------------------------------------------------


+ 1
- 1
plugins/glBars/DistrhoPluginInfo.h View File

@@ -3,7 +3,7 @@
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
* Copyright (C) 2000 Christian Zander <phoenix@minion.de> * Copyright (C) 2000 Christian Zander <phoenix@minion.de>
* Copyright (C) 2015 Nedko Arnaudov * Copyright (C) 2015 Nedko Arnaudov
* Copyright (C) 2016 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2016-2022 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as


+ 1
- 1
plugins/glBars/DistrhoUIGLBars.hpp View File

@@ -3,7 +3,7 @@
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
* Copyright (C) 2000 Christian Zander <phoenix@minion.de> * Copyright (C) 2000 Christian Zander <phoenix@minion.de>
* Copyright (C) 2015 Nedko Arnaudov * Copyright (C) 2015 Nedko Arnaudov
* Copyright (C) 2016-2021 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2016-2022 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as


+ 4
- 0
plugins/glBars/ResizeHandle.hpp View File

@@ -19,6 +19,10 @@
#include "TopLevelWidget.hpp" #include "TopLevelWidget.hpp"
#include "Color.hpp" #include "Color.hpp"


#if defined(DGL_OPENGL) && !defined(DGL_USE_OPENGL3)
#include "OpenGL-include.hpp"
#endif

START_NAMESPACE_DGL START_NAMESPACE_DGL


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


Loading…
Cancel
Save