Sat Sep 30 08:04:40 2023 UTC ()
qt6-qtmultimedia: switch to ffmpeg6


(adam)
diff -r1.3 -r1.4 pkgsrc/multimedia/qt6-qtmultimedia/options.mk
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/qt6-qtmultimedia/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/qt6-qtmultimedia/options.mk 2023/04/09 06:13:52 1.3
+++ pkgsrc/multimedia/qt6-qtmultimedia/options.mk 2023/09/30 08:04:40 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2023/04/09 06:13:52 wiz Exp $ 1# $NetBSD: options.mk,v 1.4 2023/09/30 08:04:40 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qt6-qtmultimedia 3PKG_OPTIONS_VAR= PKG_OPTIONS.qt6-qtmultimedia
4PKG_SUPPORTED_OPTIONS= gstreamer pulseaudio 4PKG_SUPPORTED_OPTIONS= gstreamer pulseaudio
5 5
6.include "../../mk/bsd.fast.prefs.mk" 6.include "../../mk/bsd.fast.prefs.mk"
7 7
8PLIST_VARS+= ffmpeg gstreamer pulseaudio 8PLIST_VARS+= ffmpeg gstreamer pulseaudio
9 9
10.if ${OPSYS} != "Darwin" 10.if ${OPSYS} != "Darwin"
11PKG_SUGGESTED_OPTIONS+= gstreamer pulseaudio 11PKG_SUGGESTED_OPTIONS+= gstreamer pulseaudio
12.endif 12.endif
13 13
14.include "../../mk/bsd.options.mk" 14.include "../../mk/bsd.options.mk"
@@ -24,16 +24,16 @@ CONFIGURE_ARGS+= -no-gstreamer @@ -24,16 +24,16 @@ CONFIGURE_ARGS+= -no-gstreamer
24 24
25# the pulseaudio option must come after the gstreamer option 25# the pulseaudio option must come after the gstreamer option
26.if !empty(PKG_OPTIONS:Mpulseaudio) 26.if !empty(PKG_OPTIONS:Mpulseaudio)
27CONFIGURE_ARGS+= -pulseaudio 27CONFIGURE_ARGS+= -pulseaudio
28PLIST.pulseaudio= yes 28PLIST.pulseaudio= yes
29.include "../../audio/pulseaudio/buildlink3.mk" 29.include "../../audio/pulseaudio/buildlink3.mk"
30.else 30.else
31CONFIGURE_ARGS+= -no-pulseaudio 31CONFIGURE_ARGS+= -no-pulseaudio
32.endif 32.endif
33 33
34# For some reason ffmpeg support is conditional on pulseaudio OR apple 34# For some reason ffmpeg support is conditional on pulseaudio OR apple
35# in src/multimedia/configure.cmake 35# in src/multimedia/configure.cmake
36.if !empty(PKG_OPTIONS:Mpulseaudio) || ${OPSYS} == "Darwin" 36.if !empty(PKG_OPTIONS:Mpulseaudio) || ${OPSYS} == "Darwin"
37.include "../../multimedia/ffmpeg5/buildlink3.mk" 37.include "../../multimedia/ffmpeg6/buildlink3.mk"
38PLIST.ffmpeg= yes 38PLIST.ffmpeg= yes
39.endif 39.endif