Date: Sun, 7 Jan 2018 14:34:38 +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: r458338 - in head/multimedia/qt5-multimedia: . files Message-ID: <201801071434.w07EYceh094980@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sun Jan 7 14:34:38 2018 New Revision: 458338 URL: https://svnweb.freebsd.org/changeset/ports/458338 Log: Rework OPTIONs handling in Qt 5.9.3. qtmultimedia now uses a configure.json file to describe configuration options and checks that qmake should perform. On the one hand it means extrapatch-no-gstreamer no longer applies (and neither does the TBR_DEPENDS hack in the Makefile), on the other the configuration process has been streamlined: we only need to pass the right options via QMAKE_CONFIGURE_ARGS to enable and disable options. While here, stop setting QT_DEFINES altogether in the Makefile, as none of them are really necessary at all: - XVIDEO is a Qt4 thing; - ALSA, OPENAL and PULSEAUDIO are handled by qmake's configure.json infrastructure, which sets a QT_NO_<OPTION> macro in qtmultimedia-config.h when they are not enabled. - There is no QT_{NO_}GSTREAMER upstream, so we're basically defining some macros that no code is going to use. Reviewed by: tcberner (earler version without the QT_DEFINES changes) Added: head/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json (contents, props changed) Deleted: head/multimedia/qt5-multimedia/files/extrapatch-no-gstreamer Modified: head/multimedia/qt5-multimedia/Makefile Modified: head/multimedia/qt5-multimedia/Makefile ============================================================================== --- head/multimedia/qt5-multimedia/Makefile Sun Jan 7 14:30:45 2018 (r458337) +++ head/multimedia/qt5-multimedia/Makefile Sun Jan 7 14:34:38 2018 (r458338) @@ -2,6 +2,7 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- @@ -19,7 +20,6 @@ QT_DIST= ${PORTNAME} USE_XORG= x11 xext xv USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -QT_DEFINES= XVIDEO QT_CONFIG= xlib OPTIONS_DEFINE= GSTREAMER OPENAL @@ -32,24 +32,20 @@ AUDIOPLUGIN_DESC= Audio plugins to build OPENAL_DESC= 3D positional spatialized sound support ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_VARS= QT_CONFIG+=alsa QT DEFINES+=ALSA -ALSA_VARS_OFF= QT_CONFIG+=-alsa QT_DEFINES+=-ALSA TBR_DEPENDS+=alsa +ALSA_VARS= QT_CONFIG+=alsa +ALSA_VARS_OFF= QT_CONFIG+=-alsa \ + QMAKE_CONFIGURE_ARGS+=-no-alsa GSTREAMER_BUILD_DEPENDS=${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat -GSTREAMER_EXTRA_PATCHES_OFF= ${FILESDIR}/extrapatch-no-gstreamer GSTREAMER_USE= GSTREAMER1=bad -GSTREAMER_VARS= QT_CONFIG+=gstreamer-1.0 QT_DEFINES+=GSTREAMER -GSTREAMER_VARS_OFF= QT_CONFIG+=-gstreamer-1.0 QT_DEFINES+=-GSTREAMER \ - TBR_DEPENDS+=gstreamer +GSTREAMER_VARS= QT_CONFIG+=gstreamer-1.0 \ + QMAKE_CONFIGURE_ARGS+=-gstreamer 1.0 +GSTREAMER_VARS_OFF= QT_CONFIG+=-gstreamer-1.0 \ + QMAKE_CONFIGURE_ARGS+=-no-gstreamer OPENAL_USES= openal -OPENAL_VARS_OFF= TBR_DEPENDS+=openal +OPENAL_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-openal PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_VARS= QT_CONFIG+=pulseaudio QT_DEFINES+=PULSEAUDIO -PULSEAUDIO_VARS_OFF= QT_CONFIG+=-pulseaudio QT_DEFINES+=-PULSEAUDIO \ - TBR_DEPENDS+=pulseaudio - -post-patch: -.for d in ${TBR_DEPENDS} - @${REINPLACE_CMD} -e '/${d}/ d' ${WRKSRC}/qtmultimedia.pro -.endfor +PULSEAUDIO_VARS= QT_CONFIG+=pulseaudio +PULSEAUDIO_VARS_OFF= QT_CONFIG+=-pulseaudio \ + QMAKE_CONFIGURE_ARGS+=-no-pulseaudio .include <bsd.port.mk> Added: head/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json Sun Jan 7 14:34:38 2018 (r458338) @@ -0,0 +1,11 @@ +Make it possible to disable OpenAL support via a command-line option. +--- src/multimedia/configure.json ++++ src/multimedia/configure.json +@@ -9,6 +9,7 @@ + "options": { + "alsa": "boolean", + "gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] }, ++ "openal": "boolean", + "pulseaudio": "boolean", + "mediaplayer-backend": { "type": "string", "values": [ "directshow", "wmf" ] }, + "wmf-backend": { "type": "void", "name": "mediaplayer-backend", "value": "wmf" }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801071434.w07EYceh094980>