From owner-svn-ports-all@freebsd.org Thu Oct 12 22:52:53 2017 Return-Path: Delivered-To: svn-ports-all@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 902ADE371DC; Thu, 12 Oct 2017 22:52:53 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 6ACF56B525; Thu, 12 Oct 2017 22:52:53 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9CMqqLa042095; Thu, 12 Oct 2017 22:52:52 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9CMqq3w042094; Thu, 12 Oct 2017 22:52:52 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201710122252.v9CMqq3w042094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Thu, 12 Oct 2017 22:52:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451938 - head/multimedia/qt5-multimedia X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: head/multimedia/qt5-multimedia X-SVN-Commit-Revision: 451938 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Oct 2017 22:52:53 -0000 Author: jrm Date: Thu Oct 12 22:52:52 2017 New Revision: 451938 URL: https://svnweb.freebsd.org/changeset/ports/451938 Log: multimedia/qt5-multimedia: Use option helpers and turn on ALSA option by default. This is the first update required to fix audio is some dependencies like comms/wsjtx. See also PR 208570. Reported by: adrian Approved by: tcberner, rakuco Differential Revision: https://reviews.freebsd.org/D12480 Modified: head/multimedia/qt5-multimedia/Makefile Modified: head/multimedia/qt5-multimedia/Makefile ============================================================================== --- head/multimedia/qt5-multimedia/Makefile Thu Oct 12 22:39:11 2017 (r451937) +++ head/multimedia/qt5-multimedia/Makefile Thu Oct 12 22:52:52 2017 (r451938) @@ -2,75 +2,55 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt audio, video, radio and camera support module -USE_GL= yes +# LICENSE set via USES_QT5 (bsd.qt.mk) + +USES= pkgconfig qmake +USE_GL= gl +USE_GNOME= glib20 USE_QT5= core gui network opengl qml quick widgets \ buildtools_build QT_DIST= ${PORTNAME} USE_XORG= x11 xext xv -USES= pkgconfig qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_DEFINES= XVIDEO QT_CONFIG= xlib -OPTIONS_DEFINE= AUDIOPLUGIN GSTREAMER OPENAL -OPTIONS_DEFAULT= GSTREAMER -OPTIONS_RADIO= AUDIOPLUGIN -OPTIONS_RADIO_AUDIOPLUGIN= ALSA PULSEAUDIO +OPTIONS_DEFINE= GSTREAMER OPENAL +OPTIONS_DEFAULT= ALSA GSTREAMER +OPTIONS_MULTI= AUDIOPLUGIN +OPTIONS_MULTI_AUDIOPLUGIN= ALSA PULSEAUDIO OPTIONS_SUB= yes -AUDIOPLUGIN_DESC= Audio plugins to build +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 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 OPENAL_USES= openal +OPENAL_VARS_OFF= TBR_DEPENDS+=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 -.include - -.if ${PORT_OPTIONS:MALSA} -QT_DEFINES+= ALSA -QT_CONFIG+= alsa -.else -TBR_DEPENDS+= alsa -QT_DEFINES+= -ALSA -QT_CONFIG+= -alsa -.endif - -.if ${PORT_OPTIONS:MGSTREAMER} -QT_DEFINES+= GSTREAMER -QT_CONFIG+= gstreamer-1.0 -.else -TBR_DEPENDS+= gstreamer -QT_DEFINES+= -GSTREAMER -QT_CONFIG+= -gstreamer-1.0 -.endif - -.if ! ${PORT_OPTIONS:MOPENAL} -TBR_DEPENDS+= openal -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -QT_DEFINES+= PULSEAUDIO -QT_CONFIG+= pulseaudio -.else -TBR_DEPENDS+= pulseaudio -QT_DEFINES+= -PULSEAUDIO -QT_CONFIG+= -pulseaudio -.endif - post-patch: .for d in ${TBR_DEPENDS} - @${REINPLACE_CMD} -e '/${d}/ d' \ - ${WRKSRC}/qtmultimedia.pro + @${REINPLACE_CMD} -e '/${d}/ d' ${WRKSRC}/qtmultimedia.pro .endfor .include