diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index f8b900e65c0f..f6ae01be8222 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -1,60 +1,60 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt audio, video, radio and camera support module # LICENSE set via USES_QT5 (bsd.qt.mk) USES= compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \ qt-dist:5,multimedia xorg USE_GL= gl USE_GNOME= glib20 USE_QT= core declarative gui network opengl widgets \ buildtools_build USE_XORG= x11 xext xv 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-.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 OPENAL OPTIONS_GROUP= AUDIOPLUGIN OPTIONS_GROUP_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 \ QMAKE_CONFIGURE_ARGS+=-no-pulseaudio .include diff --git a/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json b/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json index 0c63a1c6db40..4b1919152e05 100644 --- a/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json +++ b/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json @@ -1,14 +1,25 @@ 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.orig 2020-10-27 08:02:12 UTC +++ src/multimedia/configure.json -@@ -12,6 +12,7 @@ +@@ -13,6 +13,7 @@ "directshow": { "type": "boolean" }, "wmf": { "type": "boolean" }, "gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] }, + "openal": "boolean", "pulseaudio": "boolean" } }, +@@ -101,9 +102,9 @@ + "gstreamer_gl_1_0": { + "label": "GStreamer OpenGL 1.0", + "export": "gstreamer_gl", + "test": { +- "include": "gst/gl/gl.h" ++ "include": "gst/gl/gl.h-BogusNotFound" + }, + "use": "gstreamer_1_0", + "sources": [ + { "type": "pkgConfig", "args": "gstreamer-gl-1.0" }