From 4fb3081917155844440267e747e87ee6c35878ed Mon Sep 17 00:00:00 2001
From: Maciej Malczyk <wujekbrezniew@gmail.com>
Date: Sat, 18 Nov 2023 14:19:26 +0100
Subject: [PATCH 1/2] Fix lv2 headers to comply to this:
 https://github.com/lv2/lv2#headers

---
 include/Lv2Options.h          | 4 ++--
 include/Lv2UridMap.h          | 2 +-
 include/Lv2Worker.h           | 2 +-
 src/core/lv2/Lv2Evbuf.cpp     | 2 +-
 src/core/lv2/Lv2Manager.cpp   | 6 +++---
 src/core/lv2/Lv2Ports.cpp     | 4 ++--
 src/core/lv2/Lv2Proc.cpp      | 8 ++++----
 src/core/lv2/Lv2UridCache.cpp | 8 ++++----
 src/gui/Lv2ViewBase.cpp       | 2 +-
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/Lv2Options.h b/include/Lv2Options.h
index 603cdda43ac..69d294cbe1f 100644
--- a/include/Lv2Options.h
+++ b/include/Lv2Options.h
@@ -30,8 +30,8 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <cstdint>
-#include <lv2/lv2plug.in/ns/ext/options/options.h>
-#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
+#include <lv2/options/options.h>
+#include <lv2/urid/urid.h>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/include/Lv2UridMap.h b/include/Lv2UridMap.h
index 6c22aca3e40..605050fe7c2 100644
--- a/include/Lv2UridMap.h
+++ b/include/Lv2UridMap.h
@@ -29,7 +29,7 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
+#include "lv2/urid/urid.h"
 #include <mutex> // TODO: use semaphore, even though this is not realtime critical
 #include <string>
 #include <unordered_map>
diff --git a/include/Lv2Worker.h b/include/Lv2Worker.h
index 90a3d9d4f8d..b15bd9026c4 100644
--- a/include/Lv2Worker.h
+++ b/include/Lv2Worker.h
@@ -30,7 +30,7 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <lilv/lilv.h>
-#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
+#include <lv2/worker/worker.h>
 #include <thread>
 #include <vector>
 
diff --git a/src/core/lv2/Lv2Evbuf.cpp b/src/core/lv2/Lv2Evbuf.cpp
index acfb9b8aa62..76570b4262a 100644
--- a/src/core/lv2/Lv2Evbuf.cpp
+++ b/src/core/lv2/Lv2Evbuf.cpp
@@ -34,7 +34,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
+#include <lv2/atom/atom.h>
 
 namespace lmms
 {
diff --git a/src/core/lv2/Lv2Manager.cpp b/src/core/lv2/Lv2Manager.cpp
index 6a1b2a8af20..1633b862616 100644
--- a/src/core/lv2/Lv2Manager.cpp
+++ b/src/core/lv2/Lv2Manager.cpp
@@ -29,9 +29,9 @@
 #include <algorithm>
 #include <cstdlib>
 #include <lilv/lilv.h>
-#include <lv2/lv2plug.in/ns/ext/buf-size/buf-size.h>
-#include <lv2/lv2plug.in/ns/ext/options/options.h>
-#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
+#include <lv2/buf-size/buf-size.h>
+#include <lv2/options/options.h>
+#include <lv2/worker/worker.h>
 #include <QDebug>
 #include <QElapsedTimer>
 
diff --git a/src/core/lv2/Lv2Ports.cpp b/src/core/lv2/Lv2Ports.cpp
index a4625936e62..657046817ef 100644
--- a/src/core/lv2/Lv2Ports.cpp
+++ b/src/core/lv2/Lv2Ports.cpp
@@ -27,8 +27,8 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
-#include <lv2/lv2plug.in/ns/ext/port-props/port-props.h>
+#include <lv2/atom/atom.h>
+#include <lv2/port-props/port-props.h>
 
 #include "Engine.h"
 #include "Lv2Basics.h"
diff --git a/src/core/lv2/Lv2Proc.cpp b/src/core/lv2/Lv2Proc.cpp
index 158196fdbd2..6508e5343cd 100644
--- a/src/core/lv2/Lv2Proc.cpp
+++ b/src/core/lv2/Lv2Proc.cpp
@@ -27,10 +27,10 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <cmath>
-#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
-#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
-#include <lv2/lv2plug.in/ns/ext/resize-port/resize-port.h>
-#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
+#include <lv2/midi/midi.h>
+#include <lv2/atom/atom.h>
+#include <lv2/resize-port/resize-port.h>
+#include <lv2/worker/worker.h>
 #include <QDebug>
 #include <QDomDocument>
 #include <QtGlobal>
diff --git a/src/core/lv2/Lv2UridCache.cpp b/src/core/lv2/Lv2UridCache.cpp
index 746878afb96..7d3a14c9349 100644
--- a/src/core/lv2/Lv2UridCache.cpp
+++ b/src/core/lv2/Lv2UridCache.cpp
@@ -26,10 +26,10 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
-#include <lv2/lv2plug.in/ns/ext/buf-size/buf-size.h>
-#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
-#include <lv2/lv2plug.in/ns/ext/parameters/parameters.h>
+#include <lv2/atom/atom.h>
+#include <lv2/buf-size/buf-size.h>
+#include <lv2/midi/midi.h>
+#include <lv2/parameters/parameters.h>
 #include <QtGlobal>
 
 #include "Lv2UridMap.h"
diff --git a/src/gui/Lv2ViewBase.cpp b/src/gui/Lv2ViewBase.cpp
index 77268bb9b75..9532fee2ab2 100644
--- a/src/gui/Lv2ViewBase.cpp
+++ b/src/gui/Lv2ViewBase.cpp
@@ -31,7 +31,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <lilv/lilv.h>
-#include <lv2/lv2plug.in/ns/ext/port-props/port-props.h>
+#include <lv2/port-props/port-props.h>
 
 #include "AudioEngine.h"
 #include "Controls.h"

From 724f57b5e8df75a4a549654a392ad706bdbfe32c Mon Sep 17 00:00:00 2001
From: Maciej Malczyk <wujekbrezniew@gmail.com>
Date: Sat, 18 Nov 2023 20:45:45 +0100
Subject: [PATCH 2/2] Fix  to <> in one header

---
 include/Lv2UridMap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/Lv2UridMap.h b/include/Lv2UridMap.h
index 605050fe7c2..23f8f758a44 100644
--- a/include/Lv2UridMap.h
+++ b/include/Lv2UridMap.h
@@ -29,7 +29,7 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include "lv2/urid/urid.h"
+#include <lv2/urid/urid.h>
 #include <mutex> // TODO: use semaphore, even though this is not realtime critical
 #include <string>
 #include <unordered_map>