CVS commit: pkgsrc/multimedia/qt6-qtmultimedia

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May  8 14:02:38 UTC 2025

Modified Files:
        pkgsrc/multimedia/qt6-qtmultimedia: PLIST options.mk

Log Message:
qt6-qtmultimedia: Support non-vaapi ffmpeg.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/multimedia/qt6-qtmultimedia/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/qt6-qtmultimedia/options.mk

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

Modified files:

Index: pkgsrc/multimedia/qt6-qtmultimedia/PLIST
diff -u pkgsrc/multimedia/qt6-qtmultimedia/PLIST:1.21 pkgsrc/multimedia/qt6-qtmultimedia/PLIST:1.22
--- pkgsrc/multimedia/qt6-qtmultimedia/PLIST:1.21       Wed Apr 16 21:13:13 2025
+++ pkgsrc/multimedia/qt6-qtmultimedia/PLIST    Thu May  8 14:02:38 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2025/04/16 21:13:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.22 2025/05/08 14:02:38 jperkin Exp $
 lib/pkgconfig/Qt6Multimedia.pc
 lib/pkgconfig/Qt6MultimediaWidgets.pc
 lib/pkgconfig/Qt6SpatialAudio.pc
@@ -22,7 +22,7 @@ ${PLIST.ffmpeg}qt6/include/QtFFmpegMedia
 ${PLIST.ffmpeg}qt6/include/QtFFmpegMediaPluginImpl/${PKGVERSION}/QtFFmpegMediaPluginImpl/private/qffmpegencodinginitializer_p.h
 ${PLIST.ffmpeg}qt6/include/QtFFmpegMediaPluginImpl/${PKGVERSION}/QtFFmpegMediaPluginImpl/private/qffmpegframe_p.h
 ${PLIST.ffmpeg}qt6/include/QtFFmpegMediaPluginImpl/${PKGVERSION}/QtFFmpegMediaPluginImpl/private/qffmpeghwaccel_p.h
-${PLIST.ffmpeg}${PLIST.x11}qt6/include/QtFFmpegMediaPluginImpl/${PKGVERSION}/QtFFmpegMediaPluginImpl/private/qffmpeghwaccel_vaapi_p.h
+${PLIST.ffmpeg}${PLIST.x11}${PLIST.vaapi}qt6/include/QtFFmpegMediaPluginImpl/${PKGVERSION}/QtFFmpegMediaPluginImpl/private/qffmpeghwaccel_vaapi_p.h
 ${PLIST.ffmpeg}qt6/include/QtFFmpegMediaPluginImpl/${PKGVERSION}/QtFFmpegMediaPluginImpl/private/qffmpegimagecapture_p.h
 ${PLIST.ffmpeg}qt6/include/QtFFmpegMediaPluginImpl/${PKGVERSION}/QtFFmpegMediaPluginImpl/private/qffmpegioutils_p.h
 ${PLIST.ffmpeg}qt6/include/QtFFmpegMediaPluginImpl/${PKGVERSION}/QtFFmpegMediaPluginImpl/private/qffmpegmediacapturesession_p.h

Index: pkgsrc/multimedia/qt6-qtmultimedia/options.mk
diff -u pkgsrc/multimedia/qt6-qtmultimedia/options.mk:1.6 pkgsrc/multimedia/qt6-qtmultimedia/options.mk:1.7
--- pkgsrc/multimedia/qt6-qtmultimedia/options.mk:1.6   Mon Mar 31 16:38:07 2025
+++ pkgsrc/multimedia/qt6-qtmultimedia/options.mk       Thu May  8 14:02:38 2025
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.6 2025/03/31 16:38:07 adam Exp $
+# $NetBSD: options.mk,v 1.7 2025/05/08 14:02:38 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qt6-qtmultimedia
 PKG_SUPPORTED_OPTIONS= gstreamer pulseaudio
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-PLIST_VARS+=           ffmpeg gstreamer pulseaudio x11
+PLIST_VARS+=           ffmpeg gstreamer pulseaudio vaapi x11
 
 .if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=        gstreamer pulseaudio
@@ -36,6 +36,9 @@ CONFIGURE_ARGS+=      -no-pulseaudio
 .if !empty(PKG_OPTIONS:Mpulseaudio) || ${OPSYS} == "Darwin"
 .include "../../multimedia/ffmpeg7/buildlink3.mk"
 PLIST.ffmpeg=          yes
+.  if ${PKG_BUILD_OPTIONS.ffmpeg7:Mvaapi}
+PLIST.vaapi=           yes
+.  endif
 .  if ${OPSYS} != "Darwin"
 PLIST.x11=                     yes
 .  endif