summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-19 09:28:31 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-19 09:28:31 (GMT)
commit0ffa43465d856b2647f31528be7399686bc9e940 (patch)
treec9d28c2d8fd271170170d089c76866662596a233 /configure
parent4676dd62871da2b58452ebda477a04c25158bec4 (diff)
parentec4591334476d4fe7663c6e6fe1659138ea233fe (diff)
downloadQt-0ffa43465d856b2647f31528be7399686bc9e940.zip
Qt-0ffa43465d856b2647f31528be7399686bc9e940.tar.gz
Qt-0ffa43465d856b2647f31528be7399686bc9e940.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure57
1 files changed, 38 insertions, 19 deletions
diff --git a/configure b/configure
index 0bfa880..63d8f2d 100755
--- a/configure
+++ b/configure
@@ -682,7 +682,8 @@ CFG_RELEASE_QMAKE=no
CFG_PHONON=auto
CFG_PHONON_BACKEND=yes
CFG_MULTIMEDIA=auto
-CFG_MEDIASERVICE=auto
+CFG_MEDIASERVICES=auto
+CFG_MEDIA_BACKEND=auto
CFG_AUDIO_BACKEND=auto
CFG_SVG=auto
CFG_DECLARATIVE=auto
@@ -937,7 +938,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|-mediaservice|-audio-backend|-svg|-declarative|-webkit|-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|-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|-mediaservices|-media-backend|-audio-backend|-svg|-declarative|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
@@ -2164,9 +2165,16 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- mediaservice)
+ mediaservices)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_MEDIASERVICE="$VAL"
+ CFG_MEDIASERVICES="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
+ media-backend)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_MEDIA_BACKEND="$VAL"
else
UNKNOWN_OPT=yes
fi
@@ -3401,8 +3409,9 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
[-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2]
[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa]
[-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns]
- [-no-multimedia] [-multimedia] [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
- [-no-mediaservice] [-mediaservice] [-no-audio-backend] [-audio-backend]
+ [-no-multimedia] [-multimedia] [-no-mediaservices] [-mediaservices]
+ [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
+ [-no-media-backend] [-media-backend] [-no-audio-backend] [-audio-backend]
[-no-openssl] [-openssl] [-openssl-linked]
[-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-no-javascript-jit] [-javascript-jit]
[-no-script] [-script] [-no-scripttools] [-scripttools] [-no-declarative] [-declarative]
@@ -3543,12 +3552,15 @@ fi
-no-multimedia ..... Do not build the QtMultimedia module.
+ -multimedia ........ Build the QtMultimedia module.
- -no-mediaservice.... Do not build platform mediaservice plugin.
- + -mediaservice ...... Build the platform mediaservice plugin.
-
-no-audio-backend .. Do not build the platform audio backend into QtMultimedia.
+ -audio-backend ..... Build the platform audio backend into QtMultimedia if available.
+ -no-mediaservices... Do not build the QtMediaServices module.
+ + -mediaservices...... Build the QtMediaServices module.
+
+ -no-media-backend... Do not build platform mediaservices plugin.
+ + -media-backend..... Build the platform mediaservices plugin.
+
-no-phonon ......... Do not build the Phonon module.
+ -phonon ............ Build the Phonon module.
Phonon is built if a decent C++ compiler is used.
@@ -5171,20 +5183,20 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
fi
if [ "$CFG_GUI" = "no" ]; then
- if [ "$CFG_MEDIASERVICE" = "auto" ]; then
- CFG_MEDIASERVICE=no
+ if [ "$CFG_MEDIA_BACKEND" = "auto" ]; then
+ CFG_MEDIA_BACKEND=no
fi
- if [ "$CFG_MEDIASERVICE" != "no" ]; then
- echo "Mediaservice enabled, but GUI disabled."
- echo " You might need to either enable the GUI or disable Mediaservice"
+ if [ "$CFG_MEDIA_BACKEND" != "no" ]; then
+ echo "Medias backend enabled, but GUI disabled."
+ echo " You might need to either enable the GUI or disable the media backend"
exit 1
fi
- elif [ "$CFG_MEDIASERVICE" = "auto" ]; then
- CFG_MEDIASERVICE=yes
+ elif [ "$CFG_MEDIA_BACKEND" = "auto" ]; then
+ CFG_MEDIA_BACKEND=yes
fi
# Auto-detect GStreamer support (needed for both Phonon & QtMultimedia)
- if [ "$CFG_PHONON" = "yes" -o "$CFG_MULTIMEDIA" = "yes" ]; then
+ if [ "$CFG_PHONON" != "no" -o "$CFG_MEDIASERVICES" != "no" ]; then
if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
if [ -n "$PKG_CONFIG" ]; then
QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
@@ -6876,8 +6888,14 @@ if [ "$CFG_MULTIMEDIA" = "no" ]; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA"
else
QT_CONFIG="$QT_CONFIG multimedia"
- if [ "$CFG_MEDIASERVICE" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG mediaservice"
+fi
+
+if [ "$CFG_MEDIASERVICES" = "no" ]; then
+ QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MEDIASERVICES"
+else
+ QT_CONFIG="$QT_CONFIG mediaservices"
+ if [ "$CFG_MEDIA_BACKEND" != "no" ]; then
+ QT_CONFIG="$QT_CONFIG media-backend"
fi
fi
@@ -7838,6 +7856,7 @@ echo "QtScriptTools module ... $CFG_SCRIPTTOOLS"
echo "QtXmlPatterns module ... $CFG_XMLPATTERNS"
echo "Phonon module .......... $CFG_PHONON"
echo "Multimedia module ...... $CFG_MULTIMEDIA"
+echo "Mediaservices module ... $CFG_MEDIASERVICES"
echo "SVG module ............. $CFG_SVG"
echo "WebKit module .......... $CFG_WEBKIT"
if [ "$CFG_WEBKIT" = "yes" ]; then