1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer GStreamer 1.0 on Linux.

Browse Source 
As planned for 5.6, QtMultimedia now uses GStreamer 1.0 over
0.10 when available.
This means the binary packages will be based on GStreamer 1.0.

Task-number: QTBUG-47920
Change-Id: I9a18569ff96902116f0f6a759c185a5896f520d5
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Yoann Lopes 2015-08-25 17:28:13 +02:00
parent c726bc85da
commit e6a2ba7089
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -2690,7 +2690,7 @@ Additional options:
-no-gstreamer ....... Do not support GStreamer. -no-gstreamer ....... Do not support GStreamer.
+ -gstreamer <version> Enable GStreamer support + -gstreamer <version> Enable GStreamer support
With no parameter, this will attempt to auto-detect GStreamer 0.10 and With no parameter, this will attempt to auto-detect GStreamer 0.10 and
1.0. GStreamer 0.10 is used by default when available. 1.0. GStreamer 1.0 is used by default when available.
Use 0.10 or 1.0 for <version> to override auto-detection. Use 0.10 or 1.0 for <version> to override auto-detection.
* -no-system-proxies .. Do not use system network proxies by default. * -no-system-proxies .. Do not use system network proxies by default.
@ -6043,12 +6043,12 @@ fi
# detect GStreamer support # detect GStreamer support
if [ "$CFG_GSTREAMER" = "auto" ] || [ "$CFG_GSTREAMER" = "yes" ]; then if [ "$CFG_GSTREAMER" = "auto" ] || [ "$CFG_GSTREAMER" = "yes" ]; then
if compileTest unix/gstreamer "GStreamer 0.10" -config gst-0.10; then if compileTest unix/gstreamer "GStreamer 1.0" -config gst-1.0; then
CFG_GSTREAMER=yes
CFG_GSTREAMER_VERSION=0.10
elif compileTest unix/gstreamer "GStreamer 1.0" -config gst-1.0; then
CFG_GSTREAMER=yes CFG_GSTREAMER=yes
CFG_GSTREAMER_VERSION=1.0 CFG_GSTREAMER_VERSION=1.0
elif compileTest unix/gstreamer "GStreamer 0.10" -config gst-0.10; then
CFG_GSTREAMER=yes
CFG_GSTREAMER_VERSION=0.10
else else
if [ "$CFG_GSTREAMER" = "yes" ]; then if [ "$CFG_GSTREAMER" = "yes" ]; then
echo "GStreamer support cannot be enabled due to functionality tests!" echo "GStreamer support cannot be enabled due to functionality tests!"