CVS commit: pkgsrc/multimedia/ffmpeg6

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Jun  7 11:42:47 UTC 2023

Modified Files:
        pkgsrc/multimedia/ffmpeg6: Makefile distinfo
Added Files:
        pkgsrc/multimedia/ffmpeg6/patches: patch-libavformat_avformat.h
            patch-libavformat_mux__utils.c

Log Message:
ffmpeg6: expose av_stream_get_first_dts() required by chromium
patch from ArchLinux


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg6/Makefile \
    pkgsrc/multimedia/ffmpeg6/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/ffmpeg6/patches/patch-libavformat_avformat.h \
    pkgsrc/multimedia/ffmpeg6/patches/patch-libavformat_mux__utils.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg6/Makefile
diff -u pkgsrc/multimedia/ffmpeg6/Makefile:1.1 pkgsrc/multimedia/ffmpeg6/Makefile:1.2
--- pkgsrc/multimedia/ffmpeg6/Makefile:1.1      Fri Jun  2 16:44:06 2023
+++ pkgsrc/multimedia/ffmpeg6/Makefile  Wed Jun  7 11:42:47 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2023/06/02 16:44:06 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/07 11:42:47 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg6/}
+PKGREVISION=   1
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v6.x)
Index: pkgsrc/multimedia/ffmpeg6/distinfo
diff -u pkgsrc/multimedia/ffmpeg6/distinfo:1.1 pkgsrc/multimedia/ffmpeg6/distinfo:1.2
--- pkgsrc/multimedia/ffmpeg6/distinfo:1.1      Fri Jun  2 16:44:06 2023
+++ pkgsrc/multimedia/ffmpeg6/distinfo  Wed Jun  7 11:42:47 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2023/06/02 16:44:06 wiz Exp $
+$NetBSD: distinfo,v 1.2 2023/06/07 11:42:47 markd Exp $
 
 BLAKE2s (ffmpeg-6.0.tar.xz) = ce6f75464ac37374825b33d7b32b22f7e9dcea51026cc885cd6668fbada65c08
 SHA512 (ffmpeg-6.0.tar.xz) = 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980
@@ -15,6 +15,8 @@ SHA1 (patch-libavdevice_sunau.c) = 554a5
 SHA1 (patch-libavdevice_sunau.h) = 2678d87f81e7b3faa42b5cc9814e373c4ad812f6
 SHA1 (patch-libavdevice_sunau__dec.c) = d2fc01e941c68ab8b6f5e0b98ee536a32cc56bdc
 SHA1 (patch-libavdevice_sunau__enc.c) = efe765b99ad6379d0237c619ac0dce41306431be
+SHA1 (patch-libavformat_avformat.h) = 162daff5075c436bfff6e9a33238ba273a0afea6
+SHA1 (patch-libavformat_mux__utils.c) = fb7be5deb316e2fa79ba8cf8f2f4e347b13b91f5
 SHA1 (patch-libavutil_macros.h) = 7d9770f018a2207d2dcb1fe057564e30be51fd42
 SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22
 SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487

Added files:

Index: pkgsrc/multimedia/ffmpeg6/patches/patch-libavformat_avformat.h
diff -u /dev/null pkgsrc/multimedia/ffmpeg6/patches/patch-libavformat_avformat.h:1.1
--- /dev/null   Wed Jun  7 11:42:47 2023
+++ pkgsrc/multimedia/ffmpeg6/patches/patch-libavformat_avformat.h      Wed Jun  7 11:42:47 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-libavformat_avformat.h,v 1.1 2023/06/07 11:42:47 markd Exp $
+
+expose av_stream_get_first_dts() for chromium - from ArchLinux
+
+--- libavformat/avformat.h.orig        2023-02-27 20:43:45.000000000 +0000
++++ libavformat/avformat.h
+@@ -1019,6 +1019,10 @@ attribute_deprecated
+ int64_t    av_stream_get_end_pts(const AVStream *st);
+ #endif
+ 
++// Chromium: We use the internal field first_dts vvv
++int64_t    av_stream_get_first_dts(const AVStream *st);
++// Chromium: We use the internal field first_dts ^^^
++
+ #define AV_PROGRAM_RUNNING 1
+ 
+ /**
Index: pkgsrc/multimedia/ffmpeg6/patches/patch-libavformat_mux__utils.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg6/patches/patch-libavformat_mux__utils.c:1.1
--- /dev/null   Wed Jun  7 11:42:47 2023
+++ pkgsrc/multimedia/ffmpeg6/patches/patch-libavformat_mux__utils.c    Wed Jun  7 11:42:47 2023
@@ -0,0 +1,20 @@
+$NetBSD: patch-libavformat_mux__utils.c,v 1.1 2023/06/07 11:42:47 markd Exp $
+
+expose av_stream_get_first_dts() for chromium - from ArchLinux
+
+--- libavformat/mux_utils.c.orig       2023-02-27 20:43:45.000000000 +0000
++++ libavformat/mux_utils.c
+@@ -40,6 +40,13 @@ int64_t av_stream_get_end_pts(const AVSt
+ }
+ #endif
+ 
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st)
++{
++  return cffstream(st)->first_dts;
++}
++// Chromium: We use the internal field first_dts ^^^
++
+ int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
+                          int std_compliance)
+ {