diff options
| author | wiz <wiz@pkgsrc.org> | 2022-09-27 20:57:54 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2022-09-27 20:57:54 +0000 |
| commit | 88a1ef4bc9aec3d803fb2af42e7a06a367a1ebb2 (patch) | |
| tree | 1ed69fb12f7d82854294c7bc346bf37bba8740eb /multimedia | |
| parent | c996d593787814560c3c687fdaebcbf500ac1adc (diff) | |
| download | pkgsrc-88a1ef4bc9aec3d803fb2af42e7a06a367a1ebb2.tar.gz | |
ffmpeg4: switch to x264
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 | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile index 53441fbc3b1..67ee886f782 100644 --- a/multimedia/ffmpeg4/Makefile +++ b/multimedia/ffmpeg4/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.68 2022/09/11 12:52:01 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2022/09/27 20:57:54 wiz Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/} -PKGREVISION= 4 +PKGREVISION= 5 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://ffmpeg.org/ COMMENT= Decoding, encoding and streaming software (v4.x) diff --git a/multimedia/ffmpeg4/buildlink3.mk b/multimedia/ffmpeg4/buildlink3.mk index 445643d3f93..73862e76a6b 100644 --- a/multimedia/ffmpeg4/buildlink3.mk +++ b/multimedia/ffmpeg4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2022/06/28 11:34:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2022/09/27 20:57:54 wiz Exp $ BUILDLINK_TREE+= ffmpeg4 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ffmpeg4 FFMPEG4_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ffmpeg4+= ffmpeg4>=4.0 -BUILDLINK_ABI_DEPENDS.ffmpeg4+= ffmpeg4>=4.4.2nb1 +BUILDLINK_ABI_DEPENDS.ffmpeg4+= ffmpeg4>=4.4.2nb5 BUILDLINK_PKGSRCDIR.ffmpeg4?= ../../multimedia/ffmpeg4 pkgbase := ffmpeg4 @@ -35,7 +35,7 @@ pkgbase := ffmpeg4 .endif .if ${PKG_BUILD_OPTIONS.ffmpeg4:Mx264} -. include "../../multimedia/x264-devel/buildlink3.mk" +. include "../../multimedia/x264/buildlink3.mk" .endif .if ${PKG_BUILD_OPTIONS.ffmpeg4:Mlibvpx} diff --git a/multimedia/ffmpeg4/options.mk b/multimedia/ffmpeg4/options.mk index f1b54f718ac..2cb74f919af 100644 --- a/multimedia/ffmpeg4/options.mk +++ b/multimedia/ffmpeg4/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.17 2021/05/17 12:19:07 nia Exp $ +# $NetBSD: options.mk,v 1.18 2022/09/27 20:57:54 wiz Exp $ # Global and legacy options @@ -173,7 +173,7 @@ CONFIGURE_ARGS+= --enable-libvorbis # LAME MP3 encoder .if !empty(PKG_OPTIONS:Mlame) # "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding. -BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1 +BUILDLINK_API_DEPENDS.lame+= lame>=3.98.2nb1 CONFIGURE_ARGS+= --enable-libmp3lame .include "../../audio/lame/buildlink3.mk" .endif @@ -212,10 +212,8 @@ CONFIGURE_ARGS+= --enable-libxvid # x264 support .if !empty(PKG_OPTIONS:Mx264) -# ABI change between 20090326 and 20100201 -BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207 CONFIGURE_ARGS+= --enable-libx264 -.include "../../multimedia/x264-devel/buildlink3.mk" +.include "../../multimedia/x264/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-libx264 .endif |