From 19c9837618687b6be3d8d2e306d1b5d244f19334 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Fri, 25 Dec 2020 08:54:36 +0000
Subject: [PATCH] Update DPF; Nekobi has default CC defined now

---
 dpf/Makefile.base.mk                   | 12 ++++++++----
 dpf/Makefile.plugins.mk                |  2 +-
 plugins/Nekobi/DistrhoPluginNekobi.cpp |  8 ++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/dpf/Makefile.base.mk b/dpf/Makefile.base.mk
index d8623e6..42423ff 100644
--- a/dpf/Makefile.base.mk
+++ b/dpf/Makefile.base.mk
@@ -63,6 +63,10 @@ ifneq (,$(filter arm%,$(TARGET_PROCESSOR)))
 CPU_ARM=true
 CPU_ARM_OR_AARCH64=true
 endif
+ifneq (,$(filter arm64%,$(TARGET_PROCESSOR)))
+CPU_ARM64=true
+CPU_ARM_OR_AARCH64=true
+endif
 ifneq (,$(filter aarch64%,$(TARGET_PROCESSOR)))
 CPU_AARCH64=true
 CPU_ARM_OR_AARCH64=true
@@ -132,12 +136,14 @@ BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
 BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunction-sections
 
 ifeq ($(CPU_I386_OR_X86_64),true)
-BASE_OPTS += -mtune=generic -msse -msse2
+BASE_OPTS += -mtune=generic -msse -msse2 -mfpmath=sse
 endif
 
 ifeq ($(CPU_ARM),true)
+ifneq ($(CPU_ARM64),true)
 BASE_OPTS += -mfpu=neon-vfpv4 -mfloat-abi=hard
 endif
+endif
 
 ifeq ($(MACOS),true)
 # MacOS linker flags
@@ -239,9 +245,6 @@ HAVE_LIBLO = $(shell $(PKG_CONFIG) --exists liblo && echo true)
 # ---------------------------------------------------------------------------------------------------------------------
 # Set Generic DGL stuff
 
-# needed because reasons (specifically, libc broke ABI)
-DGL_FLAGS = -fno-finite-math-only
-
 ifeq ($(HAIKU),true)
 DGL_SYSTEM_LIBS += -lbe
 endif
@@ -288,6 +291,7 @@ OPENGL_LIBS  = $(shell $(PKG_CONFIG) --libs gl)
 endif
 
 ifeq ($(MACOS),true)
+OPENGL_FLAGS = -DGL_SILENCE_DEPRECATION=1
 OPENGL_LIBS  = -framework OpenGL
 endif
 
diff --git a/dpf/Makefile.plugins.mk b/dpf/Makefile.plugins.mk
index 7c1e554..83cce2a 100644
--- a/dpf/Makefile.plugins.mk
+++ b/dpf/Makefile.plugins.mk
@@ -98,7 +98,7 @@ DGL_FLAGS += -DDGL_EXTERNAL
 HAVE_DGL   = true
 endif
 
-DGL_LIBS += $(DGL_SYSTEM_LIBS)
+DGL_LIBS += $(DGL_SYSTEM_LIBS) -lm
 
 ifneq ($(HAVE_DGL),true)
 dssi_ui =
diff --git a/plugins/Nekobi/DistrhoPluginNekobi.cpp b/plugins/Nekobi/DistrhoPluginNekobi.cpp
index d41f97e..8689cd1 100644
--- a/plugins/Nekobi/DistrhoPluginNekobi.cpp
+++ b/plugins/Nekobi/DistrhoPluginNekobi.cpp
@@ -172,6 +172,7 @@ void DistrhoPluginNekobi::initParameter(uint32_t index, Parameter& parameter)
         parameter.ranges.max = 1.0f;
         parameter.enumValues.count = 2;
         parameter.enumValues.restrictedMode = true;
+        parameter.midiCC = 70; //Sound Variation
         {
             ParameterEnumerationValue* const enumValues = new ParameterEnumerationValue[2];
             enumValues[0].value = 0.0f;
@@ -188,6 +189,7 @@ void DistrhoPluginNekobi::initParameter(uint32_t index, Parameter& parameter)
         parameter.ranges.def = 0.0f;
         parameter.ranges.min = -12.0f;
         parameter.ranges.max = 12.0f;
+        parameter.midiCC = 75;
         break;
     case paramCutoff:
         parameter.hints      = kParameterIsAutomable; // modified x2.5
@@ -197,6 +199,7 @@ void DistrhoPluginNekobi::initParameter(uint32_t index, Parameter& parameter)
         parameter.ranges.def = 25.0f;
         parameter.ranges.min = 0.0f;
         parameter.ranges.max = 100.0f;
+        parameter.midiCC = 74;
         break;
     case paramResonance:
         parameter.hints      = kParameterIsAutomable; // modified x100
@@ -206,6 +209,7 @@ void DistrhoPluginNekobi::initParameter(uint32_t index, Parameter& parameter)
         parameter.ranges.def = 25.0f;
         parameter.ranges.min = 0.0f;
         parameter.ranges.max = 95.0f;
+        parameter.midiCC = 71;
         break;
     case paramEnvMod:
         parameter.hints      = kParameterIsAutomable; // modified x100
@@ -215,6 +219,7 @@ void DistrhoPluginNekobi::initParameter(uint32_t index, Parameter& parameter)
         parameter.ranges.def = 50.0f;
         parameter.ranges.min = 0.0f;
         parameter.ranges.max = 100.0f;
+        parameter.midiCC = 1; //Mod Wheel
         break;
     case paramDecay:
         parameter.hints      = kParameterIsAutomable; // was 0.000009 <-> 0.0005, log
@@ -224,6 +229,7 @@ void DistrhoPluginNekobi::initParameter(uint32_t index, Parameter& parameter)
         parameter.ranges.def = 75.0f;
         parameter.ranges.min = 0.0f;
         parameter.ranges.max = 100.0f;
+        parameter.midiCC = 72;
         break;
     case paramAccent:
         parameter.hints      = kParameterIsAutomable; // modified x100
@@ -233,6 +239,7 @@ void DistrhoPluginNekobi::initParameter(uint32_t index, Parameter& parameter)
         parameter.ranges.def = 25.0f;
         parameter.ranges.min = 0.0f;
         parameter.ranges.max = 100.0f;
+        parameter.midiCC = 76;
         break;
     case paramVolume:
         parameter.hints      = kParameterIsAutomable; // modified x100
@@ -242,6 +249,7 @@ void DistrhoPluginNekobi::initParameter(uint32_t index, Parameter& parameter)
         parameter.ranges.def = 75.0f;
         parameter.ranges.min = 0.0f;
         parameter.ranges.max = 100.0f;
+        parameter.midiCC = 7; //Volume
         break;
     case paramBypass:
         parameter.initDesignation(kParameterDesignationBypass);