Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1702989397279720"
MIME-Version: 1.0
Date: Tue, 19 Dec 2023 12:36:37 +0000
From: "Dr. Thomas Orgis" <thor@netbsd.org>
Subject: CVS commit: pkgsrc/x11/qt5-qtmultimedia
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: thor@netbsd.org
Message-Id: <20231219123637.81E81FA42@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1702989397279720
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	thor
Date:		Tue Dec 19 12:36:37 UTC 2023

Modified Files:
	pkgsrc/x11/qt5-qtmultimedia: Makefile distinfo options.mk
Added Files:
	pkgsrc/x11/qt5-qtmultimedia/patches:
	    patch-src_multimedia_configure.json

Log Message:
x11/qt5-qtmultimedia: fix backend choices (esp. deactivate openal)

This enables and disables audio backends explicitly via QMAKE_ARGS and
includes a patch from FreeBSD that adds the missing knob vor openal.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/x11/qt5-qtmultimedia/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/qt5-qtmultimedia/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/qt5-qtmultimedia/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtmultimedia/patches/patch-src_multimedia_configure.json

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1702989397279720
Content-Disposition: inline
Content-Length: 4367
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/qt5-qtmultimedia/Makefile
diff -u pkgsrc/x11/qt5-qtmultimedia/Makefile:1.96 pkgsrc/x11/qt5-qtmultimedia/Makefile:1.97
--- pkgsrc/x11/qt5-qtmultimedia/Makefile:1.96	Sun Nov 12 13:24:25 2023
+++ pkgsrc/x11/qt5-qtmultimedia/Makefile	Tue Dec 19 12:36:37 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2023/11/12 13:24:25 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2023/12/19 12:36:37 thor Exp $
 
 DISTNAME=	qtmultimedia-everywhere-opensource-src-${QTVERSION}
 PKGNAME=	qt5-qtmultimedia-${QTVERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	Qt5 module for multimedia
 
 BUILD_TARGET=		sub-src
@@ -21,6 +21,7 @@ post-install:
 	${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
 .endfor
 
+QMAKE_ARGS+=	--
 .include "options.mk"
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/qt5-qtmultimedia/distinfo
diff -u pkgsrc/x11/qt5-qtmultimedia/distinfo:1.32 pkgsrc/x11/qt5-qtmultimedia/distinfo:1.33
--- pkgsrc/x11/qt5-qtmultimedia/distinfo:1.32	Sat Oct  7 20:00:34 2023
+++ pkgsrc/x11/qt5-qtmultimedia/distinfo	Tue Dec 19 12:36:37 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.32 2023/10/07 20:00:34 adam Exp $
+$NetBSD: distinfo,v 1.33 2023/12/19 12:36:37 thor Exp $
 
 BLAKE2s (qtmultimedia-everywhere-opensource-src-5.15.11.tar.xz) = ba6b7edeebdec20e0fcf39f422f569c1fca6b76d74332b8f72df8c5232c6f58c
 SHA512 (qtmultimedia-everywhere-opensource-src-5.15.11.tar.xz) = 1d72f79fe83cc955037ec6c5348058369697889a9a40b9fbaee9f3ad0cb74fe5f97062e026254e3512f0861e67cca8a36eaa19c1b3ffbea32d6b3cde2163b484
 Size (qtmultimedia-everywhere-opensource-src-5.15.11.tar.xz) = 3849160 bytes
+SHA1 (patch-src_multimedia_configure.json) = d53c1bf2712e9a32b383beff0025c4ab0b5b6232

Index: pkgsrc/x11/qt5-qtmultimedia/options.mk
diff -u pkgsrc/x11/qt5-qtmultimedia/options.mk:1.8 pkgsrc/x11/qt5-qtmultimedia/options.mk:1.9
--- pkgsrc/x11/qt5-qtmultimedia/options.mk:1.8	Fri Jul 16 13:33:02 2021
+++ pkgsrc/x11/qt5-qtmultimedia/options.mk	Tue Dec 19 12:36:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2021/07/16 13:33:02 nia Exp $
+# $NetBSD: options.mk,v 1.9 2023/12/19 12:36:37 thor Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.qt5-qtmultimedia
 PKG_SUPPORTED_OPTIONS=		alsa gstreamer openal pulseaudio
@@ -18,38 +18,38 @@ PLIST.openal=	yes
 PLIST_VARS+=	alsa
 .if !empty(PKG_OPTIONS:Malsa)
 PLIST.alsa=	yes
-MAKE_ENV+=	QT_CONFIG+=alsa
+QMAKE_ARGS+=	-alsa
 .include "../../audio/alsa-lib/buildlink3.mk"
 .else
-MAKE_ENV+=	QT_CONFIG+=-alsa
+QMAKE_ARGS+=	-no-alsa
 .endif
 
 PLIST_VARS+=	gst
 .if !empty(PKG_OPTIONS:Mgstreamer)
 PLIST.gst=	yes
-MAKE_ENV+=	QT_CONFIG+=gstreamer-1.0
+QMAKE_ARGS+=	-gstreamer 1.0
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .else
-MAKE_ENV+=	QT_CONFIG+=-gstreamer-1.0
+QMAKE_ARGS+=	-no-gstreamer
 .endif
 
 PLIST_VARS+=	openal
 .if !empty(PKG_OPTIONS:Mopenal)
 PLIST.openal=	yes
-MAKE_ENV+=	QT_CONFIG+=openal
+QMAKE_ARGS+=	-openal
 .include "../../audio/openal-soft/buildlink3.mk"
 .else
-MAKE_ENV+=	QT_CONFIG+=-openal
+QMAKE_ARGS+=	-no-openal
 .endif
 
 PLIST_VARS+=	pulse
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 PLIST.pulse=	yes
 MAKE_ENV+=	LFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib/pulseaudio
-MAKE_ENV+=	QT_CONFIG+=pulseaudio
+QMAKE_ARGS+=	-pulseaudio
 .include "../../audio/pulseaudio/buildlink3.mk"
 .else
-MAKE_ENV+=	QT_CONFIG+=-pulseaudio
+QMAKE_ARGS+=	-no-pulseaudio
 .endif
 
 PLIST_VARS+=		audioengine

Added files:

Index: pkgsrc/x11/qt5-qtmultimedia/patches/patch-src_multimedia_configure.json
diff -u /dev/null pkgsrc/x11/qt5-qtmultimedia/patches/patch-src_multimedia_configure.json:1.1
--- /dev/null	Tue Dec 19 12:36:37 2023
+++ pkgsrc/x11/qt5-qtmultimedia/patches/patch-src_multimedia_configure.json	Tue Dec 19 12:36:37 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_multimedia_configure.json,v 1.1 2023/12/19 12:36:37 thor Exp $
+
+Add configure knob for openal. Taken from FreeBSD ports.
+Did they push that oversight upstream?
+
+--- src/multimedia/configure.json.orig	2020-10-27 08:02:12.000000000 +0000
++++ src/multimedia/configure.json
+@@ -13,6 +13,7 @@
+             "directshow": { "type": "boolean" },
+             "wmf": { "type": "boolean" },
+             "gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] },
++            "openal": "boolean",
+             "pulseaudio": "boolean"
+         }
+     },


--_----------=_1702989397279720--