Sun Mar 22 07:31:42 2020 UTC ()
qt5-qtmultimedia: Give up and -alsa on non-Linux to avoid alloca problems


(nia)
diff -r1.62 -r1.63 pkgsrc/x11/qt5-qtmultimedia/Makefile
diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtmultimedia/options.mk
cvs diff -r1.62 -r1.63 pkgsrc/x11/qt5-qtmultimedia/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtmultimedia/Makefile 2020/03/17 15:42:06 1.62
+++ pkgsrc/x11/qt5-qtmultimedia/Makefile 2020/03/22 07:31:42 1.63
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.62 2020/03/17 15:42:06 nia Exp $ 1# $NetBSD: Makefile,v 1.63 2020/03/22 07:31:42 nia Exp $
2 2
3DISTNAME= qtmultimedia-everywhere-src-${QTVERSION} 3DISTNAME= qtmultimedia-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtmultimedia-${QTVERSION} 4PKGNAME= qt5-qtmultimedia-${QTVERSION}
5PKGREVISION= 3 5PKGREVISION= 4
6COMMENT= Qt5 module for multimedia 6COMMENT= Qt5 module for multimedia
7 7
8BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
9MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
11INSTALLATION_DIRS+= lib/pkgconfig 11INSTALLATION_DIRS+= lib/pkgconfig
12 12
13.include "../../x11/qt5-qtbase/Makefile.common" 13.include "../../x11/qt5-qtbase/Makefile.common"
14 14
15# Needs gnu+11 for alloca. 15# Needs gnu+11 for alloca.
16BUILDLINK_TRANSFORM+= rm:-std=c++1z 16BUILDLINK_TRANSFORM+= rm:-std=c++1z
17 17
18post-install: 18post-install:
cvs diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtmultimedia/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtmultimedia/options.mk 2020/03/05 12:32:40 1.1
+++ pkgsrc/x11/qt5-qtmultimedia/options.mk 2020/03/22 07:31:42 1.2
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: options.mk,v 1.1 2020/03/05 12:32:40 nia Exp $ 1# $NetBSD: options.mk,v 1.2 2020/03/22 07:31:42 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qt5-qtmultimedia 3PKG_OPTIONS_VAR= PKG_OPTIONS.qt5-qtmultimedia
4PKG_SUPPORTED_OPTIONS= alsa gstreamer openal pulseaudio 4PKG_SUPPORTED_OPTIONS= alsa gstreamer openal pulseaudio
 5PKG_SUGGESTED_OPTIONS.Linux= alsa
5 6
6.include "../../mk/bsd.fast.prefs.mk" 7.include "../../mk/bsd.fast.prefs.mk"
7 8
8.if ${OPSYS} != "Darwin" 9.if ${OPSYS} != "Darwin"
9PKG_SUGGESTED_OPTIONS= alsa gstreamer openal pulseaudio 10PKG_SUGGESTED_OPTIONS+= gstreamer openal pulseaudio
10.endif 11.endif
11 12
12.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
13 14
14PLIST_VARS+= alsa 15PLIST_VARS+= alsa
15.if !empty(PKG_OPTIONS:Malsa) 16.if !empty(PKG_OPTIONS:Malsa)
16PLIST.alsa= yes 17PLIST.alsa= yes
17MAKE_ENV+= QT_CONFIG+=alsa 18MAKE_ENV+= QT_CONFIG+=alsa
18.include "../../audio/alsa-lib/buildlink3.mk" 19.include "../../audio/alsa-lib/buildlink3.mk"
19.else 20.else
20MAKE_ENV+= QT_CONFIG+=-alsa 21MAKE_ENV+= QT_CONFIG+=-alsa
21.endif 22.endif
22 23