mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-05 06:05:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure/qt: Fix build without Qt5X11Extras

Browse source
This commit is contained in:
Edward Hervey 2015-07-10 14:01:43 +02:00 committed by Edward Hervey
parent a6507de48e
commit 7cb734b1cd
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -2615,7 +2615,8 @@ AG_GST_CHECK_FEATURE(QT, [Qt elements], qt, [
else
HAVE_QT="yes"
PKG_CHECK_MODULES(QT_X11, Qt5X11Extras, [
QT_CFLAGS="$QT_CFLAGS $QT_X11_CFLAGS"
AC_DEFINE([HAVE_QT_X11], [], [Define if Qt X11 integration is installed])
QT_CFLAGS="$QT_CFLAGS $QT_X11_CFLAGS"
QT_LIBS="$QT_LIBS $QT_X11_LIBS"
AC_SUBST([QT_CFLAGS])
AC_SUBST([QT_LIBS])

6
ext/qt/qtitem.cc
View file

@ -31,7 +31,7 @@
#include "qtitem.h"
#include "gstqsgtexture.h"
#if GST_GL_HAVE_WINDOW_X11
#if GST_GL_HAVE_WINDOW_X11 && defined (HAVE_QT_X11)
#include <QX11Info>
#include <gst/gl/x11/gstgldisplay_x11.h>
#include <gst/gl/x11/gstglcontext_glx.h>
@ -111,7 +111,7 @@ QtGLVideoItem::QtGLVideoItem()
g_mutex_init (&this->priv->lock);
#if GST_GL_HAVE_WINDOW_X11
#if GST_GL_HAVE_WINDOW_X11 && defined (HAVE_QT_X11)
if (QString::fromUtf8 ("xcb") == app->platformName())
this->priv->display = (GstGLDisplay *)
gst_gl_display_x11_new_with_display (QX11Info::display ());
@ -259,7 +259,7 @@ QtGLVideoItem::onSceneGraphInitialized ()
return;
}
#if GST_GL_HAVE_WINDOW_X11
#if GST_GL_HAVE_WINDOW_X11 && defined (HAVE_QT_X11)
if (GST_IS_GL_DISPLAY_X11 (this->priv->display)) {
platform = GST_GL_PLATFORM_GLX;
gl_api = gst_gl_context_get_current_gl_api (NULL, NULL);