From 66992ebdf7d80c6fee817f786a8e0f13b80cd048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Thu, 8 Jan 2015 14:28:48 +0100 Subject: Respect the pulseaudio configuration from Qt. It was previously ignored for Desktop Linux. Change-Id: I214171d222a5e7e0ee64afde225a742adbda4adf Task-number: QTBUG-43387 Reviewed-by: Andras Becsi --- src/core/config/desktop_linux.pri | 1 + 1 file changed, 1 insertion(+) (limited to 'src/core') diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 7f28cb36b..57fb39f6e 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -14,3 +14,4 @@ GYP_CONFIG += \ use_kerberos=0 \ use_pango=0 \ +!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 -- cgit v1.2.3 From 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Fri, 30 Jan 2015 13:10:15 +0100 Subject: eLinux: build ffmpegsumo as well. This will only contain free codecs. Change-Id: I021b2c121bf146abb24b7a90dd1c3580638b1058 Reviewed-by: Andras Becsi --- src/core/config/embedded_linux.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 4000625c6..773bf0be1 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -1,7 +1,7 @@ GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi" GYP_CONFIG += \ - build_ffmpegsumo=0 \ + build_ffmpegsumo=1 \ configuration_policy=0 \ desktop_linux=0 \ disable_nacl=1 \ -- cgit v1.2.3