Download raw body.
graphics/ffmpeg: update to 6.1.3
"External reference changes" doesn't matter for bumps
--
Sent from a phone, apologies for poor formatting.
On 23 August 2025 01:37:53 Kirill A. Korinsky <kirill@korins.ky> wrote:
> On Sat, 23 Aug 2025 00:53:42 +0200,
> Kirill A. Korinsky <kirill@korins.ky> wrote:
>>
>> Brad,
>>
>> I'd like to update graphics/ffmpeg to 6.1.3.
>>
>> It was tested on -current/amd64 and -current/arm64, no regression.
>>
>> Also, riscv and yuv2rgb_altivec related patched is included into this
>> release.
>>
>
> Here a diff which increases version of avformat due to:
>
> /usr/local/lib/libavcodec.so.26.0 -->
> /build/pobj/ffmpeg-6.1.3/fake-amd64/usr/local/lib/libavcodec.so.26.0
> No dynamic export changes
> /usr/local/lib/libavdevice.so.14.0 -->
> /build/pobj/ffmpeg-6.1.3/fake-amd64/usr/local/lib/libavdevice.so.14.0
> No dynamic export changes
> /usr/local/lib/libavfilter.so.12.0 -->
> /build/pobj/ffmpeg-6.1.3/fake-amd64/usr/local/lib/libavfilter.so.12.0
> No dynamic export changes
> /usr/local/lib/libavformat.so.23.0 -->
> /build/pobj/ffmpeg-6.1.3/fake-amd64/usr/local/lib/libavformat.so.23.0
> No dynamic export changes
> External reference changes:
> added:
> xmlRealloc
> xmlStrlen
>
> /usr/local/lib/libavutil.so.16.0 -->
> /build/pobj/ffmpeg-6.1.3/fake-amd64/usr/local/lib/libavutil.so.16.0
> No dynamic export changes
> /usr/local/lib/libpostproc.so.20.0 -->
> /build/pobj/ffmpeg-6.1.3/fake-amd64/usr/local/lib/libpostproc.so.20.0
> No dynamic export changes
> /usr/local/lib/libswresample.so.5.0 -->
> /build/pobj/ffmpeg-6.1.3/fake-amd64/usr/local/lib/libswresample.so.5.0
> No dynamic export changes
> /usr/local/lib/libswscale.so.8.0 -->
> /build/pobj/ffmpeg-6.1.3/fake-amd64/usr/local/lib/libswscale.so.8.0
> No dynamic export changes
>
> Ok?
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
> diff -u -p -r1.246 Makefile
> --- Makefile 24 May 2025 00:26:53 -0000 1.246
> +++ Makefile 23 Aug 2025 00:35:53 -0000
> @@ -1,8 +1,7 @@
> COMMENT= audio/video converter and streamer
>
> -V= 6.1.2
> +V= 6.1.3
> DISTNAME= ffmpeg-${V}
> -REVISION= 3
> EPOCH= 1
> CATEGORIES= graphics multimedia
> SITES= https://ffmpeg.org/releases/
> @@ -13,7 +12,7 @@ USE_NOBTCFI-amd64= Yes
> SHARED_LIBS= avcodec 26.0 \
> avdevice 14.0 \
> avfilter 12.0 \
> - avformat 23.0 \
> + avformat 23.1 \
> avutil 16.0 \
> postproc 20.0 \
> swresample 5.0 \
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
> diff -u -p -r1.68 distinfo
> --- distinfo 24 Nov 2024 08:50:45 -0000 1.68
> +++ distinfo 22 Aug 2025 21:04:26 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (ffmpeg-6.1.2.tar.xz) = O2JGSXJezcVlyQPKZkPUHzO9SSOZIuRcmxRCxj3KTjg=
> -SIZE (ffmpeg-6.1.2.tar.xz) = 10466152
> +SHA256 (ffmpeg-6.1.3.tar.xz) = vF8eSk0oOmSSNUaE7hEkEpxSKTvPxqkWkZNTn77ONIc=
> +SIZE (ffmpeg-6.1.3.tar.xz) = 10473704
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: patches/patch-Makefile
> diff -N patches/patch-Makefile
> --- patches/patch-Makefile 3 Dec 2024 12:50:29 -0000 1.10
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,20 +0,0 @@
> -- riscv: test for assembler support
> - b3825bbe452c8e4f129fa90bba1fed0ee7b87d71
> -
> -Index: Makefile
> ---- Makefile.orig
> -+++ Makefile
> -@@ -93,10 +93,10 @@ ffbuild/.config: $(CONFIGURABLE_COMPONENTS)
> - SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \
> - HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \
> - ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \
> -- ALTIVEC-OBJS VSX-OBJS RVV-OBJS MMX-OBJS X86ASM-OBJS \
> -+ ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS \
> - MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \
> -- MMI-OBJS LSX-OBJS LASX-OBJS OBJS SLIBOBJS SHLIBOBJS \
> -- STLIBOBJS HOSTOBJS TESTOBJS
> -+ MMI-OBJS LSX-OBJS LASX-OBJS RV-OBJS RVV-OBJS \
> -+ OBJS SLIBOBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS
> -
> - define RESET
> - $(1) :=
> Index: patches/patch-configure
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v
> diff -u -p -r1.75 patch-configure
> --- patches/patch-configure 3 Dec 2024 12:50:29 -0000 1.75
> +++ patches/patch-configure 22 Aug 2025 21:21:39 -0000
> @@ -1,28 +1,12 @@
> - aarch64: Implement support for elf_aux_info(3) on FreeBSD and OpenBSD
> a3f79fd22a367207097c78e0a5d2bc213efe9f80
> -- riscv: test for assembler support
> - b3825bbe452c8e4f129fa90bba1fed0ee7b87d71
> -- lsws/ppc/yuv2rgb_altivec: Fix build in non-VSX environments with Clang
>
> - Fix broken libatomic test
>
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -2146,10 +2146,12 @@ ARCH_EXT_LIST_PPC="
> - ldbrx
> - power8
> - ppc4xx
> -+ vec_xl
> - vsx
> - "
> -
> - ARCH_EXT_LIST_RISCV="
> -+ rv
> - rvv
> - "
> -
> -@@ -2296,6 +2298,7 @@ SYSTEM_FUNCS="
> +@@ -2300,6 +2300,7 @@ SYSTEM_FUNCS="
> clock_gettime
> closesocket
> CommandLineToArgvW
> @@ -30,19 +14,7 @@ Index: configure
> fcntl
> getaddrinfo
> getauxval
> -@@ -2674,9 +2677,11 @@ altivec_deps="ppc"
> - dcbzl_deps="ppc"
> - ldbrx_deps="ppc"
> - ppc4xx_deps="ppc"
> -+vec_xl_deps="altivec"
> - vsx_deps="altivec"
> - power8_deps="vsx"
> -
> -+rv_deps="riscv"
> - rvv_deps="riscv"
> -
> - loongson2_deps="mips"
> -@@ -5598,7 +5603,6 @@ case $target_os in
> +@@ -5607,7 +5608,6 @@ case $target_os in
> enable section_data_rel_ro
> striptype=""
> SHFLAGS='-shared'
> @@ -50,7 +22,7 @@ Index: configure
> SLIB_INSTALL_LINKS=
> oss_indev_extralibs="-lossaudio"
> oss_outdev_extralibs="-lossaudio"
> -@@ -5959,7 +5963,7 @@ set_default libdir
> +@@ -5968,7 +5968,7 @@ set_default libdir
> set_default $PATHS_LIST
> set_default nm
>
> @@ -59,22 +31,7 @@ Index: configure
>
> enable_weak_pic() {
> disabled pic && return
> -@@ -6215,8 +6219,14 @@ elif enabled ppc; then
> - check_cpp_condition power8 "altivec.h" "defined(_ARCH_PWR8)"
> - fi
> -
> -+ if enabled altivec && disabled vsx; then
> -+ check_cc vec_xl altivec.h "const unsigned char *y1i = { 0 };
> -+ vector unsigned char y0 = vec_xl(0, y1i);"
> -+ fi
> -+
> - elif enabled riscv; then
> -
> -+ enabled rv && check_inline_asm rv '".option arch, +zbb\nrev8 t0, t1"'
> - enabled rvv && check_inline_asm rvv '".option arch, +v\nvsetivli
> zero, 0, e8, m1, ta, ma"'
> -
> - elif enabled x86; then
> -@@ -6417,6 +6427,7 @@ check_func_headers mach/mach_time.h mach_absolute_time
> +@@ -6432,6 +6432,7 @@ check_func_headers mach/mach_time.h mach_absolute_time
> check_func_headers stdlib.h getenv
> check_func_headers sys/stat.h lstat
> check_func_headers sys/auxv.h getauxval
> @@ -82,7 +39,7 @@ Index: configure
> check_func_headers sys/sysctl.h sysctlbyname
>
> check_func_headers windows.h GetModuleHandle
> -@@ -6483,7 +6494,7 @@ check_headers asm/types.h
> +@@ -6498,7 +6499,7 @@ check_headers asm/types.h
> #
> # some configurations also require linking to libatomic, so try
> # both with -latomic and without
> @@ -91,11 +48,3 @@ Index: configure
> check_builtin stdatomic stdatomic.h
> \
> "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0); foo +=
> bar" \
> $LATOMIC && eval stdatomic_extralibs="\$LATOMIC" && break
> -@@ -7748,6 +7759,7 @@ if enabled ppc; then
> - echo "POWER8 enabled ${power8-no}"
> - echo "PPC 4xx optimizations ${ppc4xx-no}"
> - echo "dcbzl available ${dcbzl-no}"
> -+ echo "vec_xl available ${vec_xl-no}"
> - fi
> - if enabled loongarch; then
> - echo "LSX enabled ${lsx-no}"
> Index: patches/patch-ffbuild_arch_mak
> ===================================================================
> RCS file: patches/patch-ffbuild_arch_mak
> diff -N patches/patch-ffbuild_arch_mak
> --- patches/patch-ffbuild_arch_mak 3 Dec 2024 12:50:29 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -- riscv: test for assembler support
> - b3825bbe452c8e4f129fa90bba1fed0ee7b87d71
> -
> -Index: ffbuild/arch.mak
> ---- ffbuild/arch.mak.orig
> -+++ ffbuild/arch.mak
> -@@ -15,6 +15,7 @@ OBJS-$(HAVE_LASX) += $(LASX-OBJS) $(LASX-OB
> - OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes)
> - OBJS-$(HAVE_VSX) += $(VSX-OBJS) $(VSX-OBJS-yes)
> -
> -+OBJS-$(HAVE_RV) += $(RV-OBJS) $(RV-OBJS-yes)
> - OBJS-$(HAVE_RVV) += $(RVV-OBJS) $(RVV-OBJS-yes)
> -
> - OBJS-$(HAVE_MMX) += $(MMX-OBJS) $(MMX-OBJS-yes)
> Index: patches/patch-libavcodec_riscv_Makefile
> ===================================================================
> RCS file: patches/patch-libavcodec_riscv_Makefile
> diff -N patches/patch-libavcodec_riscv_Makefile
> --- patches/patch-libavcodec_riscv_Makefile 3 Dec 2024 12:50:29 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,38 +0,0 @@
> -- riscv: test for assembler support
> - b3825bbe452c8e4f129fa90bba1fed0ee7b87d71
> -
> -Index: libavcodec/riscv/Makefile
> ---- libavcodec/riscv/Makefile.orig
> -+++ libavcodec/riscv/Makefile
> -@@ -1,14 +1,14 @@
> - OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o
> - RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o
> --OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o \
> -- riscv/ac3dsp_rvb.o
> -+OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o
> -+RV-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvb.o
> - OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_init.o
> - RVV-OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_rvv.o
> --OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \
> -- riscv/audiodsp_rvf.o
> -+OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o
> -+RV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvf.o
> - RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o
> --OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_init.o \
> -- riscv/bswapdsp_rvb.o
> -+OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_init.o
> -+RV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvb.o
> - RVV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvv.o
> - OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_init.o
> - RVV-OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_rvv.o
> -@@ -22,8 +22,8 @@ OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o
> - RVV-OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_rvv.o
> - OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_init.o
> - RVV-OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_rvv.o
> --OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \
> -- riscv/pixblockdsp_rvi.o
> -+OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o
> -+RV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvi.o
> - RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o
> - OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o
> - RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o
> Index: patches/patch-libavcodec_riscv_ac3dsp_init_c
> ===================================================================
> RCS file: patches/patch-libavcodec_riscv_ac3dsp_init_c
> diff -N patches/patch-libavcodec_riscv_ac3dsp_init_c
> --- patches/patch-libavcodec_riscv_ac3dsp_init_c 3 Dec 2024 12:50:29 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -- riscv: test for assembler support
> - b3825bbe452c8e4f129fa90bba1fed0ee7b87d71
> -
> -Index: libavcodec/riscv/ac3dsp_init.c
> ---- libavcodec/riscv/ac3dsp_init.c.orig
> -+++ libavcodec/riscv/ac3dsp_init.c
> -@@ -29,10 +29,12 @@ void ff_extract_exponents_rvb(uint8_t *exp, int32_t *c
> -
> - av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c)
> - {
> -+#if HAVE_RV
> - int flags = av_get_cpu_flags();
> -
> - if (flags & AV_CPU_FLAG_RVB_ADDR) {
> - if (flags & AV_CPU_FLAG_RVB_BASIC)
> - c->extract_exponents = ff_extract_exponents_rvb;
> - }
> -+#endif
> - }
> Index: patches/patch-libavcodec_riscv_audiodsp_init_c
> ===================================================================
> RCS file: patches/patch-libavcodec_riscv_audiodsp_init_c
> diff -N patches/patch-libavcodec_riscv_audiodsp_init_c
> --- patches/patch-libavcodec_riscv_audiodsp_init_c 3 Dec 2024 12:50:29
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -- riscv: test for assembler support
> - b3825bbe452c8e4f129fa90bba1fed0ee7b87d71
> -
> -Index: libavcodec/riscv/audiodsp_init.c
> ---- libavcodec/riscv/audiodsp_init.c.orig
> -+++ libavcodec/riscv/audiodsp_init.c
> -@@ -33,6 +33,7 @@ void ff_vector_clipf_rvv(float *dst, const float *src,
> -
> - av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c)
> - {
> -+#if HAVE_RV
> - int flags = av_get_cpu_flags();
> -
> - if (flags & AV_CPU_FLAG_RVF)
> -@@ -46,5 +47,6 @@ av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c
> - if (flags & AV_CPU_FLAG_RVV_F32)
> - c->vector_clipf = ff_vector_clipf_rvv;
> - }
> -+#endif
> - #endif
> - }
> Index: patches/patch-libavcodec_riscv_bswapdsp_init_c
> ===================================================================
> RCS file: patches/patch-libavcodec_riscv_bswapdsp_init_c
> diff -N patches/patch-libavcodec_riscv_bswapdsp_init_c
> --- patches/patch-libavcodec_riscv_bswapdsp_init_c 3 Dec 2024 12:50:29
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,20 +0,0 @@
> -- riscv: test for assembler support
> - b3825bbe452c8e4f129fa90bba1fed0ee7b87d71
> -
> -Index: libavcodec/riscv/bswapdsp_init.c
> ---- libavcodec/riscv/bswapdsp_init.c.orig
> -+++ libavcodec/riscv/bswapdsp_init.c
> -@@ -30,6 +30,7 @@ void ff_bswap16_buf_rvv(uint16_t *dst, const uint16_t
> -
> - av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c)
> - {
> -+#if HAVE_RV
> - int flags = av_get_cpu_flags();
> -
> - if (flags & AV_CPU_FLAG_RVB_ADDR) {
> -@@ -42,4 +43,5 @@ av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c
> - c->bswap16_buf = ff_bswap16_buf_rvv;
> - #endif
> - }
> -+#endif
> - }
> Index: patches/patch-libavcodec_riscv_pixblockdsp_init_c
> ===================================================================
> RCS file: patches/patch-libavcodec_riscv_pixblockdsp_init_c
> diff -N patches/patch-libavcodec_riscv_pixblockdsp_init_c
> --- patches/patch-libavcodec_riscv_pixblockdsp_init_c 3 Dec 2024 12:50:29
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -- riscv: test for assembler support
> - b3825bbe452c8e4f129fa90bba1fed0ee7b87d71
> -
> -Index: libavcodec/riscv/pixblockdsp_init.c
> ---- libavcodec/riscv/pixblockdsp_init.c.orig
> -+++ libavcodec/riscv/pixblockdsp_init.c
> -@@ -43,6 +43,7 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPCont
> - AVCodecContext *avctx,
> - unsigned high_bit_depth)
> - {
> -+#if HAVE_RV
> - int cpu_flags = av_get_cpu_flags();
> -
> - if (cpu_flags & AV_CPU_FLAG_RVI) {
> -@@ -61,5 +62,6 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPCont
> -
> - c->diff_pixels_unaligned = c->diff_pixels = ff_diff_pixels_rvv;
> - }
> -+#endif
> - #endif
> - }
> Index: patches/patch-libswscale_ppc_yuv2rgb_altivec_c
> ===================================================================
> RCS file: patches/patch-libswscale_ppc_yuv2rgb_altivec_c
> diff -N patches/patch-libswscale_ppc_yuv2rgb_altivec_c
> --- patches/patch-libswscale_ppc_yuv2rgb_altivec_c 24 Nov 2024 08:50:45
> -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,23 +0,0 @@
> -- lsws/ppc/yuv2rgb_altivec: Fix build in non-VSX environments with Clang
> -
> -Index: libswscale/ppc/yuv2rgb_altivec.c
> ---- libswscale/ppc/yuv2rgb_altivec.c.orig
> -+++ libswscale/ppc/yuv2rgb_altivec.c
> -@@ -284,7 +284,7 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector s
> - *
> ------------------------------------------------------------------------------
> - */
> -
> --#if !HAVE_VSX
> -+#if !HAVE_VEC_XL
> - static inline vector unsigned char vec_xl(signed long long offset, const
> ubyte *addr)
> - {
> - const vector unsigned char *v_addr = (const vector unsigned char *)
> (addr + offset);
> -@@ -292,7 +292,7 @@ static inline vector unsigned char vec_xl(signed long
> -
> - return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm);
> - }
> --#endif /* !HAVE_VSX */
> -+#endif /* !HAVE_VEC_XL */
> -
> - #define DEFCSP420_CVT(name, out_pixels)
> \
> - static int altivec_ ## name(SwsContext *c, const unsigned char **in,
> \
> Index: patches/patch-libswscale_riscv_Makefile
> ===================================================================
> RCS file: patches/patch-libswscale_riscv_Makefile
> diff -N patches/patch-libswscale_riscv_Makefile
> --- patches/patch-libswscale_riscv_Makefile 3 Dec 2024 12:50:29 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -- riscv: test for assembler support
> - b3825bbe452c8e4f129fa90bba1fed0ee7b87d71
> -
> -Index: libswscale/riscv/Makefile
> ---- libswscale/riscv/Makefile.orig
> -+++ libswscale/riscv/Makefile
> -@@ -1,3 +1,3 @@
> - OBJS += riscv/rgb2rgb.o
> --OBJS += riscv/rgb2rgb_rvb.o
> -+RV-OBJS += riscv/rgb2rgb_rvb.o
> - RVV-OBJS += riscv/rgb2rgb_rvv.o
> Index: patches/patch-libswscale_riscv_rgb2rgb_c
> ===================================================================
> RCS file: patches/patch-libswscale_riscv_rgb2rgb_c
> diff -N patches/patch-libswscale_riscv_rgb2rgb_c
> --- patches/patch-libswscale_riscv_rgb2rgb_c 3 Dec 2024 12:50:29 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -- riscv: test for assembler support
> - b3825bbe452c8e4f129fa90bba1fed0ee7b87d71
> -
> -Index: libswscale/riscv/rgb2rgb.c
> ---- libswscale/riscv/rgb2rgb.c.orig
> -+++ libswscale/riscv/rgb2rgb.c
> -@@ -42,6 +42,7 @@ void ff_yuyvtoyuv422_rvv(uint8_t *ydst, uint8_t *udst,
> -
> - av_cold void rgb2rgb_init_riscv(void)
> - {
> -+#if HAVE_RV
> - int flags = av_get_cpu_flags();
> -
> - #if (__riscv_xlen == 64)
> -@@ -58,5 +59,6 @@ av_cold void rgb2rgb_init_riscv(void)
> - uyvytoyuv422 = ff_uyvytoyuv422_rvv;
> - yuyvtoyuv422 = ff_yuyvtoyuv422_rvv;
> - }
> -+#endif
> - #endif
> - }
> Index: patches/patch-tests_checkasm_Makefile
> ===================================================================
> RCS file: patches/patch-tests_checkasm_Makefile
> diff -N patches/patch-tests_checkasm_Makefile
> --- patches/patch-tests_checkasm_Makefile 3 Dec 2024 12:50:29 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -Index: tests/checkasm/Makefile
> ---- tests/checkasm/Makefile.orig
> -+++ tests/checkasm/Makefile
> -@@ -66,7 +66,7 @@ CHECKASMOBJS-$(CONFIG_AVUTIL) += $(AVUTILOBJS)
> -
> - CHECKASMOBJS-$(ARCH_AARCH64) += aarch64/checkasm.o
> - CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/checkasm.o
> --CHECKASMOBJS-$(ARCH_RISCV) += riscv/checkasm.o
> -+CHECKASMOBJS-$(HAVE_RV) += riscv/checkasm.o
> - CHECKASMOBJS-$(HAVE_X86ASM) += x86/checkasm.o
> -
> - CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
> Index: patches/patch-tests_checkasm_checkasm_h
> ===================================================================
> RCS file: patches/patch-tests_checkasm_checkasm_h
> diff -N patches/patch-tests_checkasm_checkasm_h
> --- patches/patch-tests_checkasm_checkasm_h 3 Dec 2024 12:50:29 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -Index: tests/checkasm/checkasm.h
> ---- tests/checkasm/checkasm.h.orig
> -+++ tests/checkasm/checkasm.h
> -@@ -212,11 +212,14 @@ void checkasm_checked_call(void *func, ...);
> - void checkasm_set_function(void *);
> - void *checkasm_get_wrapper(void);
> -
> --#if (__riscv_xlen == 64) && defined (__riscv_d)
> -+#if HAVE_RV && (__riscv_xlen == 64) && defined (__riscv_d)
> - #define declare_new(ret, ...) \
> - ret (*checked_call)(__VA_ARGS__) = checkasm_get_wrapper();
> - #define call_new(...) \
> - (checkasm_set_function(func_new), checked_call(__VA_ARGS__))
> -+#else
> -+#define declare_new(ret, ...)
> -+#define call_new(...) ((func_type *)func_new)(__VA_ARGS__)
> - #endif
> - #else
> - #define declare_new(ret, ...)
graphics/ffmpeg: update to 6.1.3