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>
This commit is contained in:
Paul Eggleton
Richard Purdie
parent
2b918b623b
commit
01954b9c65
|
|
@ -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 = "\
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
From 85f9264773407f2bf8d0495c9fc8bd83683ab2f0 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Date: Wed, 23 Nov 2011 14:36:10 +0000
|
||||
Subject: [PATCH] configure: make pulseaudio a configurable option
|
||||
|
||||
Allows disabling pulseaudio support within phonon at configure time.
|
||||
(This is the Qt 4.7.4 version.)
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
---
|
||||
configure | 9 ++++++++-
|
||||
1 files changed, 8 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 3b7a1f3..7616fd3 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -941,7 +941,7 @@ while [ "$#" -gt 0 ]; do
|
||||
VAL=no
|
||||
;;
|
||||
#Qt style yes options
|
||||
- -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)
|
||||
+ -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)
|
||||
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
|
||||
VAL=yes
|
||||
;;
|
||||
@@ -1863,6 +1863,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.7.5.4
|
||||
|
||||
|
|
@ -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 \
|
||||
"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
From 677f5b4bec03972c8cada19d2e4530252c9ac4ef 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] configure: make pulseaudio a configurable option
|
||||
|
||||
Allows disabling pulseaudio support within phonon at configure time.
|
||||
(This is the Qt 4.8.0 version.)
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
---
|
||||
configure | 9 ++++++++-
|
||||
1 files changed, 8 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 5a5ef1d..e43b920 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1043,7 +1043,7 @@ while [ "$#" -gt 0 ]; do
|
||||
VAL=no
|
||||
;;
|
||||
#Qt style yes options
|
||||
- -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)
|
||||
+ -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)
|
||||
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
|
||||
VAL=yes
|
||||
;;
|
||||
@@ -2000,6 +2000,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.7.5.4
|
||||
|
||||
|
|
@ -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}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue