Date: Fri, 12 Jan 2018 22:53:03 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458882 - head/multimedia/qt5-multimedia Message-ID: <201801122253.w0CMr3Re086983@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Fri Jan 12 22:53:03 2018 New Revision: 458882 URL: https://svnweb.freebsd.org/changeset/ports/458882 Log: Start setting QT_DEFINES again. The machinery in bsd.qt.mk's qt-post-install target does not seem to account for the case of a module no longer defining QT_DEFINES: the lines in qconfig-modules.h including said module's qconfig-<module>.h will remain. We did that to qt5-multimedia in r458338, and it results in build errors if qt5-multimedia had been previously installed. Set QT_DEFINES again to a dummy value until we figure out a proper solution. PR: 225100 Modified: head/multimedia/qt5-multimedia/Makefile Modified: head/multimedia/qt5-multimedia/Makefile ============================================================================== --- head/multimedia/qt5-multimedia/Makefile Fri Jan 12 21:59:51 2018 (r458881) +++ head/multimedia/qt5-multimedia/Makefile Fri Jan 12 22:53:03 2018 (r458882) @@ -2,7 +2,7 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- @@ -21,6 +21,13 @@ USE_XORG= x11 xext xv USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_CONFIG= xlib + +# TODO: Bug 225100: the machinery in bsd.qt.mk's qt-post-install target does +# not seem to account for the case of a module no longer defining QT_DEFINES: +# the lines in qconfig-modules.h including said module's qconfig-<module>.h +# will remain. We're setting it below to avoid build errors, but this needs to +# be fixed properly later. +QT_DEFINES= _QTMULTIMEDIA_DUMMY OPTIONS_DEFINE= GSTREAMER OPENAL OPTIONS_DEFAULT= ALSA GSTREAMER
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801122253.w0CMr3Re086983>