CVS commit: pkgsrc/multimedia

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Thu, 23 Apr 2020 10:29:19 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 23 10:29:19 UTC 2020

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

Log Message:
ffmpeg*: Sync default options with ffmpeg4


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/multimedia/ffmpeg2/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/multimedia/ffmpeg2/options.mk
cvs rdiff -u -r1.48 -r1.49 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/multimedia/ffmpeg3/options.mk
cvs rdiff -u -r1.11 -r1.12 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/ffmpeg2/Makefile
diff -u pkgsrc/multimedia/ffmpeg2/Makefile:1.54 pkgsrc/multimedia/ffmpeg2/Makefile:1.55
--- pkgsrc/multimedia/ffmpeg2/Makefile:1.54     Tue Mar 10 22:10:38 2020
+++ pkgsrc/multimedia/ffmpeg2/Makefile  Thu Apr 23 10:29:19 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2020/03/10 22:10:38 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2020/04/23 10:29:19 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg2/}
-PKGREVISION=   13
+PKGREVISION=   14
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
 COMMENT=       Decoding, encoding and streaming software (v2.x)

Index: pkgsrc/multimedia/ffmpeg2/options.mk
diff -u pkgsrc/multimedia/ffmpeg2/options.mk:1.16 pkgsrc/multimedia/ffmpeg2/options.mk:1.17
--- pkgsrc/multimedia/ffmpeg2/options.mk:1.16   Tue Jun 18 14:41:09 2019
+++ pkgsrc/multimedia/ffmpeg2/options.mk        Thu Apr 23 10:29:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2019/06/18 14:41:09 nia Exp $
+# $NetBSD: options.mk,v 1.17 2020/04/23 10:29:19 nia Exp $
 
 # Global and legacy options
 
@@ -7,11 +7,11 @@ PKG_OPTIONS_VAR=      PKG_OPTIONS.ffmpeg2
 PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
 PKG_OPTIONS_GROUP.ssl=         gnutls openssl
 
-PKG_SUPPORTED_OPTIONS= ass doc faac fdk-aac fontconfig freetype lame \
-                       libvpx opencore-amr rtmp theora vorbis x11 x264 \
-                       x265 xvid
-PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx \
-                       theora vorbis x11 x264 xvid
+PKG_SUPPORTED_OPTIONS= ass bluray doc faac fdk-aac fontconfig freetype \
+                       lame libvpx opencore-amr opus pulseaudio rtmp \
+                       theora vorbis x11 x264 x265 xvid
+PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig gnutls libvpx \
+                       opus theora vorbis x11 x264 x265 xvid
 
 PKG_OPTIONS_LEGACY_OPTS+=      xcb:x11
 
@@ -123,6 +123,15 @@ CONFIGURE_ARGS+=   --enable-openssl
 CONFIGURE_ARGS+=       --disable-openssl
 .endif
 
+
+# pulseaudio option
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CONFIGURE_ARGS+=       --enable-libpulse
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-libpulse
+.endif
+
 # RTMP support via librtmp
 .if !empty(PKG_OPTIONS:Mrtmp)
 CONFIGURE_ARGS+=       --enable-librtmp
@@ -149,6 +158,12 @@ CONFIGURE_ARGS+=   --enable-libmp3lame
 .include "../../audio/lame/buildlink3.mk"
 .endif
 
+# OPUS support
+.if !empty(PKG_OPTIONS:Mopus)
+CONFIGURE_ARGS+=       --enable-libopus
+.include "../../audio/libopus/buildlink3.mk"
+.endif
+
 # XviD support
 .if !empty(PKG_OPTIONS:Mxvid)
 CONFIGURE_ARGS+=       --enable-libxvid
@@ -207,3 +222,11 @@ CONFIGURE_ARGS+=   --enable-libxcb-xfixes
 .else
 CONFIGURE_ARGS+=       --disable-libxcb
 .endif
+
+# Bluray support
+.if !empty(PKG_OPTIONS:Mbluray)
+CONFIGURE_ARGS+=       --enable-libbluray
+.include "../../multimedia/libbluray/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-libbluray
+.endif

Index: pkgsrc/multimedia/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.48 pkgsrc/multimedia/ffmpeg3/Makefile:1.49
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.48     Tue Mar 10 22:10:38 2020
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Thu Apr 23 10:29:19 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2020/03/10 22:10:38 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2020/04/23 10:29:19 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
-PKGREVISION=   3
+PKGREVISION=   4
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
 COMMENT=       Decoding, encoding and streaming software (v3.x)

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.16 pkgsrc/multimedia/ffmpeg3/options.mk:1.17
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.16   Tue Jun 18 14:41:09 2019
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Thu Apr 23 10:29:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2019/06/18 14:41:09 nia Exp $
+# $NetBSD: options.mk,v 1.17 2020/04/23 10:29:19 nia Exp $
 
 # Global and legacy options
 
@@ -8,10 +8,10 @@ PKG_OPTIONS_OPTIONAL_GROUPS=  ssl
 PKG_OPTIONS_GROUP.ssl=         gnutls openssl
 
 PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype \
-                       lame libvpx opencore-amr opus rpi rtmp \
-                       tesseract theora vorbis x11 x264 x265 xvid
-PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \
-                       theora vorbis x11 x264 xvid
+                       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 \
+                       opus theora vorbis x11 x264 x265 xvid
 
 PKG_OPTIONS_LEGACY_OPTS+=      xcb:x11
 
@@ -110,6 +110,14 @@ CONFIGURE_ARGS+=   --enable-openssl
 CONFIGURE_ARGS+=       --disable-openssl
 .endif
 
+# pulseaudio option
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CONFIGURE_ARGS+=       --enable-libpulse
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-libpulse
+.endif
+
 # RTMP support via librtmp
 .if !empty(PKG_OPTIONS:Mrtmp)
 CONFIGURE_ARGS+=       --enable-librtmp

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.11 pkgsrc/multimedia/ffmpeg4/options.mk:1.12
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.11   Sun Apr 19 18:25:07 2020
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Thu Apr 23 10:29:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2020/04/19 18:25:07 nia Exp $
+# $NetBSD: options.mk,v 1.12 2020/04/23 10:29:19 nia Exp $
 
 # Global and legacy options
 
@@ -7,7 +7,7 @@ PKG_OPTIONS_GROUP.ssl=          gnutls mbedtls o
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg4
 PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype \
-                       gnutls lame libvpx opencore-amr opus pulseaudio rpi \
+                       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 \
                        libvpx opus theora vorbis x11 x264 x265 xvid

Prev by Date: CVS commit: pkgsrc/devel/py-astroid
Next by Date: CVS commit: pkgsrc/databases/prometheus
Previous by Thread: CVS commit: pkgsrc/devel/py-astroid
Next by Thread: CVS commit: pkgsrc/databases/prometheus
Indexes:

Home | Main Index | Thread Index | Old Index