diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2012-03-28 21:46:55 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-26 10:05:05 +0100 |
commit | 54a6f8498eb3031437fd6f889787b4a2c7ce4924 (patch) | |
tree | 853a265a0c2bbd45214924a5ec3522db6215691e /meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch | |
parent | 343c85f77daa54760b456d247a71246d48a21e16 (diff) | |
download | poky-54a6f8498eb3031437fd6f889787b4a2c7ce4924.tar.gz |
qt4: move from 4.8.0 to 4.8.1
* No changes other than source checksums and PR at recipe level.
* DEFAULT_PREFERENCE still set to -1
(From OE-Core rev: 6a21cf0068234152b3f13866dc7c05adc6d0d9c9)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch new file mode 100644 index 0000000000..0992efaddc --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 677f5b4bec03972c8cada19d2e4530252c9ac4ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Tue, 28 Feb 2012 15:10:24 +0000 | ||
4 | Subject: [PATCH] configure: make pulseaudio a configurable option | ||
5 | |||
6 | Allows disabling pulseaudio support within phonon at configure time. | ||
7 | (This is the Qt 4.8.0 version.) | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
12 | --- | ||
13 | configure | 9 ++++++++- | ||
14 | 1 files changed, 8 insertions(+), 1 deletions(-) | ||
15 | |||
16 | diff --git a/configure b/configure | ||
17 | index 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 | -- | ||
44 | 1.7.5.4 | ||
45 | |||