lmms: fix duplicate plugins

Fixes #35306
This commit is contained in:
Duncaen 2022-01-30 14:46:09 +01:00
parent bab59b73f1
commit dcb7263d55
No known key found for this signature in database
GPG key ID: 335C1D17EC3D6E35
2 changed files with 17 additions and 1 deletions

View file

@ -0,0 +1,16 @@
PLUGIN_DIR is defined as ${LIB_DIR}/lmms (/usr/lib64/lmms) by the build system
and is also added to the search path, since its a symlink to /usr/lib we end up
with the same directory but with a different path, resulting in duplicated
plugins.
--- a/src/core/PluginFactory.cpp
+++ b/src/core/PluginFactory.cpp
@@ -63,7 +63,7 @@
// e.g. binary at "C:/Program Files/LMMS/lmms.exe"
// plugins at "C:/Program Files/LMMS/plugins/"
-#ifndef LMMS_BUILD_WIN32
+#if !defined(LMMS_BUILD_WIN32) && !defined(PLUGIN_DIR)
addRelativeIfExists("../lib/lmms"); // Installed
#endif
addRelativeIfExists("plugins"); // Portable

View file

@ -1,7 +1,7 @@
# Template file for 'lmms'
pkgname=lmms
version=1.2.2
revision=2
revision=3
archs="~armv6*"
wrksrc=${pkgname}
build_style=cmake