| Message ID | 20241006230501.51183-1-ffmpeg@emily.moe |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] fate/ffmpeg: add samples dependency to fate-ffmpeg-spec-disposition | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
On Mon, Oct 7, 2024 at 2:05 AM Emily via ffmpeg-devel <ffmpeg-devel@ffmpeg.org> wrote: > > From: Emily <hello@emily.moe> > > --- > In the NixOS FFmpeg package, we run `make check` without downloading > the entire FATE suite. The FFmpeg 7.1 update broke this, seemingly > because of an undeclared FATE sample dependency. > > This package is my best‐guess attempt at fixing that based on the > other commits and files that I read. I didn’t see any existing > commit or patch for this, so I’m sending it upstream in case it > is of any use. It should be backported to the 7.1 branch if applied; > let me know if there’s anything special I need to do for that. > > I’m not particularly familiar with FFmpeg’s build system or > `git send-email`, so apologies if I messed anything up here. > Just noticed that this patch already existed thanks to Anton mentioning it on IRC today. The change seems exactly the same that I posted my patch for as this issue was reported on IRC on Sunday, so that wise you can consider this an LGTM from me. Will just do final checks and apply this one to master and release/7.1, as it precedes mine :) . Jan
On Mon, Oct 21, 2024 at 9:05 PM Jan Ekström <jeebjp@gmail.com> wrote: > > On Mon, Oct 7, 2024 at 2:05 AM Emily via ffmpeg-devel > <ffmpeg-devel@ffmpeg.org> wrote: > > > > From: Emily <hello@emily.moe> > > > > --- > > In the NixOS FFmpeg package, we run `make check` without downloading > > the entire FATE suite. The FFmpeg 7.1 update broke this, seemingly > > because of an undeclared FATE sample dependency. > > > > This package is my best‐guess attempt at fixing that based on the > > other commits and files that I read. I didn’t see any existing > > commit or patch for this, so I’m sending it upstream in case it > > is of any use. It should be backported to the 7.1 branch if applied; > > let me know if there’s anything special I need to do for that. > > > > I’m not particularly familiar with FFmpeg’s build system or > > `git send-email`, so apologies if I messed anything up here. > > > > Just noticed that this patch already existed thanks to Anton > mentioning it on IRC today. > > The change seems exactly the same that I posted my patch for as this > issue was reported on IRC on Sunday, so that wise you can consider > this an LGTM from me. > > Will just do final checks and apply this one to master and > release/7.1, as it precedes mine :) . Verified that the diff indeed matches, applied this patch with a minor addition in the commit message as 3565903c638fb77d600d2983701b12300e695a5d to master and as 9fbbd924f2863312b41303a48705b252b7ee1193 to release/7.1. Thanks for contributing this fix and sorry it took a while for it to get noticed :) . Jan
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 869376dd18..d9348ee837 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -266,4 +266,4 @@ FATE_FFMPEG-$(call ENCDEC2, MPEG2VIDEO, FFV1, NUT, HSTACK_FILTER PIPE_PROTOCOL F # test matching by stream disposition fate-ffmpeg-spec-disposition: CMD = framecrc -i $(TARGET_SAMPLES)/mpegts/pmtchange.ts -map '0:disp:visual_impaired+descriptions:1' -c copy -FATE_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition
From: Emily <hello@emily.moe> --- In the NixOS FFmpeg package, we run `make check` without downloading the entire FATE suite. The FFmpeg 7.1 update broke this, seemingly because of an undeclared FATE sample dependency. This package is my best‐guess attempt at fixing that based on the other commits and files that I read. I didn’t see any existing commit or patch for this, so I’m sending it upstream in case it is of any use. It should be backported to the 7.1 branch if applied; let me know if there’s anything special I need to do for that. I’m not particularly familiar with FFmpeg’s build system or `git send-email`, so apologies if I messed anything up here. tests/fate/ffmpeg.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)