From owner-svn-ports-head@freebsd.org Mon Sep 28 20:20:54 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AA594A0B00D; Mon, 28 Sep 2015 20:20:54 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 815A21600; Mon, 28 Sep 2015 20:20:54 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8SKKs05066281; Mon, 28 Sep 2015 20:20:54 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8SKKsHl066279; Mon, 28 Sep 2015 20:20:54 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201509282020.t8SKKsHl066279@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Mon, 28 Sep 2015 20:20:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398140 - in head: Mk multimedia/qt5-multimedia X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2015 20:20:54 -0000 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 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-