[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg2 ffmpeg2: switch to x264 stable; bum...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4347797ac933
branches:  trunk
changeset: 386018:4347797ac933
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Sep 30 07:38:28 2022 +0000

description:
ffmpeg2: switch to x264 stable; bump revision

diffstat:

 multimedia/ffmpeg2/Makefile        |   4 ++--
 multimedia/ffmpeg2/Makefile.common |   4 +---
 multimedia/ffmpeg2/buildlink3.mk   |  18 +++++++++---------
 multimedia/ffmpeg2/options.mk      |   7 +++----
 4 files changed, 15 insertions(+), 18 deletions(-)

diffs (109 lines):

diff -r 8caf062e7acf -r 4347797ac933 multimedia/ffmpeg2/Makefile
--- a/multimedia/ffmpeg2/Makefile       Fri Sep 30 07:31:00 2022 +0000
+++ b/multimedia/ffmpeg2/Makefile       Fri Sep 30 07:38:28 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2022/09/11 12:52:00 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2022/09/30 07:38:28 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg2/}
-PKGREVISION=   3
+PKGREVISION=   4
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v2.x)
diff -r 8caf062e7acf -r 4347797ac933 multimedia/ffmpeg2/Makefile.common
--- a/multimedia/ffmpeg2/Makefile.common        Fri Sep 30 07:31:00 2022 +0000
+++ b/multimedia/ffmpeg2/Makefile.common        Fri Sep 30 07:38:28 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.64 2022/05/24 09:50:45 nia Exp $
+# $NetBSD: Makefile.common,v 1.65 2022/09/30 07:38:28 adam Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
@@ -20,7 +20,6 @@
 CONFIGURE_ARGS+=       --disable-optimizations
 CONFIGURE_ARGS+=       --disable-stripping
 CONFIGURE_ARGS+=       --enable-gpl
-CONFIGURE_ARGS+=       --enable-libbluray
 CONFIGURE_ARGS+=       --enable-pthreads
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
@@ -87,7 +86,6 @@
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../multimedia/libbluray/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8caf062e7acf -r 4347797ac933 multimedia/ffmpeg2/buildlink3.mk
--- a/multimedia/ffmpeg2/buildlink3.mk  Fri Sep 30 07:31:00 2022 +0000
+++ b/multimedia/ffmpeg2/buildlink3.mk  Fri Sep 30 07:38:28 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2022/06/28 11:34:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2022/09/30 07:38:28 adam Exp $
 
 BUILDLINK_TREE+=       ffmpeg2
 
@@ -14,31 +14,31 @@
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mfreetype)
+.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mfreetype}
 .  include "../../graphics/freetype2/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mfontconfig)
+.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mfontconfig}
 .  include "../../fonts/fontconfig/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mtheora)
+.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mtheora}
 .  include "../../multimedia/libtheora/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mxvid)
+.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mxvid}
 .  include "../../multimedia/xvidcore/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mx264)
-.  include "../../multimedia/x264-devel/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mx264}
+.  include "../../multimedia/x264/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mfaac)
+.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mfaac}
 .  include "../../audio/faac/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mlibvpx)
+.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mlibvpx}
 .  include "../../multimedia/libvpx/buildlink3.mk"
 .endif
 
diff -r 8caf062e7acf -r 4347797ac933 multimedia/ffmpeg2/options.mk
--- a/multimedia/ffmpeg2/options.mk     Fri Sep 30 07:31:00 2022 +0000
+++ b/multimedia/ffmpeg2/options.mk     Fri Sep 30 07:38:28 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2020/08/11 12:13:32 nia Exp $
+# $NetBSD: options.mk,v 1.21 2022/09/30 07:38:28 adam Exp $
 
 # Global and legacy options
 
@@ -180,10 +180,9 @@
 
 # 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