diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-20 00:02:57 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-25 12:14:08 +0200 |
commit | ebdd83f6b7e5c3296e5ebd3b7b0c1e0defe5aba5 (patch) | |
tree | 9b2af5454c398e0a97d193d440c904c4d7c7cd43 /recipes-qt/qt5/qtbase-git | |
parent | b9fec03db878745066f91f354f82ec9c0002f34a (diff) |
qtbase: explicitly enable or disable all deps
* some options are tri-state and PACKAGECONFIG doesn't support that
if you need the 3rd option, you need to overwrite PACKAGECONFIG[opt]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git')
3 files changed, 106 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch new file mode 100644 index 00000000..2fe0a182 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch @@ -0,0 +1,36 @@ +From 1f5a36de9bb01192d3cdbcbef7a009ab4651040b Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Tue, 28 Feb 2012 15:10:24 +0000 +Subject: [PATCH 21/23] configure: make pulseaudio a configurable option + +Allows disabling pulseaudio support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 96965b6..595c9d9 100755 +--- a/configure ++++ b/configure +@@ -1959,6 +1959,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ pulseaudio) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then ++ CFG_PULSEAUDIO="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch new file mode 100644 index 00000000..76d1400c --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch @@ -0,0 +1,35 @@ +From eb93499e26486957a93b2f8f82853d3de9769cce Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Fri, 19 Jul 2013 23:21:28 +0200 +Subject: [PATCH 22/23] configure: make alsa a configurable option + +Allows disabling alsa support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 595c9d9..864967c 100755 +--- a/configure ++++ b/configure +@@ -1966,6 +1966,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ alsa) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then ++ CFG_ALSA="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch new file mode 100644 index 00000000..76b58355 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch @@ -0,0 +1,35 @@ +From 6729c056b4d3ab43e59ce1c8303ae58d7c6ba8cf Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sat, 20 Jul 2013 10:56:37 +0200 +Subject: [PATCH 23/23] configure: make freetype a configurable option + +Allows disabling freetype support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 864967c..1b4225a 100755 +--- a/configure ++++ b/configure +@@ -1973,6 +1973,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ freetype) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then ++ CFG_LIBFREETYPE="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" +-- +1.8.3.2 + |