Remove gstreamer configure test.
Nothing in qtbase uses gstreamer, so this is just a red herring. Change-Id: I93fb20a70928d84fed8f33ca4c5df38779928f1a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Robin Burchell
The Qt Project
parent
48b107ecfe
commit
e25a4faf4a
@ -1,55 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
|
||||||
** Contact: http://www.qt-project.org/legal
|
|
||||||
**
|
|
||||||
** This file is part of the config.tests of the Qt Toolkit.
|
|
||||||
**
|
|
||||||
** $QT_BEGIN_LICENSE:LGPL$
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and Digia. For licensing terms and
|
|
||||||
** conditions see http://qt.digia.com/licensing. For further information
|
|
||||||
** use the contact form at http://qt.digia.com/contact-us.
|
|
||||||
**
|
|
||||||
** GNU Lesser General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
||||||
** General Public License version 2.1 as published by the Free Software
|
|
||||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
||||||
** packaging of this file. Please review the following information to
|
|
||||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
||||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
||||||
**
|
|
||||||
** In addition, as a special exception, Digia gives you certain additional
|
|
||||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
||||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
||||||
**
|
|
||||||
** GNU General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU
|
|
||||||
** General Public License version 3.0 as published by the Free Software
|
|
||||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
|
||||||
** packaging of this file. Please review the following information to
|
|
||||||
** ensure the GNU General Public License version 3.0 requirements will be
|
|
||||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
|
||||||
**
|
|
||||||
**
|
|
||||||
** $QT_END_LICENSE$
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include <gst/gst.h>
|
|
||||||
#include <gst/interfaces/propertyprobe.h>
|
|
||||||
#include <gst/interfaces/xoverlay.h>
|
|
||||||
|
|
||||||
#if !defined(GST_VERSION_MAJOR) \
|
|
||||||
|| !defined(GST_VERSION_MINOR)
|
|
||||||
# error "No GST_VERSION_* macros"
|
|
||||||
#elif GST_VERION_MAJOR != 0 && GST_VERSION_MINOR != 10
|
|
||||||
# error "Incompatible version of GStreamer found (Version 0.10.x is required)."
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
SOURCES = gstreamer.cpp
|
|
||||||
CONFIG -= qt
|
|
||||||
LIBS += -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10
|
|
||||||
40
configure
vendored
40
configure
vendored
@ -938,7 +938,6 @@ CFG_CUPS=auto
|
|||||||
CFG_ICONV=auto
|
CFG_ICONV=auto
|
||||||
CFG_DBUS=auto
|
CFG_DBUS=auto
|
||||||
CFG_GLIB=auto
|
CFG_GLIB=auto
|
||||||
CFG_GSTREAMER=auto
|
|
||||||
CFG_QGTKSTYLE=auto
|
CFG_QGTKSTYLE=auto
|
||||||
CFG_LARGEFILE=auto
|
CFG_LARGEFILE=auto
|
||||||
CFG_OPENSSL=auto
|
CFG_OPENSSL=auto
|
||||||
@ -1044,10 +1043,6 @@ QT_LIBS_DBUS=
|
|||||||
QT_CFLAGS_GLIB=
|
QT_CFLAGS_GLIB=
|
||||||
QT_LIBS_GLIB=
|
QT_LIBS_GLIB=
|
||||||
|
|
||||||
# flags for GStreamer (X11 only)
|
|
||||||
QT_CFLAGS_GSTREAMER=
|
|
||||||
QT_LIBS_GSTREAMER=
|
|
||||||
|
|
||||||
# default qpa platform
|
# default qpa platform
|
||||||
QT_QPA_DEFAULT_PLATFORM=
|
QT_QPA_DEFAULT_PLATFORM=
|
||||||
|
|
||||||
@ -2036,13 +2031,6 @@ while [ "$#" -gt 0 ]; do
|
|||||||
UNKNOWN_OPT=yes
|
UNKNOWN_OPT=yes
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
gstreamer)
|
|
||||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
|
||||||
CFG_GSTREAMER="$VAL"
|
|
||||||
else
|
|
||||||
UNKNOWN_OPT=yes
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
gtkstyle)
|
gtkstyle)
|
||||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||||
CFG_QGTKSTYLE="$VAL"
|
CFG_QGTKSTYLE="$VAL"
|
||||||
@ -5032,31 +5020,6 @@ elif [ "$CFG_GLIB" = "no" ]; then
|
|||||||
CFG_QGTKSTYLE=no
|
CFG_QGTKSTYLE=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ### Vestige
|
|
||||||
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`
|
|
||||||
QT_LIBS_GSTREAMER=`$PKG_CONFIG --libs gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
|
|
||||||
fi
|
|
||||||
if compileTest unix/gstreamer "GStreamer" $QT_CFLAGS_GSTREAMER $QT_LIBS_GSTREAMER; then
|
|
||||||
CFG_GSTREAMER=yes
|
|
||||||
QMakeVar set QT_CFLAGS_GSTREAMER "$QT_CFLAGS_GSTREAMER"
|
|
||||||
QMakeVar set QT_LIBS_GSTREAMER "$QT_LIBS_GSTREAMER"
|
|
||||||
else
|
|
||||||
if [ "$CFG_GSTREAMER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
|
|
||||||
echo "Gstreamer support cannot be enabled due to functionality tests!"
|
|
||||||
echo " Turn on verbose messaging (-v) to $0 to see the final report."
|
|
||||||
echo " If you believe this message is in error you may use the continue"
|
|
||||||
echo " switch (-continue) to $0 to continue."
|
|
||||||
exit 101
|
|
||||||
else
|
|
||||||
CFG_GSTREAMER=no
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
elif [ "$CFG_GLIB" = "no" ]; then
|
|
||||||
CFG_GSTREAMER=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
# auto-detect libicu support
|
# auto-detect libicu support
|
||||||
if [ "$CFG_ICU" != "no" ]; then
|
if [ "$CFG_ICU" != "no" ]; then
|
||||||
if compileTest unix/icu "ICU"; then
|
if compileTest unix/icu "ICU"; then
|
||||||
@ -6089,7 +6052,6 @@ fi
|
|||||||
[ "$CFG_ICONV" = "sun" ] && QT_CONFIG="$QT_CONFIG sun-libiconv"
|
[ "$CFG_ICONV" = "sun" ] && QT_CONFIG="$QT_CONFIG sun-libiconv"
|
||||||
[ "$CFG_ICONV" = "gnu" ] && QT_CONFIG="$QT_CONFIG gnu-libiconv"
|
[ "$CFG_ICONV" = "gnu" ] && QT_CONFIG="$QT_CONFIG gnu-libiconv"
|
||||||
[ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib"
|
[ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib"
|
||||||
[ "$CFG_GSTREAMER" = "yes" ] && QT_CONFIG="$QT_CONFIG gstreamer"
|
|
||||||
[ "$CFG_DBUS" = "yes" ] && QT_CONFIG="$QT_CONFIG dbus"
|
[ "$CFG_DBUS" = "yes" ] && QT_CONFIG="$QT_CONFIG dbus"
|
||||||
[ "$CFG_DBUS" = "linked" ] && QT_CONFIG="$QT_CONFIG dbus dbus-linked"
|
[ "$CFG_DBUS" = "linked" ] && QT_CONFIG="$QT_CONFIG dbus dbus-linked"
|
||||||
[ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl"
|
[ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl"
|
||||||
@ -6478,7 +6440,6 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
|
|||||||
[ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
|
[ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
|
||||||
[ "$CFG_ICONV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV"
|
[ "$CFG_ICONV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV"
|
||||||
[ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB"
|
[ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB"
|
||||||
[ "$CFG_GSTREAMER" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GSTREAMER"
|
|
||||||
[ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK"
|
[ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK"
|
||||||
[ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC"
|
[ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC"
|
||||||
[ "$CFG_MREMAP" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP"
|
[ "$CFG_MREMAP" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP"
|
||||||
@ -6915,7 +6876,6 @@ report_support_plugin " GIF .................." "$CFG_GIF" qt QtGui
|
|||||||
report_support_plugin " JPEG ................." "$CFG_JPEG" "$CFG_LIBJPEG" QtGui
|
report_support_plugin " JPEG ................." "$CFG_JPEG" "$CFG_LIBJPEG" QtGui
|
||||||
report_support_plugin " PNG .................." "$CFG_PNG" "$CFG_LIBPNG" QtGui
|
report_support_plugin " PNG .................." "$CFG_PNG" "$CFG_LIBPNG" QtGui
|
||||||
report_support " Glib ..................." "$CFG_GLIB"
|
report_support " Glib ..................." "$CFG_GLIB"
|
||||||
report_support " GStreamer .............." "$CFG_GSTREAMER"
|
|
||||||
report_support " GTK theme .............." "$CFG_QGTKSTYLE"
|
report_support " GTK theme .............." "$CFG_QGTKSTYLE"
|
||||||
report_support " Large File ............." "$CFG_LARGEFILE"
|
report_support " Large File ............." "$CFG_LARGEFILE"
|
||||||
report_support " libudev ................" "$CFG_LIBUDEV"
|
report_support " libudev ................" "$CFG_LIBUDEV"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user