Date: Wed, 1 Jan 2020 00:01:42 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521666 - in head/multimedia/qt5-multimedia: . files Message-ID: <202001010001.00101g2M029407@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Wed Jan 1 00:01:42 2020 New Revision: 521666 URL: https://svnweb.freebsd.org/changeset/ports/521666 Log: Fix OPENAL knob in multimedia/qt5-multimedia The knob was already there, but didn't have any machinery attached. - Move USES=openal to the knob - Introduce a patch to actually make openal configurable (instead of only following autodetect, so you can still turn the knob off with OpenAL installed) - Tidy the port a little - Add OPENAL to default options. Previously, setting or unsetting OPENAL had no effect, and OpenAL was always a dependency and used. Now, it does have an effect. I've made it default so that the default options still match what the port previously did (that is, depend on OpenAL). Bump PORTREVISION because of that. (Based very loosely on a patch submitted by Piotr Smyrak) PR: 242595 Reported by: Piotr Smyrak Added: head/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json (contents, props changed) Modified: head/multimedia/qt5-multimedia/Makefile Modified: head/multimedia/qt5-multimedia/Makefile ============================================================================== --- head/multimedia/qt5-multimedia/Makefile Tue Dec 31 23:44:06 2019 (r521665) +++ head/multimedia/qt5-multimedia/Makefile Wed Jan 1 00:01:42 2020 (r521666) @@ -2,6 +2,7 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- @@ -10,7 +11,7 @@ COMMENT= Qt audio, video, radio and camera support mod # LICENSE set via USES_QT5 (bsd.qt.mk) -USES= compiler:c++11-lang gl gnome pkgconfig openal qmake:norecursive \ +USES= compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \ qt-dist:5,multimedia xorg USE_GL= gl USE_GNOME= glib20 @@ -29,24 +30,31 @@ QT_CONFIG= xlib QT_DEFINES= _QTMULTIMEDIA_DUMMY OPTIONS_DEFINE= GSTREAMER OPENAL -OPTIONS_DEFAULT= ALSA GSTREAMER +OPTIONS_DEFAULT= ALSA GSTREAMER OPENAL OPTIONS_RADIO= AUDIOPLUGIN OPTIONS_RADIO_AUDIOPLUGIN= ALSA PULSEAUDIO OPTIONS_SUB= yes AUDIOPLUGIN_DESC= Audio plugins to build + OPENAL_DESC= 3D positional spatialized sound support +OPENAL_USES= openal +OPENAL_VARS= QT_CONFIG+=openal +OPENAL_VARS_OFF= QT_CONFIG+=-openal \ + QMAKE_CONFIGURE_ARGS+=-no-openal ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib 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_USE= GSTREAMER1=bad 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 + PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= QT_CONFIG+=pulseaudio PULSEAUDIO_VARS_OFF= QT_CONFIG+=-pulseaudio \ 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 Wed Jan 1 00:01:42 2020 (r521666) @@ -0,0 +1,14 @@ +This adds a configure knob to Qt itself, which responds to the +FreeBSD Makefile knobs; otherwise, we can't turn off finding +OpenAL when it is installed. + +--- src/multimedia/configure.json.orig 2019-10-15 04:21:48 UTC ++++ src/multimedia/configure.json +@@ -12,6 +12,7 @@ + "directshow": { "type": "boolean" }, + "wmf": { "type": "boolean" }, + "gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] }, ++ "openal": "boolean", + "pulseaudio": "boolean" + } + },
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001010001.00101g2M029407>