PR #22236 opened by toots URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22236 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22236.patch
>From 6d04bc914862f794bdc222ae86f03a1a521fe6ce Mon Sep 17 00:00:00 2001 From: Romain Beauxis <[email protected]> Date: Fri, 20 Feb 2026 17:52:04 -0600 Subject: [PATCH] tests/fate/ogg-*.mak: fix dependency on $(FFMPEG) --- tests/fate/ogg-flac.mak | 14 +++++++++----- tests/fate/ogg-opus.mak | 14 +++++++++----- tests/fate/ogg-vorbis.mak | 14 +++++++++----- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/tests/fate/ogg-flac.mak b/tests/fate/ogg-flac.mak index 3b48f32d2d..5c83eef9f1 100644 --- a/tests/fate/ogg-flac.mak +++ b/tests/fate/ogg-flac.mak @@ -2,11 +2,6 @@ FATE_OGG_FLAC += fate-ogg-flac-chained-meta fate-ogg-flac-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-flac-chained-meta.txt fate-ogg-flac-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg -FATE_OGG_FLAC += fate-ogg-flac-copy-chained-meta -fate-ogg-flac-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(FFMPEG) -fate-ogg-flac-copy-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-flac-chained-meta.txt -fate-ogg-flac-copy-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" ogg - FATE_OGG_FLAC-$(call DEMDEC, OGG, FLAC, FLAC_PARSER) += $(FATE_OGG_FLAC) FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_FLAC-yes) @@ -14,3 +9,12 @@ FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_FLAC-yes) FATE_EXTERN += $(FATE_OGG_FLAC-yes) fate-ogg-flac: $(FATE_OGG_FLAC-yes) + +FATE_OGG_COPY_FLAC += fate-ogg-copy-flac-chained-meta +fate-ogg-copy-flac-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) +fate-ogg-copy-flac-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-flac-chained-meta.txt +fate-ogg-copy-flac-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" ogg + +FATE_SAMPLES_FFMPEG += $(FATE_OGG_COPY_FLAC-yes) + +fate-ogg-copy-flac: $(FATE_OGG_COPY_FLAC) diff --git a/tests/fate/ogg-opus.mak b/tests/fate/ogg-opus.mak index d8a30dd058..9b71ed82c7 100644 --- a/tests/fate/ogg-opus.mak +++ b/tests/fate/ogg-opus.mak @@ -2,11 +2,6 @@ FATE_OGG_OPUS += fate-ogg-opus-chained-meta fate-ogg-opus-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-opus-chained-meta.txt fate-ogg-opus-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-opus/chained-meta.ogg -FATE_OGG_OPUS += fate-ogg-opus-copy-chained-meta -fate-ogg-opus-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(FFMPEG) -fate-ogg-opus-copy-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-opus-chained-meta.txt -fate-ogg-opus-copy-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-opus/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" ogg - FATE_OGG_OPUS-$(call DEMDEC, OGG, OPUS) += $(FATE_OGG_OPUS) FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_OPUS-yes) @@ -14,3 +9,12 @@ FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_OPUS-yes) FATE_EXTERN += $(FATE_OGG_OPUS-yes) fate-ogg-opus: $(FATE_OGG_OPUS-yes) + +FATE_OGG_COPY_OPUS += fate-ogg-copy-opus-chained-meta +fate-ogg-copy-opus-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) +fate-ogg-copy-opus-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-opus-chained-meta.txt +fate-ogg-copy-opus-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-opus/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" ogg + +FATE_SAMPLES_FFMPEG += $(FATE_OGG_COPY_OPUS-yes) + +fate-ogg-copy-opus: $(FATE_OGG_COPY_OPUS) diff --git a/tests/fate/ogg-vorbis.mak b/tests/fate/ogg-vorbis.mak index 1bca373fea..15e052da41 100644 --- a/tests/fate/ogg-vorbis.mak +++ b/tests/fate/ogg-vorbis.mak @@ -2,11 +2,6 @@ FATE_OGG_VORBIS += fate-ogg-vorbis-chained-meta fate-ogg-vorbis-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-vorbis-chained-meta.txt fate-ogg-vorbis-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg -FATE_OGG_VORBIS += fate-ogg-vorbis-copy-chained-meta -fate-ogg-vorbis-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(FFMPEG) -fate-ogg-vorbis-copy-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-vorbis-chained-meta.txt -fate-ogg-vorbis-copy-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" ogg - FATE_OGG_VORBIS-$(call DEMDEC, OGG, VORBIS) += $(FATE_OGG_VORBIS) FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_VORBIS-yes) @@ -14,3 +9,12 @@ FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_VORBIS-yes) FATE_EXTERN += $(FATE_OGG_VORBIS-yes) fate-ogg-vorbis: $(FATE_OGG_VORBIS-yes) + +FATE_OGG_COPY_VORBIS += fate-ogg-copy-vorbis-chained-meta +fate-ogg-copy-vorbis-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) +fate-ogg-copy-vorbis-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-vorbis-chained-meta.txt +fate-ogg-copy-vorbis-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" ogg + +FATE_SAMPLES_FFMPEG += $(FATE_OGG_COPY_VORBIS-yes) + +fate-ogg-copy-vorbis: $(FATE_OGG_COPY_VORBIS) -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
