introduce pulseaudio to DISTRO_FEATURES

This patch adds a pulseaudio feature to DISTRO_FEATURES, using DISTRO_FEATURES_BACKFILL to preserve existing distro configuration, and makes Qt 4 respect it. There are a few other recipes that should respect this feature as well, however I wanted to send the qt4 one in as soon as possible as it addresses actual observed build failures.

The following changes since commit 3cb519598d9ce044ccccb2d6a52a3c0933433501:

tcl 8.5.11: fix packaging for native version (2012-02-28 13:33:22 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/qt4-pulseaudio-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-pulseaudio-fix

Paul Eggleton (1):
qt4: make pulseaudio support conditional upon DISTRO_FEATURES

 meta/conf/bitbake.conf                             |    2 +-
 meta/recipes-qt/qt4/qt-4.7.4.inc                   |    1 +
 .../qt4/qt-4.7.4/pulseaudio-config.patch           |   45 ++++++++++++++++++++
 meta/recipes-qt/qt4/qt-4.8.0.inc                   |    1 +
 .../qt4/qt-4.8.0/pulseaudio-config.patch           |   45 ++++++++++++++++++++
 meta/recipes-qt/qt4/qt4.inc                        |    2 +
 6 files changed, 95 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch
 create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch

1.7.5.4

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.

---
 meta/conf/bitbake.conf                             |    2 +-
 meta/recipes-qt/qt4/qt-4.7.4.inc                   |    1 +
 .../qt4/qt-4.7.4/pulseaudio-config.patch           |   45 ++++++++++++++++++++
 meta/recipes-qt/qt4/qt-4.8.0.inc                   |    1 +
 .../qt4/qt-4.8.0/pulseaudio-config.patch           |   45 ++++++++++++++++++++
 meta/recipes-qt/qt4/qt4.inc                        |    2 +
 6 files changed, 95 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch
 create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch

index f67bf50..18879c8 100644
@@ -700,7 +700,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
 
-DISTRO_FEATURES_BACKFILL = ""
+DISTRO_FEATURES_BACKFILL = "pulseaudio"
 DISTRO_FEATURES_append = "${@oe.utils.distro_features_backfill(d)}"
 
 COMBINED_FEATURES = "\

index 216472c..f8956f7 100644
@@ -16,6 +16,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://fix-translations.patch \
            file://add_nostrip_for_debug_packages.diff \
            file://target_qmake.patch \
+           file://pulseaudio-config.patch \
            file://g++.conf \
            file://linux.conf \
            file://fix-qtbug-20925.patch \

index 28586be..c0d90cd 100644
@@ -17,6 +17,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://configure_oe_compiler.patch \
            file://target_qmake.patch \
            file://qmake_pri_fixes.patch \
+           file://pulseaudio-config.patch \
            file://g++.conf \
            file://linux.conf \
            "

index 75abe6e..2956aed 100644
@@ -1,6 +1,7 @@
 inherit qmake_base
 
 DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
 
 require qt4_arch.inc
 QT_ARCH := "${@qt_arch(d)}"

@@ -18,6 +19,7 @@ QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
                     -system-libjpeg -system-libpng -system-libtiff -system-zlib \
                     -no-pch -qdbus -stl -glib -phonon -webkit \
                     -xmlpatterns -no-rpath -qt3support -silent \
+                    ${@base_contains('DISTRO_FEATURES', 'pulseaudio', '--enable-pulseaudio', '--disable-pulseaudio', d)} \
                     ${QT_SQL_DRIVER_FLAGS} \
                     ${QT_DISTRO_FLAGS} \
                     ${QT_GLFLAGS}"

1.7.5.4

Merged to master, thanks.

Richard