diff options
| author | maya <maya@pkgsrc.org> | 2018-09-30 19:00:31 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2018-09-30 19:00:31 +0000 |
| commit | 1bdc17443ceee2cb698ae974fe69d713b6a6661f (patch) | |
| tree | 87eac6631a4ff4632023c42221f38cf15fd33047 /multimedia | |
| parent | 6d94c38e117f626a24d30ad7787dd51afbfc18b7 (diff) | |
| download | pkgsrc-1bdc17443ceee2cb698ae974fe69d713b6a6661f.tar.gz | |
ffmpeg4: add default enabled AV1 option. bump PKGREVISION
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg4/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg4/buildlink3.mk | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg4/options.mk | 20 |
3 files changed, 21 insertions, 9 deletions
diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile index e1eddf4b75b..0acb08d578b 100644 --- a/multimedia/ffmpeg4/Makefile +++ b/multimedia/ffmpeg4/Makefile @@ -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 HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software (v4.x) diff --git a/multimedia/ffmpeg4/buildlink3.mk b/multimedia/ffmpeg4/buildlink3.mk index ba772ef5e26..2e2d15ff1a9 100644 --- a/multimedia/ffmpeg4/buildlink3.mk +++ b/multimedia/ffmpeg4/buildlink3.mk @@ -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 diff --git a/multimedia/ffmpeg4/options.mk b/multimedia/ffmpeg4/options.mk index 8cc8f73aa52..52f2565c231 100644 --- a/multimedia/ffmpeg4/options.mk +++ b/multimedia/ffmpeg4/options.mk @@ -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 |