summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-28 17:36:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-02 16:22:48 +0000
commit01954b9c65c979e03b7f07ab30889ceb20ed0d05 (patch)
treee8f03b402cef1271f117667161e128d8c8f71768
parent2b918b623bf8add454c3726dd4ee189230e6fcbc (diff)
downloadpoky-01954b9c65c979e03b7f07ab30889ceb20ed0d05.tar.gz
qt4: make pulseaudio support conditional upon DISTRO_FEATURES
Add a pulseaudio DISTRO_FEATURES item and disable pulseaudio support in phonon within Qt4 if it is not present; otherwise it is a race condition as to whether it is enabled or disabled or breaks the build. Note that this adds pulseaudio to DISTRO_FEATURES_BACKFILL thus leaving existing distro configurations unaffected. (From OE-Core rev: b82c216c1ee8e2a009e87856b7adad08f7f50482) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4.inc1
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch45
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0.inc1
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch45
-rw-r--r--meta/recipes-qt/qt4/qt4.inc2
6 files changed, 95 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f67bf5073e..18879c82fe 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -700,7 +700,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
700MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" 700MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
701IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" 701IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
702 702
703DISTRO_FEATURES_BACKFILL = "" 703DISTRO_FEATURES_BACKFILL = "pulseaudio"
704DISTRO_FEATURES_append = "${@oe.utils.distro_features_backfill(d)}" 704DISTRO_FEATURES_append = "${@oe.utils.distro_features_backfill(d)}"
705 705
706COMBINED_FEATURES = "\ 706COMBINED_FEATURES = "\
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index 216472c3c3..f8956f7bb5 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -16,6 +16,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
16 file://fix-translations.patch \ 16 file://fix-translations.patch \
17 file://add_nostrip_for_debug_packages.diff \ 17 file://add_nostrip_for_debug_packages.diff \
18 file://target_qmake.patch \ 18 file://target_qmake.patch \
19 file://pulseaudio-config.patch \
19 file://g++.conf \ 20 file://g++.conf \
20 file://linux.conf \ 21 file://linux.conf \
21 file://fix-qtbug-20925.patch \ 22 file://fix-qtbug-20925.patch \
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch
new file mode 100644
index 0000000000..bbdc8bfe37
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch
@@ -0,0 +1,45 @@
1From 85f9264773407f2bf8d0495c9fc8bd83683ab2f0 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 23 Nov 2011 14:36:10 +0000
4Subject: [PATCH] configure: make pulseaudio a configurable option
5
6Allows disabling pulseaudio support within phonon at configure time.
7(This is the Qt 4.7.4 version.)
8
9Upstream-Status: Pending
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12---
13 configure | 9 ++++++++-
14 1 files changed, 8 insertions(+), 1 deletions(-)
15
16diff --git a/configure b/configure
17index 3b7a1f3..7616fd3 100755
18--- a/configure
19+++ b/configure
20@@ -941,7 +941,7 @@ while [ "$#" -gt 0 ]; do
21 VAL=no
22 ;;
23 #Qt style yes options
24- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
25+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-pulseaudio|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
26 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
27 VAL=yes
28 ;;
29@@ -1863,6 +1863,13 @@ while [ "$#" -gt 0 ]; do
30 UNKNOWN_OPT=yes
31 fi
32 ;;
33+ pulseaudio)
34+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
35+ CFG_PULSEAUDIO="$VAL"
36+ else
37+ UNKNOWN_OPT=yes
38+ fi
39+ ;;
40 gtkstyle)
41 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
42 CFG_QGTKSTYLE="$VAL"
43--
441.7.5.4
45
diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.0.inc
index 28586be66e..c0d90cd267 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0.inc
+++ b/meta/recipes-qt/qt4/qt-4.8.0.inc
@@ -17,6 +17,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
17 file://configure_oe_compiler.patch \ 17 file://configure_oe_compiler.patch \
18 file://target_qmake.patch \ 18 file://target_qmake.patch \
19 file://qmake_pri_fixes.patch \ 19 file://qmake_pri_fixes.patch \
20 file://pulseaudio-config.patch \
20 file://g++.conf \ 21 file://g++.conf \
21 file://linux.conf \ 22 file://linux.conf \
22 " 23 "
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch
new file mode 100644
index 0000000000..0992efaddc
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch
@@ -0,0 +1,45 @@
1From 677f5b4bec03972c8cada19d2e4530252c9ac4ef Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 28 Feb 2012 15:10:24 +0000
4Subject: [PATCH] configure: make pulseaudio a configurable option
5
6Allows disabling pulseaudio support within phonon at configure time.
7(This is the Qt 4.8.0 version.)
8
9Upstream-Status: Pending
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12---
13 configure | 9 ++++++++-
14 1 files changed, 8 insertions(+), 1 deletions(-)
15
16diff --git a/configure b/configure
17index 5a5ef1d..e43b920 100755
18--- a/configure
19+++ b/configure
20@@ -1043,7 +1043,7 @@ while [ "$#" -gt 0 ]; do
21 VAL=no
22 ;;
23 #Qt style yes options
24- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
25+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-pulseaudio|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
26 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
27 VAL=yes
28 ;;
29@@ -2000,6 +2000,13 @@ while [ "$#" -gt 0 ]; do
30 UNKNOWN_OPT=yes
31 fi
32 ;;
33+ pulseaudio)
34+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
35+ CFG_PULSEAUDIO="$VAL"
36+ else
37+ UNKNOWN_OPT=yes
38+ fi
39+ ;;
40 gtkstyle)
41 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
42 CFG_QGTKSTYLE="$VAL"
43--
441.7.5.4
45
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 75abe6e029..2956aed604 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -1,6 +1,7 @@
1inherit qmake_base 1inherit qmake_base
2 2
3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff" 3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff"
4DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
4 5
5require qt4_arch.inc 6require qt4_arch.inc
6QT_ARCH := "${@qt_arch(d)}" 7QT_ARCH := "${@qt_arch(d)}"
@@ -18,6 +19,7 @@ QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
18 -system-libjpeg -system-libpng -system-libtiff -system-zlib \ 19 -system-libjpeg -system-libpng -system-libtiff -system-zlib \
19 -no-pch -qdbus -stl -glib -phonon -webkit \ 20 -no-pch -qdbus -stl -glib -phonon -webkit \
20 -xmlpatterns -no-rpath -qt3support -silent \ 21 -xmlpatterns -no-rpath -qt3support -silent \
22 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', '--enable-pulseaudio', '--disable-pulseaudio', d)} \
21 ${QT_SQL_DRIVER_FLAGS} \ 23 ${QT_SQL_DRIVER_FLAGS} \
22 ${QT_DISTRO_FLAGS} \ 24 ${QT_DISTRO_FLAGS} \
23 ${QT_GLFLAGS}" 25 ${QT_GLFLAGS}"