From 5f1419d12a2ff530682826b334c123cddbd7c67c Mon Sep 17 00:00:00 2001 From: Alexande B Date: Mon, 21 Dec 2020 10:36:56 +0300 Subject: [PATCH 1/3] [boost] Add 'algorithm' lib #3961 --- recipes/boost/all/conanfile.py | 1 + recipes/boost/all/rebuild-dependencies.py | 1 + 2 files changed, 2 insertions(+) diff --git a/recipes/boost/all/conanfile.py b/recipes/boost/all/conanfile.py index b242be135e470..9c46e5837f5e6 100644 --- a/recipes/boost/all/conanfile.py +++ b/recipes/boost/all/conanfile.py @@ -21,6 +21,7 @@ # When adding (or removing) an option, also add this option to the list in # `rebuild-dependencies.yml` and re-run that script. CONFIGURE_OPTIONS = ( + "algorithm", "atomic", "chrono", "container", diff --git a/recipes/boost/all/rebuild-dependencies.py b/recipes/boost/all/rebuild-dependencies.py index 5fa3f1689ead6..81abdd6947f35 100755 --- a/recipes/boost/all/rebuild-dependencies.py +++ b/recipes/boost/all/rebuild-dependencies.py @@ -25,6 +25,7 @@ # When adding (or removing) an option, also add this option to the list in # `conanfile.py` and re-run this script. CONFIGURE_OPTIONS = ( + "algorithm", "atomic", "chrono", "container", From 89c0a21483c5f2d016c37509ce88956c4b39b7ef Mon Sep 17 00:00:00 2001 From: Alexande B Date: Mon, 5 Apr 2021 14:11:40 +0300 Subject: [PATCH 2/3] Revert "[boost] Add 'algorithm' lib #3961" This reverts commit 5f1419d12a2ff530682826b334c123cddbd7c67c. --- recipes/boost/all/conanfile.py | 1 - recipes/boost/all/rebuild-dependencies.py | 1 - 2 files changed, 2 deletions(-) diff --git a/recipes/boost/all/conanfile.py b/recipes/boost/all/conanfile.py index bf3453419c68a..bb1a7d1751c2e 100644 --- a/recipes/boost/all/conanfile.py +++ b/recipes/boost/all/conanfile.py @@ -22,7 +22,6 @@ # When adding (or removing) an option, also add this option to the list in # `rebuild-dependencies.yml` and re-run that script. CONFIGURE_OPTIONS = ( - "algorithm", "atomic", "chrono", "container", diff --git a/recipes/boost/all/rebuild-dependencies.py b/recipes/boost/all/rebuild-dependencies.py index dc82219715052..0ad4028e797b3 100755 --- a/recipes/boost/all/rebuild-dependencies.py +++ b/recipes/boost/all/rebuild-dependencies.py @@ -25,7 +25,6 @@ # When adding (or removing) an option, also add this option to the list in # `conanfile.py` and re-run this script. CONFIGURE_OPTIONS = ( - "algorithm", "atomic", "chrono", "container", From 047333bdad5caa957d457e7ce59d760de3a77c70 Mon Sep 17 00:00:00 2001 From: Alexande B Date: Sun, 20 Jun 2021 21:14:05 +0300 Subject: [PATCH 3/3] Fix for 'package require X not used in components requires' for glib2, alsa and openal deps --- recipes/qt/5.x.x/conanfile.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 34b397fb31065..104a3e9a104d1 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -794,6 +794,8 @@ def _create_plugin(pluginname, libname, type, requires): core_reqs.append("icu::icu") if self.options.with_zstd: core_reqs.append("zstd::zstd") + if self.options.with_glib: + core_reqs.append("glib::glib-2.0") _create_module("Core", core_reqs) if self.options.gui: @@ -968,7 +970,12 @@ def _create_plugin(pluginname, libname, type, requires): _create_plugin("QXInputGamepadBackendPlugin", "xinputgamepad", "gamepads", []) if self.options.qtmultimedia: - _create_module("Multimedia", ["Network", "Gui", "openal::openal"]) + multimedia_reqs = ["Network", "Gui"] + if self.options.with_libalsa: + multimedia_reqs.append("libalsa::libalsa") + if self.options.with_openal: + multimedia_reqs.append("openal::openal") + _create_module("Multimedia", multimedia_reqs) _create_module("MultimediaWidgets", ["Multimedia", "Widgets", "Gui"]) if self.options.qtdeclarative and self.options.gui: _create_module("MultimediaQuick", ["Multimedia", "Quick"])