[kde-freebsd] [SVN Commit] area51/QT/Mk

[Raphael Kubo da Costa]

SVN commit 11810 by rakuco:

QT: Merge r398140 from ports.

------------------------------------------------------------------------
r398140 | kwm | 2015-09-28 22:20:53 +0200 (Mon, 28 Sep 2015) | 26 lines

Fix qt5-multimedia with GStreamer 1.6.0.

Qt 5 does the following during the build of qt5-multimedia:

--- qt-post-install ---
echo "# define QT_GSTREAMER"  >> /wrkdirs/usr/ports/multimedia/qt5-multimedia/
  work/stage/usr/local/include/qt5/QtCore/modules/qconfig-multimedia.h
echo "# define QT_GST_VERSION=1.0"  >> /wrkdirs/usr/ports/multimedia/
  qt5-multimedia/work/stage/usr/local/include/qt5/QtCore/modules/qconfig-multimedia.h
echo "# define QT_XVIDEO"  >> /wrkdirs/usr/ports/multimedia/qt5-multimedia/
  work/stage/usr/local/include/qt5/QtCore/modules/qconfig-multimedia.h

That's (second line) not how #define works in C of C++

The resulting qconfig-multimedia.h file contains this:

#if !defined(QT_GST_VERSION=1.0) && !defined(QT_NO_GST_VERSION=1.0)
# define QT_GST_VERSION=1.0
#endif

This patch filters out the "=1.0" from the define. Bump qt5-multimedia
since the installed header needs to be corrected.

Reported by:		antoine@
Patch submitted by:	Adriaan de Groot <groot at kde.org>

------------------------------------------------------------------------



 M  +1 -1      bsd.qt.mk