mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 16:08:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

qmlgl: qmake: fix building for android

Browse source
This commit is contained in:
George Kiagiadakis 2019-01-19 15:07:44 +01:00
parent 00f14f34b5
commit d75284cd83
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/qt/gstqtglutility.cc
View file

@ -35,7 +35,7 @@
#include <gst/gl/wayland/gstgldisplay_wayland.h> #include <gst/gl/wayland/gstgldisplay_wayland.h>
#endif #endif
#if GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_EGLFS) #if GST_GL_HAVE_PLATFORM_EGL && (defined (HAVE_QT_EGLFS) || defined (HAVE_QT_ANDROID))
#if GST_GL_HAVE_WINDOW_VIV_FB #if GST_GL_HAVE_WINDOW_VIV_FB
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
#include <gst/gl/viv-fb/gstgldisplay_viv_fb.h> #include <gst/gl/viv-fb/gstgldisplay_viv_fb.h>
@ -189,6 +189,8 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
platform = GST_GL_PLATFORM_EAGL; platform = GST_GL_PLATFORM_EAGL;
#elif GST_GL_HAVE_WINDOW_WIN32 && GST_GL_HAVE_PLATFORM_WGL && defined (HAVE_QT_WIN32) #elif GST_GL_HAVE_WINDOW_WIN32 && GST_GL_HAVE_PLATFORM_WGL && defined (HAVE_QT_WIN32)
platform = GST_GL_PLATFORM_WGL; platform = GST_GL_PLATFORM_WGL;
#elif GST_GL_HAVE_WINDOW_ANDROID && GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_ANDROID)
platform = GST_GL_PLATFORM_EGL;
#else #else
GST_ERROR ("Unknown platform"); GST_ERROR ("Unknown platform");
return FALSE; return FALSE;

14
ext/qt/qtplugin.pro
View file

@ -5,15 +5,20 @@ TARGET = gstqmlgl
QT += qml quick widgets gui QT += qml quick widgets gui
QT_CONFIG -= no-pkg-config QT_CONFIG -= no-pkg-config
CONFIG += link_pkgconfig debug plugin CONFIG += link_pkgconfig debug
PKGCONFIG = \ PKGCONFIG = \
gstreamer-1.0 \ gstreamer-1.0 \
gstreamer-video-1.0 \ gstreamer-video-1.0 \
gstreamer-gl-1.0 gstreamer-gl-1.0
DEFINES += \ android {
GST_USE_UNSTABLE_API \ CONFIG += static
HAVE_QT_WIN32 } else {
CONFIG += plugin
}
android:DEFINES += HAVE_QT_ANDROID
win32:DEFINES += HAVE_QT_WIN32
SOURCES += \ SOURCES += \
gstplugin.cc \ gstplugin.cc \
@ -37,4 +42,3 @@ INCLUDEPATH += \
$$(GSTREAMER_ROOT)/include \ $$(GSTREAMER_ROOT)/include \
$$[QT_INSTALL_PREFIX]/include/QtGui/$$[QT_VERSION]/QtGui/ $$[QT_INSTALL_PREFIX]/include/QtGui/$$[QT_VERSION]/QtGui/