From dcb7263d5527b7aacb6baedde97ab57c1f4d7931 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 30 Jan 2022 14:46:09 +0100 Subject: [PATCH] lmms: fix duplicate plugins Fixes #35306 --- .../lmms/patches/fix-duplicate-plugin-dir.patch | 16 ++++++++++++++++ srcpkgs/lmms/template | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/lmms/patches/fix-duplicate-plugin-dir.patch diff --git a/srcpkgs/lmms/patches/fix-duplicate-plugin-dir.patch b/srcpkgs/lmms/patches/fix-duplicate-plugin-dir.patch new file mode 100644 index 00000000000..7b747958dc6 --- /dev/null +++ b/srcpkgs/lmms/patches/fix-duplicate-plugin-dir.patch @@ -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 diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template index 15b67a8f222..29cf0f1140f 100644 --- a/srcpkgs/lmms/template +++ b/srcpkgs/lmms/template @@ -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