distrho-ports: upgrade to latest master

* Least hacky musl patch was applied
* Filipe fixed cross build for pitchedDelay [1]
* GCC 9 patch was applied

[1] 014a55aa40

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-10-09 00:16:39 +02:00
parent 815c48d597
commit 771dc79d01
7 changed files with 5 additions and 259 deletions

View File

@@ -8,12 +8,9 @@ LIC_FILES_CHKSUM = " \
SRC_URI = " \
git://github.com/DISTRHO/DISTRHO-Ports.git \
file://0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch \
file://0002-Refine-Plugin-do-not-include-xmmintrin.h.patch \
file://0003-Fix-build-with-musl-by-removing-unused-SystemStats-g.patch \
file://0004-Further-musl-fix-by-removal-of-unused-function.patch \
file://0005-Fix-build-with-gcc9.patch \
file://0006-Use-build-system-flags-also-for-lv2_ttl_generator.patch \
file://0001-Fix-build-with-musl-by-removing-unused-SystemStats-g.patch \
file://0002-Further-musl-fix-by-removal-of-unused-function.patch \
file://0003-Use-build-system-flags-also-for-lv2_ttl_generator.patch \
\
http://linuxsynths.com/ObxdPatchesDemos/ObxdPatchesBrian-01.tar.gz;name=linuxsynths-obxd-patches1;subdir=linuxsynths-obxd-patches \
\
@@ -21,9 +18,9 @@ SRC_URI = " \
http://linuxsynths.com/VexPatchesDemos/VexPatches02.tar.gz;name=linuxsynths-vex-patches2;subdir=linuxsynths-vex-patches \
"
SRCREV = "a82fff059baafc03f7c0e8b9a99f383af7bfbd79"
SRCREV = "00ad25fd574c1724bbc974308aa5e88306969009"
S = "${WORKDIR}/git"
PV = "2018-04-16"
PV = "2018-04-16+git${SRCPV}"
SRC_URI[linuxsynths-obxd-patches1.md5sum] = "32244f847a54a71ee3c25079df5c8b84"
SRC_URI[linuxsynths-obxd-patches1.sha256sum] = "246fccadd71bb9f0606a95bf7b0aee7807fd3a14f754367425423a51c31e160e"

View File

@@ -1,57 +0,0 @@
From b1b48a24ed4eda34e4dc4d649a1ef030c37694ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 26 Jun 2017 23:12:22 +0200
Subject: [PATCH] disable pitchedDelay - it uses double precision SSE2 by
default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Our build system should setz proper flags.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
ports/Makefile | 4 ----
1 file changed, 4 deletions(-)
diff --git a/ports/Makefile b/ports/Makefile
index d87da4af..521d9e1e 100644
--- a/ports/Makefile
+++ b/ports/Makefile
@@ -59,7 +59,6 @@ else
$(MAKE) -C LUFSMeter/LV2-Multi
$(MAKE) -C luftikus/LV2
$(MAKE) -C obxd/LV2
- $(MAKE) -C pitchedDelay/LV2
$(MAKE) -C refine/LV2
$(MAKE) -C stereosourceseparation/LV2
$(MAKE) -C tal-dub-3/LV2
@@ -98,7 +97,6 @@ vst: libs
$(MAKE) -C LUFSMeter/VST-Multi
$(MAKE) -C luftikus/VST
$(MAKE) -C obxd/VST
- $(MAKE) -C pitchedDelay/VST
$(MAKE) -C refine/VST
$(MAKE) -C stereosourceseparation/VST
$(MAKE) -C tal-dub-3/VST
@@ -136,7 +134,6 @@ clean:
$(MAKE) clean -C LUFSMeter/LV2-Multi
$(MAKE) clean -C luftikus/LV2
$(MAKE) clean -C obxd/LV2
- $(MAKE) clean -C pitchedDelay/LV2
$(MAKE) clean -C refine/LV2
$(MAKE) clean -C stereosourceseparation/LV2
$(MAKE) clean -C tal-dub-3/LV2
@@ -170,7 +167,6 @@ clean:
$(MAKE) clean -C LUFSMeter/VST-Multi
$(MAKE) clean -C luftikus/VST
$(MAKE) clean -C obxd/VST
- $(MAKE) clean -C pitchedDelay/VST
$(MAKE) clean -C refine/VST
$(MAKE) clean -C stereosourceseparation/VST
$(MAKE) clean -C tal-dub-3/VST
--
2.14.3

View File

@@ -1,31 +0,0 @@
From 8681831fa6fc5e58a7eebfc46bb0a467c8f19dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 29 Dec 2017 23:36:46 +0100
Subject: [PATCH] Refine-Plugin: do not include "xmmintrin.h"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Submitted [1]
[1] https://github.com/DISTRHO/DISTRHO-Ports/pull/31
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
ports/refine/source/PluginProcessor.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/ports/refine/source/PluginProcessor.cpp b/ports/refine/source/PluginProcessor.cpp
index 6c9e6182..ab50a6ad 100644
--- a/ports/refine/source/PluginProcessor.cpp
+++ b/ports/refine/source/PluginProcessor.cpp
@@ -1,6 +1,5 @@
#include "PluginProcessor.h"
#include "PluginEditor.h"
-#include "xmmintrin.h"
ReFinedAudioProcessor::ReFinedAudioProcessor()
{
--
2.14.3

View File

@@ -1,163 +0,0 @@
From cee14bbe5a46de8cf0941b10686e84c30f7eaf76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 1 Aug 2019 22:29:06 +0200
Subject: [PATCH] Fix build with gcc9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Ported from [1]
[1] https://github.com/WeAreROLI/JUCE/commit/4e0adb2af8b424c43d22bd431011c9a6c57d36b6
Upstream-Status: Submitted [1]
[2] https://github.com/DISTRHO/DISTRHO-Ports/pull/42
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../juce_graphics/colour/juce_PixelFormats.h | 33 +++-----------
.../native/juce_RenderingHelpers.h | 44 +------------------
2 files changed, 8 insertions(+), 69 deletions(-)
diff --git a/libs/juce/source/modules/juce_graphics/colour/juce_PixelFormats.h b/libs/juce/source/modules/juce_graphics/colour/juce_PixelFormats.h
index cb0867cf..dea97a6b 100644
--- a/libs/juce/source/modules/juce_graphics/colour/juce_PixelFormats.h
+++ b/libs/juce/source/modules/juce_graphics/colour/juce_PixelFormats.h
@@ -105,22 +105,9 @@ public:
//==============================================================================
forcedinline uint8 getAlpha() const noexcept { return components.a; }
- forcedinline uint8 getRed() const noexcept { return components.r; }
+ forcedinline uint8 getRed() const noexcept { return components.r; }
forcedinline uint8 getGreen() const noexcept { return components.g; }
- forcedinline uint8 getBlue() const noexcept { return components.b; }
-
- #if JUCE_GCC
- // NB these are here as a workaround because GCC refuses to bind to packed values.
- forcedinline uint8& getAlpha() noexcept { return comps [indexA]; }
- forcedinline uint8& getRed() noexcept { return comps [indexR]; }
- forcedinline uint8& getGreen() noexcept { return comps [indexG]; }
- forcedinline uint8& getBlue() noexcept { return comps [indexB]; }
- #else
- forcedinline uint8& getAlpha() noexcept { return components.a; }
- forcedinline uint8& getRed() noexcept { return components.r; }
- forcedinline uint8& getGreen() noexcept { return components.g; }
- forcedinline uint8& getBlue() noexcept { return components.b; }
- #endif
+ forcedinline uint8 getBlue() const noexcept { return components.b; }
//==============================================================================
/** Copies another pixel colour over this one.
@@ -340,9 +327,6 @@ private:
{
uint32 internal;
Components components;
- #if JUCE_GCC
- uint8 comps[4]; // helper struct needed because gcc does not allow references to packed union members
- #endif
};
}
#ifndef DOXYGEN
@@ -425,13 +409,9 @@ public:
//==============================================================================
forcedinline uint8 getAlpha() const noexcept { return 0xff; }
- forcedinline uint8 getRed() const noexcept { return r; }
+ forcedinline uint8 getRed() const noexcept { return r; }
forcedinline uint8 getGreen() const noexcept { return g; }
- forcedinline uint8 getBlue() const noexcept { return b; }
-
- forcedinline uint8& getRed() noexcept { return r; }
- forcedinline uint8& getGreen() noexcept { return g; }
- forcedinline uint8& getBlue() noexcept { return b; }
+ forcedinline uint8 getBlue() const noexcept { return b; }
//==============================================================================
/** Copies another pixel colour over this one.
@@ -646,11 +626,10 @@ public:
//==============================================================================
forcedinline uint8 getAlpha() const noexcept { return a; }
- forcedinline uint8& getAlpha() noexcept { return a; }
- forcedinline uint8 getRed() const noexcept { return 0; }
+ forcedinline uint8 getRed() const noexcept { return 0; }
forcedinline uint8 getGreen() const noexcept { return 0; }
- forcedinline uint8 getBlue() const noexcept { return 0; }
+ forcedinline uint8 getBlue() const noexcept { return 0; }
//==============================================================================
/** Copies another pixel colour over this one.
diff --git a/libs/juce/source/modules/juce_graphics/native/juce_RenderingHelpers.h b/libs/juce/source/modules/juce_graphics/native/juce_RenderingHelpers.h
index e552758b..6dd943fb 100644
--- a/libs/juce/source/modules/juce_graphics/native/juce_RenderingHelpers.h
+++ b/libs/juce/source/modules/juce_graphics/native/juce_RenderingHelpers.h
@@ -585,10 +585,6 @@ namespace EdgeTableFillers
{
areRGBComponentsEqual = sourceColour.getRed() == sourceColour.getGreen()
&& sourceColour.getGreen() == sourceColour.getBlue();
- filler[0].set (sourceColour);
- filler[1].set (sourceColour);
- filler[2].set (sourceColour);
- filler[3].set (sourceColour);
}
else
{
@@ -644,7 +640,6 @@ namespace EdgeTableFillers
const Image::BitmapData& destData;
PixelType* linePixels;
PixelARGB sourceColour;
- PixelRGB filler [4];
bool areRGBComponentsEqual;
forcedinline PixelType* getPixel (const int x) const noexcept
@@ -659,43 +654,8 @@ namespace EdgeTableFillers
forcedinline void replaceLine (PixelRGB* dest, const PixelARGB colour, int width) const noexcept
{
- if (destData.pixelStride == sizeof (*dest))
- {
- if (areRGBComponentsEqual) // if all the component values are the same, we can cheat..
- {
- memset (dest, colour.getRed(), (size_t) width * 3);
- }
- else
- {
- if (width >> 5)
- {
- const int* const intFiller = reinterpret_cast<const int*> (filler);
-
- while (width > 8 && (((pointer_sized_int) dest) & 7) != 0)
- {
- dest->set (colour);
- ++dest;
- --width;
- }
-
- while (width > 4)
- {
- int* d = reinterpret_cast<int*> (dest);
- *d++ = intFiller[0];
- *d++ = intFiller[1];
- *d++ = intFiller[2];
- dest = reinterpret_cast<PixelRGB*> (d);
- width -= 4;
- }
- }
-
- while (--width >= 0)
- {
- dest->set (colour);
- ++dest;
- }
- }
- }
+ if ((size_t) destData.pixelStride == sizeof (*dest) && areRGBComponentsEqual)
+ memset ((void*) dest, colour.getRed(), (size_t) width * 3); // if all the component values are the same, we can cheat..
else
{
JUCE_PERFORM_PIXEL_OP_LOOP (set (colour))
--
2.21.0