Bug 935704 – >=media-video/ffmpeg-7.0.1[soc]: fails to apply ffmpeg-rpi-6.1-r3.patch

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description tt_1 2024-07-07 07:38:14 UTC]

hi, the patch will only apply on a system where the soc can be set, so the failure went unnoticed I guess: 

 * Applying ffmpeg-rpi-6.1-r3.patch ...
patching file configure
Hunk #2 succeeded at 285 with fuzz 1 (offset 5 lines).
Hunk #3 succeeded at 351 (offset 8 lines).
Hunk #4 succeeded at 1844 (offset 59 lines).
Hunk #5 succeeded at 2026 (offset 66 lines).
Hunk #6 succeeded at 2044 (offset 66 lines).
Hunk #7 succeeded at 2625 (offset 74 lines).
Hunk #8 succeeded at 3141 (offset 82 lines).
Hunk #9 succeeded at 3196 (offset 89 lines).
Hunk #10 succeeded at 3719 (offset 97 lines).
Hunk #11 succeeded at 3936 (offset 103 lines).
Hunk #12 succeeded at 6605 (offset 141 lines).
Hunk #13 succeeded at 7094 (offset 159 lines).
Hunk #14 succeeded at 7184 (offset 159 lines).
Hunk #15 succeeded at 7700 with fuzz 2 (offset 157 lines).
patching file fftools/ffmpeg.h
Hunk #1 succeeded at 634 (offset -32 lines).
patching file fftools/ffmpeg_dec.c
Hunk #1 FAILED at 332.
Hunk #2 FAILED at 901.
2 out of 2 hunks FAILED -- saving rejects to file fftools/ffmpeg_dec.c.rej
patching file fftools/ffmpeg_filter.c
Hunk #1 FAILED at 2368.
Hunk #2 succeeded at 2602 with fuzz 2 (offset 222 lines).
1 out of 2 hunks FAILED -- saving rejects to file fftools/ffmpeg_filter.c.rej
patching file fftools/ffmpeg_hw.c
patching file fftools/ffmpeg_opt.c
Hunk #1 succeeded at 68 (offset -5 lines).
Hunk #2 FAILED at 1499.
1 out of 2 hunks FAILED -- saving rejects to file fftools/ffmpeg_opt.c.rej
patching file libavcodec/Makefile
Hunk #1 succeeded at 169 (offset 1 line).
Hunk #2 succeeded at 1020 with fuzz 1 (offset 9 lines).
patching file libavcodec/hevc-ctrls-v1.h
patching file libavcodec/hevc-ctrls-v2.h
patching file libavcodec/hevc-ctrls-v3.h
patching file libavcodec/hevc-ctrls-v4.h
patching file libavcodec/hevc_parser.c
patching file libavcodec/hevc_refs.c
Hunk #1 FAILED at 99.
Hunk #2 succeeded at 295 (offset -4 lines).
1 out of 2 hunks FAILED -- saving rejects to file libavcodec/hevc_refs.c.rej
patching file libavcodec/hevcdec.c
Hunk #1 succeeded at 344 (offset -1 lines).
Hunk #2 succeeded at 415 with fuzz 2 (offset 1 line).
Hunk #3 succeeded at 449 (offset 4 lines).
Hunk #4 succeeded at 479 (offset 7 lines).
Hunk #5 succeeded at 561 (offset 7 lines).
Hunk #6 succeeded at 2888 (offset 9 lines).
Hunk #7 succeeded at 3407 (offset 22 lines).
Hunk #8 FAILED at 3441.
Hunk #9 succeeded at 3769 (offset 15 lines).
1 out of 9 hunks FAILED -- saving rejects to file libavcodec/hevcdec.c.rej
patching file libavcodec/hwaccel_internal.h
patching file libavcodec/hwaccels.h
Hunk #1 succeeded at 43 with fuzz 1 (offset 3 lines).
patching file libavcodec/hwconfig.h
patching file libavcodec/mmaldec.c
patching file libavcodec/raw.c
patching file libavcodec/rawenc.c
patching file libavcodec/v4l2_buffers.c
patching file libavcodec/v4l2_buffers.h
patching file libavcodec/v4l2_context.c
patching file libavcodec/v4l2_context.h
patching file libavcodec/v4l2_fmt.c
patching file libavcodec/v4l2_m2m.c
Hunk #7 succeeded at 306 with fuzz 1 (offset -1 lines).
Hunk #8 succeeded at 321 (offset -1 lines).
Hunk #9 succeeded at 337 (offset -1 lines).
Hunk #10 succeeded at 394 (offset -1 lines).
patching file libavcodec/v4l2_m2m.h
patching file libavcodec/v4l2_m2m_dec.c
patching file libavcodec/v4l2_m2m_enc.c
patching file libavcodec/v4l2_req_decode_q.c
patching file libavcodec/v4l2_req_decode_q.h
patching file libavcodec/v4l2_req_devscan.c
patching file libavcodec/v4l2_req_devscan.h
patching file libavcodec/v4l2_req_dmabufs.c
patching file libavcodec/v4l2_req_dmabufs.h
patching file libavcodec/v4l2_req_hevc_v1.c
patching file libavcodec/v4l2_req_hevc_v2.c
patching file libavcodec/v4l2_req_hevc_v3.c
patching file libavcodec/v4l2_req_hevc_v4.c
patching file libavcodec/v4l2_req_hevc_vx.c
patching file libavcodec/v4l2_req_media.c
patching file libavcodec/v4l2_req_media.h
patching file libavcodec/v4l2_req_pollqueue.c
patching file libavcodec/v4l2_req_pollqueue.h
patching file libavcodec/v4l2_req_utils.h
patching file libavcodec/v4l2_request_hevc.c
patching file libavcodec/v4l2_request_hevc.h
patching file libavcodec/weak_link.c
patching file libavcodec/weak_link.h
patching file libavdevice/Makefile
patching file libavdevice/alldevices.c
Hunk #1 FAILED at 52.
1 out of 1 hunk FAILED -- saving rejects to file libavdevice/alldevices.c.rej
patching file libavdevice/drm_vout.c
patching file libavdevice/egl_vout.c
patching file libavfilter/Makefile
Hunk #2 succeeded at 535 (offset 3 lines).
patching file libavfilter/allfilters.c
Hunk #1 succeeded at 256 (offset 1 line).
Hunk #2 succeeded at 434 (offset 4 lines).
Hunk #3 succeeded at 508 (offset 5 lines).
patching file libavfilter/buffersink.c
Hunk #1 succeeded at 61 (offset -3 lines).
Hunk #2 succeeded at 133 (offset -28 lines).
Hunk #3 succeeded at 386 (offset -36 lines).
Hunk #4 succeeded at 402 with fuzz 2 (offset -35 lines).
patching file libavfilter/buffersink.h
patching file libavfilter/buffersrc.c
Hunk #1 FAILED at 204.
1 out of 1 hunk FAILED -- saving rejects to file libavfilter/buffersrc.c.rej
patching file libavfilter/vf_deinterlace_v4l2m2m.c
patching file libavfilter/vf_unsand.c
patching file libavformat/matroskaenc.c
Hunk #1 succeeded at 82 (offset 1 line).
Hunk #2 succeeded at 1138 (offset 1 line).
Hunk #3 succeeded at 2936 (offset 1 line).
Hunk #4 succeeded at 2949 (offset 1 line).
patching file libavformat/movenc.c
Hunk #1 succeeded at 6575 (offset 115 lines).
patching file libavformat/rtpenc.c
patching file libavutil/Makefile
Hunk #1 succeeded at 76 (offset 2 lines).
Hunk #2 succeeded at 202 (offset 5 lines).
Hunk #3 succeeded at 224 (offset 6 lines).
patching file libavutil/aarch64/Makefile
patching file libavutil/aarch64/rpi_sand_neon.S
patching file libavutil/aarch64/rpi_sand_neon.h
patching file libavutil/arm/Makefile
patching file libavutil/arm/rpi_sand_neon.S
patching file libavutil/arm/rpi_sand_neon.h
patching file libavutil/frame.c
Hunk #2 succeeded at 29 with fuzz 2.
Hunk #3 succeeded at 989 (offset -22 lines).
patching file libavutil/frame.h
Hunk #1 succeeded at 1045 with fuzz 2 (offset -4 lines).
patching file libavutil/hwcontext_drm.c
patching file libavutil/hwcontext_vulkan.c
patching file libavutil/pixdesc.c
Hunk #1 succeeded at 2791 (offset -2 lines).
patching file libavutil/pixfmt.h
Hunk #1 succeeded at 380 (offset 3 lines).
patching file libavutil/rpi_sand_fn_pw.h
patching file libavutil/rpi_sand_fns.c
patching file libavutil/rpi_sand_fns.h
patching file libswscale/aarch64/rgb2rgb.c
patching file libswscale/aarch64/rgb2rgb_neon.S
patching file libswscale/rgb2rgb.c
patching file libswscale/rgb2rgb.h
patching file libswscale/rgb2rgb_template.c
patching file libswscale/swscale_unscaled.c
patching file libswscale/tests/swscale.c
Hunk #2 succeeded at 99 (offset 20 lines).
Hunk #3 succeeded at 223 (offset 39 lines).
Hunk #4 succeeded at 231 (offset 39 lines).
Hunk #5 FAILED at 376.
Hunk #6 succeeded at 516 with fuzz 2 (offset 81 lines).
Hunk #7 succeeded at 552 (offset 81 lines).
1 out of 7 hunks FAILED -- saving rejects to file libswscale/tests/swscale.c.rej
patching file pi-util/BUILD.txt
patching file pi-util/NOTES.txt
patching file pi-util/TESTMESA.txt
patching file pi-util/clean_usr_libs.sh
patching file pi-util/conf_arm64_native.sh
patching file pi-util/conf_h265.2016.csv
patching file pi-util/conf_h265.2016_HEVC_v1.csv
patching file pi-util/conf_h265.csv
patching file pi-util/conf_native.sh
patching file pi-util/ffconf.py
patching file pi-util/ffperf.py
patching file pi-util/genpatch.sh
patching file pi-util/make_array.py
patching file pi-util/mkinst.sh
patching file pi-util/patkodi.sh
patching file pi-util/perfcmp.py
patching file pi-util/qem.sh
patching file pi-util/testfilt.py
patching file pi-util/v3dusage.py
patching file tests/checkasm/Makefile
Hunk #1 succeeded at 68 (offset 7 lines).
patching file tests/checkasm/checkasm.c
Hunk #1 succeeded at 242 (offset 25 lines).
patching file tests/checkasm/checkasm.h
Hunk #1 succeeded at 110 with fuzz 2 (offset 34 lines).
patching file tests/checkasm/rpi_sand.c
patching file tests/fate/checkasm.mak
Hunk #1 succeeded at 32 with fuzz 2 (offset 3 lines).
patching file tests/checkasm/rpi_sand.c
patching file tests/ref/fate/imgutils
Hunk #1 succeeded at 235 (offset 1 line).
patching file tests/ref/fate/sws-pixdesc-query                                                                                                                                   [ !! ]
 * ERROR: media-video/ffmpeg-7.0.1::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/media-video/ffmpeg-7.0.1/distdir/ffmpeg-rpi-6.1-r3.patch
 *

[Comment 1 tt_1 2024-07-07 07:39:34 UTC]

Created attachment 897253 [details]
output from emerge --info

[Comment 2 tt_1 2024-07-07 07:40:42 UTC]

emerge -pv =ffmpeg-7.0.1 

These are the packages that would be merged, in order:

[ebuild     U #] media-video/ffmpeg-7.0.1:0/58.60.60::gentoo [6.1.1-r5:0/58.60.60::gentoo] USE="alsa bzip2 gmp gnutls gpl iconv libdrm network pic postproc soc svg threads zlib -X (-amf) -amr -amrenc (-appkit) -bluray -bs2b -cdio -chromaprint -chromium -codec2 -cpudetection (-cuda) -dav1d -debug -doc -encode -fdk -flite -fontconfig -frei0r -fribidi -gcrypt -glslang -gme -gsm -hardcoded-tables -iec61883 (-ieee1394) -jack -jpeg2k -jpegxl -kvazaar -ladspa -lcms -libaom -libaribb24 -libass -libcaca -libdvdnav% -libdvdread% -libilbc -libplacebo -librtmp -libsoxr -libtesseract -libv4l -libxml2 -lv2 -lzma (-mipsdspr1) (-mipsdspr2) (-mipsfpu) -modplug -mp3 (-nvenc) -openal (-opencl) -opengl -openh264 -openssl -opus -oss -pulseaudio -qrcode% (-qsv) (-quirc) -rav1e -rubberband -samba -sdl (-shaderc) -snappy -sndio -speex -srt -ssh -static-libs -svt-av1 -test -theora -truetype -twolame -v4l (-vaapi) (-vdpau) -verify-sig -vidstab (-vmaf) -vorbis -vpx -vulkan -webp -x264 -x265 -xvid -zeromq -zimg -zvbi" CPU_FLAGS_ARM="(thumb) (thumb2) (v6) (vfp) vfpv3 -asimddp -i8mm -neon (-v8)" FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher" 0 KiB

Total: 1 package (1 upgrade), Size of downloads: 0 KiB

[Comment 3 James Le Cuirot 2024-07-08 20:17:06 UTC]

I know, I just haven't had a chance to do it yet, partly due to an injury.

[Comment 4 Larry the Git Cow 2024-07-14 15:34:33 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8ff47fb472f00f4f7a9df77a4f531ac33e029d

commit 6a8ff47fb472f00f4f7a9df77a4f531ac33e029d
Author:     James Le Cuirot <[e-mail]>
AuthorDate: 2024-07-14 15:33:17 +0000
Commit:     James Le Cuirot <[e-mail]>
CommitDate: 2024-07-14 15:34:12 +0000

    media-video/ffmpeg: Bump rpi patch for 7.0
    
    Closes: https://bugs.gentoo.org/935704
    Signed-off-by: James Le Cuirot <[e-mail]>

 media-video/ffmpeg/Manifest            | 2 ++
 media-video/ffmpeg/ffmpeg-7.0.1.ebuild | 4 ++--
 media-video/ffmpeg/ffmpeg-9999.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)