diff options
| author |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2022-11-27 22:57:50 +0100 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2022-11-27 22:58:31 +0100 |
| commit | 56efce0ab4bc8d710e1abe8aca25689c7667a765 (patch) | |
| tree | eb2a93270131190151eeb8b85d00abd4a4ee0c8e /app-misc | |
| parent | gui-wm/gamescope: Bump to 3.11.49, drop old 3.11.48 (diff) | |
| download | gentoo-56efce0ab4bc8d710e1abe8aca25689c7667a765.tar.gz gentoo-56efce0ab4bc8d710e1abe8aca25689c7667a765.tar.bz2 gentoo-56efce0ab4bc8d710e1abe8aca25689c7667a765.zip | |
app-misc/openrgb: update 9999 again, patch merged upstream
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/openrgb/files/OpenRGB-0.8-plugins.patch | 26 | ||||
| -rw-r--r-- | app-misc/openrgb/openrgb-9999.ebuild | 3 |
2 files changed, 1 insertions, 28 deletions
diff --git a/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch deleted file mode 100644 index a2d02cde3c7f..000000000000 --- a/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch +++ /dev/null @@ -1,26 +0,0 @@ -Allow installation of plugins not only in ~/.config - -Used by app-misc/openrgb-plugin-* packages - -diff --git a/PluginManager.cpp b/PluginManager.cpp -index 6ccad72c..7b12f32e 100644 ---- a/PluginManager.cpp -+++ b/PluginManager.cpp -@@ -41,7 +41,8 @@ void PluginManager::ScanAndLoadPlugins() - | The plugins directory is a directory named "plugins" in | - | the configuration directory | - \*---------------------------------------------------------*/ -- const QDir plugins_dir = QString(ResourceManager::get()->GetConfigurationDirectory().c_str()).append(plugins_path); -+ for (const QDir plugins_dir : {QString(ResourceManager::get()->GetConfigurationDirectory().c_str()).append(plugins_path), -+ QString().fromStdString(GENTOO_PLUGINS_DIR)}) { - LOG_INFO("[PluginManager] Scanning plugin directory: %s", plugins_dir.absolutePath().toStdString().c_str()); - - /*---------------------------------------------------------*\ -@@ -64,6 +65,7 @@ void PluginManager::ScanAndLoadPlugins() - - AddPlugin(plugin_path); - } -+ } - } - - void PluginManager::AddPlugin(std::string path) diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild index 74083c048810..343c012dd241 100644 --- a/app-misc/openrgb/openrgb-9999.ebuild +++ b/app-misc/openrgb/openrgb-9999.ebuild @@ -40,7 +40,6 @@ BDEPEND=" " PATCHES+=( - "${FILESDIR}"/OpenRGB-0.8-plugins.patch "${FILESDIR}"/OpenRGB-0.7-r1-udev.patch ) @@ -57,7 +56,7 @@ src_configure() { eqmake5 \ INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \ - DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\"" + DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\"" } src_install() { |