push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,20 @@
diff --git a/src/plugin-main.cpp b/src/plugin-main.cpp
index 43f0e28..5e393c6 100644
--- a/src/plugin-main.cpp
+++ b/src/plugin-main.cpp
@@ -412,14 +412,7 @@ const NDIlib_v5 *load_ndilib()
if (!temp_path.isEmpty()) {
locations << temp_path;
}
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
- // Linux, MacOS
- // https://github.com/DistroAV/DistroAV/blob/master/lib/ndi/NDI%20SDK%20Documentation.pdf
- // "6.1 LOCATING THE LIBRARY
- // ... the redistributable on MacOS is installed within `/usr/local/lib` ..."
- locations << "/usr/lib";
- locations << "/usr/local/lib";
-#endif
+ locations << "@NDI@/lib";
auto lib_path = QString();
#if defined(Q_OS_LINUX)
// Linux