CVS commit: pkgsrc/multimedia/ffmpeg5

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Sep 26 17:41:07 UTC 2022

Modified Files:
        pkgsrc/multimedia/ffmpeg5: buildlink3.mk options.mk

Log Message:
ffmpeg5: back to stable x264


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg5/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg5/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/ffmpeg5/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpeg5/buildlink3.mk:1.5 pkgsrc/multimedia/ffmpeg5/buildlink3.mk:1.6
--- pkgsrc/multimedia/ffmpeg5/buildlink3.mk:1.5 Mon Sep 26 12:59:01 2022
+++ pkgsrc/multimedia/ffmpeg5/buildlink3.mk     Mon Sep 26 17:41:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2022/09/26 12:59:01 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2022/09/26 17:41:07 adam Exp $
 
 BUILDLINK_TREE+=       ffmpeg5
 
@@ -34,7 +34,7 @@ pkgbase := ffmpeg5
 .endif
 
 .if ${PKG_BUILD_OPTIONS.ffmpeg5:Mx264}
-.  include "../../multimedia/x264-devel/buildlink3.mk"
+.  include "../../multimedia/x264/buildlink3.mk"
 .endif
 
 .if ${PKG_BUILD_OPTIONS.ffmpeg5:Mlibvpx}

Index: pkgsrc/multimedia/ffmpeg5/options.mk
diff -u pkgsrc/multimedia/ffmpeg5/options.mk:1.4 pkgsrc/multimedia/ffmpeg5/options.mk:1.5
--- pkgsrc/multimedia/ffmpeg5/options.mk:1.4    Mon Sep 26 12:59:01 2022
+++ pkgsrc/multimedia/ffmpeg5/options.mk        Mon Sep 26 17:41:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2022/09/26 12:59:01 ryoon Exp $
+# $NetBSD: options.mk,v 1.5 2022/09/26 17:41:07 adam Exp $
 
 # Global and legacy options
 
@@ -212,7 +212,7 @@ CONFIGURE_ARGS+=    --enable-libxvid
 .if !empty(PKG_OPTIONS:Mx264)
 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