CVS commit: pkgsrc/multimedia/ffmpeg3

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Sep 30 07:21:46 UTC 2022

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

Log Message:
ffmpeg3: switch to x264 stable, bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/ffmpeg3/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/multimedia/ffmpeg3/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/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.81 pkgsrc/multimedia/ffmpeg3/Makefile:1.82
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.81     Sun Sep 11 12:52:01 2022
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Fri Sep 30 07:21:46 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2022/09/11 12:52:01 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2022/09/30 07:21:46 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
-PKGREVISION=   3
+PKGREVISION=   4
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v3.x)

Index: pkgsrc/multimedia/ffmpeg3/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpeg3/buildlink3.mk:1.12 pkgsrc/multimedia/ffmpeg3/buildlink3.mk:1.13
--- pkgsrc/multimedia/ffmpeg3/buildlink3.mk:1.12        Tue Jun 28 11:34:54 2022
+++ pkgsrc/multimedia/ffmpeg3/buildlink3.mk     Fri Sep 30 07:21:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2022/06/28 11:34:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2022/09/30 07:21:46 adam Exp $
 
 BUILDLINK_TREE+=       ffmpeg3
 
@@ -14,35 +14,35 @@ pkgbase := ffmpeg3
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mfreetype)
+.if ${PKG_BUILD_OPTIONS.ffmpeg3:Mfreetype}
 .  include "../../graphics/freetype2/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mfontconfig)
+.if ${PKG_BUILD_OPTIONS.ffmpeg3:Mfontconfig}
 .  include "../../fonts/fontconfig/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mtheora)
+.if ${PKG_BUILD_OPTIONS.ffmpeg3:Mtheora}
 .  include "../../multimedia/libtheora/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mxvid)
+.if ${PKG_BUILD_OPTIONS.ffmpeg3:Mxvid}
 .  include "../../multimedia/xvidcore/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mx264)
-.  include "../../multimedia/x264-devel/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.ffmpeg3:Mx264}
+.  include "../../multimedia/x264/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mlibvpx)
+.if ${PKG_BUILD_OPTIONS.ffmpeg3:Mlibvpx}
 .  include "../../multimedia/libvpx/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mvaapi)
+.if ${PKG_BUILD_OPTIONS.ffmpeg3:Mvaapi}
 .  include "../../multimedia/libva/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mvdpau)
+.if ${PKG_BUILD_OPTIONS.ffmpeg3:Mvdpau}
 .  include "../../multimedia/libvdpau/buildlink3.mk"
 .endif
 

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.20 pkgsrc/multimedia/ffmpeg3/options.mk:1.21
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.20   Wed Apr 29 15:11:10 2020
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Fri Sep 30 07:21:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2020/04/29 15:11:10 nia Exp $
+# $NetBSD: options.mk,v 1.21 2022/09/30 07:21:46 adam Exp $
 
 # Global and legacy options
 
@@ -190,10 +190,9 @@ 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
+BUILDLINK_API_DEPENDS.x264+=   x264>=20220601
 CONFIGURE_ARGS+=       --enable-libx264
-.include "../../multimedia/x264-devel/buildlink3.mk"
+.include "../../multimedia/x264/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-libx264
 .endif