[FFmpeg-devel] [PATCH] Fix build on RISC-V: resolve undefined reference to ff_rv_zbb_supported in fftools/ffmpeg_filter (PR #21296)

[CheryDan via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #21296 opened by CheryDan
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21296
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21296.patch


>From 54140e0b97a802431a65a720f3f4d0812da2bd7f Mon Sep 17 00:00:00 2001
From: daichengrong <daichengrong@iscas.ac.cn>
Date: Thu, 25 Dec 2025 17:11:08 +0800
Subject: [PATCH] Fix build on RISC-V: resolve undefined reference to
 ff_rv_zbb_supported in fftools/ffmpeg_filter

---
 fftools/Makefile           | 5 ++++-
 fftools/riscv/Makefile     | 1 +
 fftools/riscv/cpu_common.c | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 fftools/riscv/Makefile
 create mode 100644 fftools/riscv/cpu_common.c

diff --git a/fftools/Makefile b/fftools/Makefile
index 01b16fa8f4..e472c43024 100644
--- a/fftools/Makefile
+++ b/fftools/Makefile
@@ -10,6 +10,7 @@ ALLAVPROGS   = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF))
 ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF))
 
 include $(SRC_PATH)/fftools/resources/Makefile
+include $(SRC_PATH)/fftools/riscv/Makefile
 
 OBJS-ffmpeg +=                  \
     fftools/ffmpeg_dec.o        \
@@ -37,6 +38,7 @@ OBJS-ffmpeg +=                  \
     fftools/textformat/tw_stdout.o    \
     $(OBJS-resman)                    \
     $(RESOBJS)                        \
+    $(OBJS-CPU_COMMON-yes)              \
 
 OBJS-ffprobe +=                       \
     fftools/textformat/avtextformat.o \
@@ -60,7 +62,7 @@ ifdef HAVE_GNU_WINDRES
 OBJS-$(1) += fftools/fftoolsres.o
 endif
 $(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
-$$(OBJS-$(1)): | fftools fftools/textformat fftools/resources fftools/graph
+$$(OBJS-$(1)): | fftools fftools/textformat fftools/resources fftools/graph fftools/riscv
 $$(OBJS-$(1)): CFLAGS  += $(CFLAGS-$(1))
 $(1)$(PROGSSUF)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
 $(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1))
@@ -76,6 +78,7 @@ OUTDIRS += fftools
 OUTDIRS += fftools/textformat
 OUTDIRS += fftools/resources
 OUTDIRS += fftools/graph
+OUTDIRS += fftools/riscv
 
 ifdef AVPROGS
 install: install-progs install-data
diff --git a/fftools/riscv/Makefile b/fftools/riscv/Makefile
new file mode 100644
index 0000000000..f187b3d92e
--- /dev/null
+++ b/fftools/riscv/Makefile
@@ -0,0 +1 @@
+OBJS-CPU_COMMON-$(HAVE_RV) += fftools/riscv/cpu_common.o
diff --git a/fftools/riscv/cpu_common.c b/fftools/riscv/cpu_common.c
new file mode 100644
index 0000000000..17c9b392c9
--- /dev/null
+++ b/fftools/riscv/cpu_common.c
@@ -0,0 +1 @@
+#include "libavutil/riscv/cpu_common.c"
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org