[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg5 ffmpeg5: Use multimedia/x264-devel....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a2cfcf3452d6
branches:  trunk
changeset: 385755:a2cfcf3452d6
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Sep 26 12:59:01 2022 +0000

description:
ffmpeg5: Use multimedia/x264-devel. Fix build with x264 option

diffstat:

 multimedia/ffmpeg5/buildlink3.mk |  4 ++--
 multimedia/ffmpeg5/options.mk    |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r ad33944a6b1a -r a2cfcf3452d6 multimedia/ffmpeg5/buildlink3.mk
--- a/multimedia/ffmpeg5/buildlink3.mk  Mon Sep 26 12:39:04 2022 +0000
+++ b/multimedia/ffmpeg5/buildlink3.mk  Mon Sep 26 12:59:01 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2022/09/26 12:38:36 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/09/26 12:59:01 ryoon Exp $
 
 BUILDLINK_TREE+=       ffmpeg5
 
@@ -34,7 +34,7 @@
 .endif
 
 .if ${PKG_BUILD_OPTIONS.ffmpeg5:Mx264}
-.  include "../../multimedia/x264/buildlink3.mk"
+.  include "../../multimedia/x264-devel/buildlink3.mk"
 .endif
 
 .if ${PKG_BUILD_OPTIONS.ffmpeg5:Mlibvpx}
diff -r ad33944a6b1a -r a2cfcf3452d6 multimedia/ffmpeg5/options.mk
--- a/multimedia/ffmpeg5/options.mk     Mon Sep 26 12:39:04 2022 +0000
+++ b/multimedia/ffmpeg5/options.mk     Mon Sep 26 12:59:01 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2022/09/26 12:38:36 adam Exp $
+# $NetBSD: options.mk,v 1.4 2022/09/26 12:59:01 ryoon Exp $
 
 # Global and legacy options
 
@@ -212,7 +212,7 @@
 .if !empty(PKG_OPTIONS:Mx264)
 BUILDLINK_API_DEPENDS.x264+=   x264>=20220601
 CONFIGURE_ARGS+=       --enable-libx264
-.include "../../multimedia/x264/buildlink3.mk"
+.include "../../multimedia/x264-devel/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-libx264
 .endif