CVS commit: pkgsrc/multimedia/ffmpeg4

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Sep 27 20:57:54 UTC 2022

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

Log Message:
ffmpeg4: switch to x264

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/multimedia/ffmpeg4/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/ffmpeg4/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 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.68 pkgsrc/multimedia/ffmpeg4/Makefile:1.69
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.68     Sun Sep 11 12:52:01 2022
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Tue Sep 27 20:57:54 2022
@@ -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@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v4.x)

Index: pkgsrc/multimedia/ffmpeg4/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpeg4/buildlink3.mk:1.8 pkgsrc/multimedia/ffmpeg4/buildlink3.mk:1.9
--- pkgsrc/multimedia/ffmpeg4/buildlink3.mk:1.8 Tue Jun 28 11:34:54 2022
+++ pkgsrc/multimedia/ffmpeg4/buildlink3.mk     Tue Sep 27 20:57:54 2022
@@ -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}

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.17 pkgsrc/multimedia/ffmpeg4/options.mk:1.18
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.17   Mon May 17 12:19:07 2021
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Tue Sep 27 20:57:54 2022
@@ -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