diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2012-03-28 21:46:55 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-24 11:35:50 +0100 |
commit | 6a21cf0068234152b3f13866dc7c05adc6d0d9c9 (patch) | |
tree | 03f1cd976bdef536062ff0bab925b7227975a2ba /meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch | |
parent | 971361a4fac5622858f71a87c478e16ef02c4d76 (diff) | |
download | openembedded-core-6a21cf0068234152b3f13866dc7c05adc6d0d9c9.tar.gz openembedded-core-6a21cf0068234152b3f13866dc7c05adc6d0d9c9.tar.bz2 openembedded-core-6a21cf0068234152b3f13866dc7c05adc6d0d9c9.tar.xz openembedded-core-6a21cf0068234152b3f13866dc7c05adc6d0d9c9.zip |
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
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.0/pulseaudio-config.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch | 45 |
1 files changed, 0 insertions, 45 deletions
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 deleted file mode 100644 index 0992efadd..000000000 --- a/meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 - |