From a6075af3c3313e380904e7410a5713c314004922 Mon Sep 17 00:00:00 2001 From: Arie Miller Date: Thu, 17 Jun 2021 11:39:24 -0400 Subject: [PATCH 1/2] add openal dependency for qtmultimedia submodule --- recipes/qt/5.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index e378b6fbb1439..6b0fad655fa04 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -968,7 +968,7 @@ def _create_plugin(pluginname, libname, type, requires): _create_plugin("QXInputGamepadBackendPlugin", "xinputgamepad", "gamepads", []) if self.options.qtmultimedia: - _create_module("Multimedia", ["Network", "Gui"]) + _create_module("Multimedia", ["Network", "Gui", "openal::openal"]) _create_module("MultimediaWidgets", ["Multimedia", "Widgets", "Gui"]) _create_module("MultimediaQuick", ["Multimedia", "Quick"]) _create_plugin("QM3uPlaylistPlugin", "qtmultimedia_m3u", "playlistformats", []) From 45d207924cc952d60ef3968140203e8c66220551 Mon Sep 17 00:00:00 2001 From: Arie Miller Date: Thu, 17 Jun 2021 11:40:19 -0400 Subject: [PATCH 2/2] only create qtmultimediaquick if qtdeclaarative is enabled --- recipes/qt/5.x.x/conanfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 6b0fad655fa04..34b397fb31065 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -970,7 +970,8 @@ def _create_plugin(pluginname, libname, type, requires): if self.options.qtmultimedia: _create_module("Multimedia", ["Network", "Gui", "openal::openal"]) _create_module("MultimediaWidgets", ["Multimedia", "Widgets", "Gui"]) - _create_module("MultimediaQuick", ["Multimedia", "Quick"]) + if self.options.qtdeclarative and self.options.gui: + _create_module("MultimediaQuick", ["Multimedia", "Quick"]) _create_plugin("QM3uPlaylistPlugin", "qtmultimedia_m3u", "playlistformats", []) if self.settings.os == "Linux": _create_module("MultimediaGstTools", ["Multimedia", "MultimediaWidgets", "Gui"])