CVS commit: pkgsrc/multimedia/ffmpeg4

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Sep 30 19:00:31 UTC 2018

Modified Files:
        pkgsrc/multimedia/ffmpeg4: Makefile buildlink3.mk options.mk

Log Message:
ffmpeg4: add default enabled AV1 option. bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg4/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg4/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 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/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.5 pkgsrc/multimedia/ffmpeg4/Makefile:1.6
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.5      Wed Aug 22 09:45:48 2018
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Sun Sep 30 19:00:31 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2018/08/22 09:45:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/09/30 19:00:31 maya Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
-PKGREVISION=   1
+PKGREVISION=   2
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
 COMMENT=       Decoding, encoding and streaming software (v4.x)

Index: pkgsrc/multimedia/ffmpeg4/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpeg4/buildlink3.mk:1.1 pkgsrc/multimedia/ffmpeg4/buildlink3.mk:1.2
--- pkgsrc/multimedia/ffmpeg4/buildlink3.mk:1.1 Thu Apr 26 07:56:57 2018
+++ pkgsrc/multimedia/ffmpeg4/buildlink3.mk     Sun Sep 30 19:00:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/04/26 07:56:57 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/09/30 19:00:31 maya Exp $
 
 BUILDLINK_TREE+=       ffmpeg4
 
@@ -14,6 +14,10 @@ pkgbase := ffmpeg4
 
 .include "../../mk/bsd.fast.prefs.mk"
 
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mav1)
+.  include "../../multimedia/libaom/buildlink3.mk"
+.endif
+
 .if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mfreetype)
 .  include "../../graphics/freetype2/buildlink3.mk"
 .endif

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.4 pkgsrc/multimedia/ffmpeg4/options.mk:1.5
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.4    Sat Sep 29 14:25:39 2018
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Sun Sep 30 19:00:31 2018
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.4 2018/09/29 14:25:39 tnn Exp $
+# $NetBSD: options.mk,v 1.5 2018/09/30 19:00:31 maya Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg4
-PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype gnutls \
-                       lame libvpx opencore-amr openssl opus rpi rtmp \
-                       tesseract theora vorbis x11 x264 x265 xcb xvid
-PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \
-                       theora vorbis x11 x264 xvid
+PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype \
+                       gnutls lame libvpx opencore-amr openssl opus rpi \
+                       rtmp tesseract theora vorbis x11 x264 x265 xcb xvid
+PKG_SUGGESTED_OPTIONS= lame ass av1 bluray freetype fontconfig libvpx \
+                       openssl theora vorbis x11 x264 xvid
 
 PLIST_VARS+=           doc
 
@@ -51,6 +51,14 @@ CONFIGURE_ARGS+=     --enable-libass
 CONFIGURE_ARGS+=       --disable-libass
 .endif
 
+# ass option
+.if !empty(PKG_OPTIONS:Mav1)
+CONFIGURE_ARGS+=       --enable-libaom
+.include "../../multimedia/libaom/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-libaom
+.endif
+
 # doc option
 .if !empty(PKG_OPTIONS:Mdoc)
 PLIST.doc=             yes