CVS commit: pkgsrc/multimedia

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Apr 29 14:17:48 UTC 2020

Modified Files:
        pkgsrc/multimedia/ffmpeg3: options.mk
        pkgsrc/multimedia/ffmpeg4: options.mk

Log Message:
ffmpeg*: Add jack option.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/multimedia/ffmpeg3/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/multimedia/ffmpeg4/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/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.18 pkgsrc/multimedia/ffmpeg3/options.mk:1.19
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.18   Thu Apr 23 10:35:40 2020
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Wed Apr 29 14:17:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2020/04/23 10:35:40 nia Exp $
+# $NetBSD: options.mk,v 1.19 2020/04/29 14:17:48 nia Exp $
 
 # Global and legacy options
 
@@ -7,7 +7,7 @@ PKG_OPTIONS_VAR=        PKG_OPTIONS.ffmpeg3
 PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
 PKG_OPTIONS_GROUP.ssl=         gnutls openssl
 
-PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype \
+PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype jack \
                        lame libvpx opencore-amr opus pulseaudio rpi \
                        rtmp tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig gnutls libvpx \
@@ -110,6 +110,14 @@ CONFIGURE_ARGS+=   --enable-openssl
 CONFIGURE_ARGS+=       --disable-openssl
 .endif
 
+# jack option
+.if !empty(PKG_OPTIONS:Mjack)
+CONFIGURE_ARGS+=       --enable-jack
+.include "../../audio/jack/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-jack
+.endif
+
 # pulseaudio option
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 CONFIGURE_ARGS+=       --enable-libpulse

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.13 pkgsrc/multimedia/ffmpeg4/options.mk:1.14
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.13   Thu Apr 23 10:35:40 2020
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Wed Apr 29 14:17:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2020/04/23 10:35:40 nia Exp $
+# $NetBSD: options.mk,v 1.14 2020/04/29 14:17:48 nia Exp $
 
 # Global and legacy options
 
@@ -6,7 +6,7 @@ PKG_OPTIONS_OPTIONAL_GROUPS=    ssl
 PKG_OPTIONS_GROUP.ssl=         gnutls mbedtls openssl
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg4
-PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype \
+PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype jack \
                        lame libvpx opencore-amr opus pulseaudio rpi \
                        rtmp tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS= lame ass av1 bluray freetype fontconfig gnutls \
@@ -126,6 +126,14 @@ CONFIGURE_ARGS+=   --enable-openssl
 CONFIGURE_ARGS+=       --disable-openssl
 .endif
 
+# jack option
+.if !empty(PKG_OPTIONS:Mjack)
+CONFIGURE_ARGS+=       --enable-libjack
+.include "../../audio/jack/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-libjack
+.endif
+
 # pulseaudio option
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 CONFIGURE_ARGS+=       --enable-libpulse