Merge ~liushuyu-011/ubuntu/+source/notcurses:ubuntu/devel into ubuntu/+source/notcurses:ubuntu/devel

[Zixing Liu]

This merge proposal fixes the notcurses FTBFS with FFmpeg 7

[Graham Inggs (ginggs)]

Looks good to me, thanks!

review: Approve

Unmerged commits

10ff1c7... by Zixing Liu on 2024-09-17

changelog

c274dfd... by Zixing Liu on 2024-09-17

d/p/ffmpeg-use-duration.patch: backport an upstream patch to fix FTBFS ...

... with FFmpeg 7

7b0d77b... by Zixing Liu on 2024-09-17

d/rules: include missing helper Makefile

diff --git a/debian/changelog b/debian/changelog
index a76be66..c939ae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+notcurses (3.0.7+dfsg.1-1ubuntu7) oracular; urgency=medium
+
+  * d/rules: include missing helper Makefile.
+  * d/p/ffmpeg-use-duration.patch: backport an upstream patch to fix FTBFS
+    with FFmpeg 7.
+
+ -- Zixing Liu <[e-mail]>  Tue, 17 Sep 2024 12:09:36 -0600
+
 notcurses (3.0.7+dfsg.1-1ubuntu6) noble; urgency=high
 
   * No change rebuild against frame pointers and time_t.
diff --git a/debian/patches/ffmpeg-use-duration.patch b/debian/patches/ffmpeg-use-duration.patch
new file mode 100644
index 0000000..b07c61c
--- /dev/null
+++ b/debian/patches/ffmpeg-use-duration.patch
@@ -0,0 +1,44 @@
+Description: ffmpeg: use pkt_duration when it's available #2688
+Author: nick black <[e-mail]>
+Origin: upstream, https://github.com/dankamongmen/notcurses/commit/bed402adf98ae51efeb9ac3a71f88facfbf7290c
+Last-Update: 2024-09-17
+---
+Index: notcurses/src/media/ffmpeg.c
+===================================================================
+--- notcurses.orig/src/media/ffmpeg.c
++++ notcurses/src/media/ffmpeg.c
+@@ -39,6 +39,14 @@ typedef struct ncvisual_details {
+ 
+ #define IMGALLOCALIGN 64
+ 
++uint64_t ffmpeg_pkt_duration(const AVFrame* frame){
++#ifdef FF_API_PKT_DURATION
++      return frame->pkt_duration;
++#else
++      return frame->duration;
++#endif
++}
++
+ /*static void
+ print_frame_summary(const AVCodecContext* cctx, const AVFrame* f){
+   if(f == NULL){
+@@ -75,7 +83,7 @@ print_frame_summary(const AVCodecContext
+   }
+   fprintf(stderr, " PTS %" PRId64 " Flags: 0x%04x\n", f->pts, f->flags);
+   fprintf(stderr, " %" PRIu64 "ms@%" PRIu64 "ms (%skeyframe) qual: %d\n",
+-          f->pkt_duration, // FIXME in 'time_base' units
++          ffmpeg_pkt_duration(f), // FIXME in 'time_base' units
+           f->best_effort_timestamp,
+           f->key_frame ? "" : "non-",
+           f->quality);
+@@ -520,7 +528,9 @@ ffmpeg_stream(notcurses* nc, ncvisual* n
+       activevopts.n = newn;
+     }
+     ++frame;
+-    uint64_t duration = ncv->details->frame->pkt_duration * tbase * NANOSECS_IN_SEC;
++    // display duration in units of time_base
++    const uint64_t pktduration = ffmpeg_pkt_duration(ncv->details->frame);
++    uint64_t duration = pktduration * tbase * NANOSECS_IN_SEC;
+     double schedns = nsbegin;
+     sum_duration += (duration * timescale);
+     schedns += sum_duration;
diff --git a/debian/patches/series b/debian/patches/series
index 5b7761e..c386314 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 s390x-adt.patch
 ftbfs-doctest-2.4.9.patch
 lp-2008108-armhf-metrics-test.patch
+ffmpeg-use-duration.patch
diff --git a/debian/rules b/debian/rules
index e7398cf..3af33fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
 DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_MAINT_OPTIONS=reproducible=+fixfilepath