mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

qt: fix build with qmake

Browse source 
Move the package defines for GST_PLUGIN_DEFINE from the
command line into the source file to avoid quoting issues
(-DPACKAGE_NAME="foo" means the quotes won't actually make
it to the compiler and then it no longer gets a string constant).
This commit is contained in:
Tim-Philipp Müller 2017-09-07 09:39:13 +01:00
parent 039fc65468
commit fcf8b6bb90
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/qt/gstplugin.cc
View file

@ -44,6 +44,14 @@ plugin_init (GstPlugin * plugin)
return TRUE; return TRUE;
} }
#ifndef GST_PACKAGE_NAME
#define GST_PACKAGE_NAME "GStreamer Bad Plug-ins (qmake)"
#define GST_PACKAGE_ORIGIN "Unknown package origin"
#define GST_LICENSE "LGPL"
#define PACKAGE "gst-plugins-bad (qmake)"
#define PACKAGE_VERSION "1.13.0.1"
#endif
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
qmlgl, qmlgl,

9
ext/qt/qtplugin.pro
View file

@ -13,12 +13,7 @@ PKGCONFIG = \
DEFINES += \ DEFINES += \
GST_USE_UNSTABLE_API \ GST_USE_UNSTABLE_API \
HAVE_QT_WIN32 \ HAVE_QT_WIN32
'GST_PACKAGE_NAME=\"GStreamer Bad Plug-ins (qmake)\"' \
'GST_PACKAGE_ORIGIN=\"Unknown package origin\"' \
'GST_LICENSE=\"LGPL\"' \
'PACKAGE=\"gst-plugins-bad (qmake)\"' \
'PACKAGE_VERSION=\"1.9.0.1\"'
SOURCES += \ SOURCES += \
gstplugin.cc \ gstplugin.cc \
@ -36,4 +31,4 @@ INCLUDEPATH += \
$$(GSTREAMER_ROOT)/include \ $$(GSTREAMER_ROOT)/include \
$$[QT_INSTALL_PREFIX]/include/QtGui/$$[QT_VERSION]/QtGui/ $$[QT_INSTALL_PREFIX]/include/QtGui/$$[QT_VERSION]/QtGui/