ffmpeg4: switch to x264 Bump PKGREVISION.diff -r1.68 -r1.69 pkgsrc/multimedia/ffmpeg4/Makefile
(wiz)
@@ -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)
@@ -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 @@
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 @@
.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}
@@ -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 @@
# 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 @@
# 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