svn commit: r398140 - in head: Mk multimedia/qt5-multimedia

[Koop Mast]

Author: kwm
Date: Mon Sep 28 20:20:53 2015
New Revision: 398140
URL: https://svnweb.freebsd.org/changeset/ports/398140

Log:
  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>

Modified:
  head/Mk/bsd.qt.mk
  head/multimedia/qt5-multimedia/Makefile

Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk	Mon Sep 28 20:17:32 2015	(r398139)
+++ head/Mk/bsd.qt.mk	Mon Sep 28 20:20:53 2015	(r398140)
@@ -635,7 +635,7 @@ qt-post-install:
 	@${MKDIR} ${STAGEDIR}${QT_INCDIR}/QtCore/modules
 	@${ECHO_CMD} -n \
 		> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
-.  for def in ${QT_DEFINES:N-*:O:u}
+.  for def in ${QT_DEFINES:N-*:O:u:C/=.*$//}
 	@${ECHO_CMD} "#if !defined(QT_${def}) && !defined(QT_NO_${def})" \
 		>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
 	${ECHO_CMD} "# define QT_${def}" \

Modified: head/multimedia/qt5-multimedia/Makefile
==============================================================================
--- head/multimedia/qt5-multimedia/Makefile	Mon Sep 28 20:17:32 2015	(r398139)
+++ head/multimedia/qt5-multimedia/Makefile	Mon Sep 28 20:20:53 2015	(r398140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	multimedia
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	qt5-