===> Building for handbrake-1.10.0nb1 /bin/mkdir -p /Users/pbulk/build/multimedia/handbrake/work/HandBrake-1.10.0/download /bin/ln -fs /Volumes/data/distfiles/handbrake/libjpeg-turbo-3.1.1.tar.gz /Users/pbulk/build/multimedia/handbrake/work/HandBrake-1.10.0/download /bin/ln -fs /Volumes/data/distfiles/handbrake/ffmpeg-7.1.1.tar.bz2 /Users/pbulk/build/multimedia/handbrake/work/HandBrake-1.10.0/download /bin/ln -fs /Volumes/data/distfiles/handbrake/x265-snapshot-20250729-13276.tar.gz /Users/pbulk/build/multimedia/handbrake/work/HandBrake-1.10.0/download /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/mkdir -p contrib/bin2c/ /Users/pbulk/build/multimedia/handbrake/work/.cwrapper/bin/clang -std=gnu99 -pipe -fmessage-length=0 -Wall -arch arm64 -g0 -O3 -c ../contrib/bin2c/bin2c.c -o contrib/bin2c/bin2c.o /Users/pbulk/build/multimedia/handbrake/work/.cwrapper/bin/clang++ -pipe -Wl,-S -ldovi -L/opt/pkg//opt/pkg/lib -L/opt/pkg/lib -fmessage-length=0 -Wall -arch arm64 -g0 -O3 -o bin2c contrib/bin2c/bin2c.o ld: warning: search path '/Users/pbulk/build/multimedia/handbrake/work/.buildlink//opt/pkg/lib' not found /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/mkdir -p libhb/handbrake/ /opt/pkg/bin/gm4 -Iproject ../libhb/handbrake/project.h.m4 > libhb/handbrake/project.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/audio_remap.h libhb/handbrake/audio_remap.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/audio_resample.h libhb/handbrake/audio_resample.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/av1_common.h libhb/handbrake/av1_common.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/avfilter_priv.h libhb/handbrake/avfilter_priv.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/bitstream.h libhb/handbrake/bitstream.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/colormap.h libhb/handbrake/colormap.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/common.h libhb/handbrake/common.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/compat.h libhb/handbrake/compat.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/decavsub.h libhb/handbrake/decavsub.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/decomb.h libhb/handbrake/decomb.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/dovi_common.h libhb/handbrake/dovi_common.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/dvd.h libhb/handbrake/dvd.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/eedi2.h libhb/handbrake/eedi2.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/encavsub.h libhb/handbrake/encavsub.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/encx264.h libhb/handbrake/encx264.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/extradata.h libhb/handbrake/extradata.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/h264_common.h libhb/handbrake/h264_common.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/h265_common.h libhb/handbrake/h265_common.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/handbrake.h libhb/handbrake/handbrake.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/hb_dict.h libhb/handbrake/hb_dict.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/hb_json.h libhb/handbrake/hb_json.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/hbavfilter.h libhb/handbrake/hbavfilter.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/hbffmpeg.h libhb/handbrake/hbffmpeg.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/hbtypes.h libhb/handbrake/hbtypes.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/hdr10plus.h libhb/handbrake/hdr10plus.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/hwaccel.h libhb/handbrake/hwaccel.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/internal.h libhb/handbrake/internal.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/lang.h libhb/handbrake/lang.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/mf_common.h libhb/handbrake/mf_common.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/nal_units.h libhb/handbrake/nal_units.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/nlmeans.h libhb/handbrake/nlmeans.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/nvenc_common.h libhb/handbrake/nvenc_common.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/param.h libhb/handbrake/param.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/ports.h libhb/handbrake/ports.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/preset.h libhb/handbrake/preset.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/preset_builtin.h libhb/handbrake/preset_builtin.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/qsv_common.h libhb/handbrake/qsv_common.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/rpu.h libhb/handbrake/rpu.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/ssautil.h libhb/handbrake/ssautil.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/taskset.h libhb/handbrake/taskset.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/cp ../libhb/handbrake/vce_common.h libhb/handbrake/vce_common.h /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/mkdir -p contrib/ffmpeg/ sha256 (../download/ffmpeg-7.1.1.tar.bz2) = 0c8da2f11579a01e014fc007cbacf5bb4da1d06afd0b43c7f8097ec7c0f143ba (pass) /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/rm -fr ./contrib/ffmpeg/ffmpeg-7.1.1/ /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/tar xfC ../download/ffmpeg-7.1.1.tar.bz2 ./contrib/ffmpeg/ touch contrib/ffmpeg/.stamp.ffmpeg.extract /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From a7151fbff5325b0d62028c7e921780f83554a56b Mon Sep 17 00:00:00 2001 |From: John Stebbins |Date: Wed, 20 Mar 2024 09:07:15 +0100 |Subject: [PATCH 01/16] mov: read 'name' track tag written by movenc. | |--- | libavformat/mov.c | 26 +++++++++++++++++--------- | 1 file changed, 17 insertions(+), 9 deletions(-) | |diff --git a/libavformat/mov.c b/libavformat/mov.c |index a2333ac1fd..734de0a294 100644 |--- a/libavformat/mov.c |+++ b/libavformat/mov.c -------------------------- Patching file libavformat/mov.c using Plan A... Hunk #1 succeeded at 354 (offset 16 lines). Hunk #2 succeeded at 387 (offset 16 lines). Hunk #3 succeeded at 573 (offset 16 lines). Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 5edf4807db4474da366895be5bcd3d9227afa2eb Mon Sep 17 00:00:00 2001 |From: John Stebbins |Date: Wed, 20 Mar 2024 09:08:52 +0100 |Subject: [PATCH 02/16] movenc: write 3gpp track 'titl' tag | |Apple software used to use 'name' raw tag for track titles. When they rewrote everything with AVFoundation, they switched to using 3gpp 'titl' tag for track titles and 'name' no longer works. |--- | libavformat/movenc.c | 77 ++++++++++++++++++++++---------------------- | 1 file changed, 39 insertions(+), 38 deletions(-) | |diff --git a/libavformat/movenc.c b/libavformat/movenc.c |index d20e45cf81..c526658bb1 100644 |--- a/libavformat/movenc.c |+++ b/libavformat/movenc.c -------------------------- Patching file libavformat/movenc.c using Plan A... Hunk #1 succeeded at 4055 (offset 4 lines). Hunk #2 succeeded at 4157 (offset 4 lines). Hunk #3 succeeded at 4757 (offset 4 lines). Hunk #4 succeeded at 4795 (offset 4 lines). Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 05fcb953565349fb785e5eec3a464c5efaa2d540 Mon Sep 17 00:00:00 2001 |From: John Stebbins |Date: Wed, 20 Mar 2024 09:09:41 +0100 |Subject: [PATCH 03/16] mov: read 3gpp udta tags. | |--- | libavformat/mov.c | 101 ++++++++++++++++++++++++++++++++++++++++++++-- | 1 file changed, 98 insertions(+), 3 deletions(-) | |diff --git a/libavformat/mov.c b/libavformat/mov.c |index 734de0a294..cdeb35d9db 100644 |--- a/libavformat/mov.c |+++ b/libavformat/mov.c -------------------------- Patching file libavformat/mov.c using Plan A... Hunk #1 succeeded at 56. Hunk #2 succeeded at 343 (offset 16 lines). Hunk #3 succeeded at 436 (offset 16 lines). Hunk #4 succeeded at 533 (offset 16 lines). Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 051ca757f9e71da22e2fca0ec833f450d4908ecf Mon Sep 17 00:00:00 2001 |From: John Stebbins |Date: Wed, 20 Mar 2024 09:10:27 +0100 |Subject: [PATCH 04/16] movenc: write 3gpp track names tags for all available | languages | |Metadata keys can have a language suffix. Iterate through all language variations of the metadata key. |--- | libavformat/movenc.c | 25 +++++++++++++++++++++++-- | 1 file changed, 23 insertions(+), 2 deletions(-) | |diff --git a/libavformat/movenc.c b/libavformat/movenc.c |index c526658bb1..3486c6e3e5 100644 |--- a/libavformat/movenc.c |+++ b/libavformat/movenc.c -------------------------- Patching file libavformat/movenc.c using Plan A... Hunk #1 succeeded at 28. Hunk #2 succeeded at 4075 (offset 4 lines). Hunk #3 succeeded at 4166 (offset 4 lines). Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A05-avformat-mov-add-support-audio-fallback-track-ref.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 7950f206991fdf2cdaade40f44f06158091a9f83 Mon Sep 17 00:00:00 2001 |From: John Stebbins |Date: Fri, 12 Apr 2024 10:06:24 -0600 |Subject: [PATCH 05/16] avformat/mov: add support audio fallback track ref | |--- | libavformat/isom.h | 3 +++ | libavformat/mov.c | 35 +++++++++++++++++++++++++++++++++++ | 2 files changed, 38 insertions(+) | |diff --git a/libavformat/isom.h b/libavformat/isom.h |index 4723397048..82429c8b79 100644 |--- a/libavformat/isom.h |+++ b/libavformat/isom.h -------------------------- Patching file libavformat/isom.h using Plan A... Hunk #1 succeeded at 272. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavformat/mov.c b/libavformat/mov.c |index cdeb35d9db..e1e668e40c 100644 |--- a/libavformat/mov.c |+++ b/libavformat/mov.c -------------------------- Patching file libavformat/mov.c using Plan A... Hunk #1 succeeded at 9184 (offset 41 lines). Hunk #2 succeeded at 9303 (offset 41 lines). Hunk #3 succeeded at 10447 (offset 20 lines). Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A06-dvdsubdec-fix-processing-of-partial-packets.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From c402eb2aa3a3913b51e8be96eab963e4f2cb3296 Mon Sep 17 00:00:00 2001 |From: John Stebbins |Date: Wed, 20 Mar 2024 09:11:09 +0100 |Subject: [PATCH 06/16] dvdsubdec: fix processing of partial packets | |Wait for a complete dvd subtitle before processing. | |If the input packet is large enough to start processing, but does not contain complete data, unfinished results are emitted and the following input packet causes an error because the stream is no longer in sync with the decoder. |--- | libavcodec/dvdsubdec.c | 24 +++++++++++++++++------- | 1 file changed, 17 insertions(+), 7 deletions(-) | |diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c |index f8769353a0..68c1f3af53 100644 |--- a/libavcodec/dvdsubdec.c |+++ b/libavcodec/dvdsubdec.c -------------------------- Patching file libavcodec/dvdsubdec.c using Plan A... Hunk #1 succeeded at 230. Hunk #2 succeeded at 246. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A07-dvdsubdec-return-number-of-bytes-used.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From ce11d719d86ce35afaf342f8302d0ccb0bed83e6 Mon Sep 17 00:00:00 2001 |From: John Stebbins |Date: Wed, 20 Mar 2024 09:11:51 +0100 |Subject: [PATCH 07/16] dvdsubdec: return number of bytes used | |Documentation says avcodec_decode_subtitle2 returns the number of bytes used. |--- | libavcodec/dvdsubdec.c | 6 +++++- | 1 file changed, 5 insertions(+), 1 deletion(-) | |diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c |index 68c1f3af53..025f3dbd6f 100644 |--- a/libavcodec/dvdsubdec.c |+++ b/libavcodec/dvdsubdec.c -------------------------- Patching file libavcodec/dvdsubdec.c using Plan A... Hunk #1 succeeded at 548. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A08-dvdsubdec-use-pts-of-initial-packet.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From dd99c72343c9dd696b44eac3a91a07b2f944e78e Mon Sep 17 00:00:00 2001 |From: John Stebbins |Date: Wed, 20 Mar 2024 09:12:27 +0100 |Subject: [PATCH 08/16] dvdsubdec: use pts of initial packet | |When the source is DVD, only the initial packet of a subtitle that spans multiple packets will have a pts value. |--- | libavcodec/dvdsubdec.c | 9 +++++++++ | 1 file changed, 9 insertions(+) | |diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c |index 025f3dbd6f..afc88656cf 100644 |--- a/libavcodec/dvdsubdec.c |+++ b/libavcodec/dvdsubdec.c -------------------------- Patching file libavcodec/dvdsubdec.c using Plan A... Hunk #1 succeeded at 45. Hunk #2 succeeded at 535. Hunk #3 succeeded at 554. Hunk #4 succeeded at 566. Hunk #5 succeeded at 577. Hunk #6 succeeded at 704. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A09-dvdsubdec-add-an-option-to-output-subtitles-with-emp.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 68545e5d08e3726615f58d533c843edcff80d479 Mon Sep 17 00:00:00 2001 |From: Damiano Galassi |Date: Wed, 20 Mar 2024 09:14:19 +0100 |Subject: [PATCH 09/16] dvdsubdec: add an option to output subtitles with empty | or fully transparent rects. | |--- | libavcodec/dvdsubdec.c | 4 +++- | 1 file changed, 3 insertions(+), 1 deletion(-) | |diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c |index afc88656cf..bd32b7dc2b 100644 |--- a/libavcodec/dvdsubdec.c |+++ b/libavcodec/dvdsubdec.c -------------------------- Patching file libavcodec/dvdsubdec.c using Plan A... Hunk #1 succeeded at 46. Hunk #2 succeeded at 570. Hunk #3 succeeded at 722. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A10-ccaption_dec-fix-pts-in-real_time-mode.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From e4b1555ed0c72377c41c66a5198f5c1bf9c321d0 Mon Sep 17 00:00:00 2001 |From: Damiano Galassi |Date: Wed, 20 Mar 2024 09:14:43 +0100 |Subject: [PATCH 10/16] ccaption_dec: fix pts in real_time mode. | |end_display_time and pts changes should be performed only in non real_time mode. |--- | libavcodec/ccaption_dec.c | 9 +++++---- | 1 file changed, 5 insertions(+), 4 deletions(-) | |diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c |index d8b992bb94..4a38664875 100644 |--- a/libavcodec/ccaption_dec.c |+++ b/libavcodec/ccaption_dec.c -------------------------- Patching file libavcodec/ccaption_dec.c using Plan A... Hunk #1 succeeded at 889. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A11-avformat-matroskaenc-return-error-if-aac-extradata-c.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 62cb5b9b2e023911428566246fde21559fa9c348 Mon Sep 17 00:00:00 2001 |From: Damiano Galassi |Date: Wed, 20 Mar 2024 09:15:21 +0100 |Subject: [PATCH 11/16] avformat/matroskaenc: return error if aac extradata | changes extradata changing would result in an invalid stream. also, as the | code was written, rewriting extradata was corrupting the track header | resulting in an invalid file. | |--- | libavformat/matroskaenc.c | 10 ++++++++++ | 1 file changed, 10 insertions(+) | |diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c |index 60c896e964..6672da26ab 100644 |--- a/libavformat/matroskaenc.c |+++ b/libavformat/matroskaenc.c -------------------------- Patching file libavformat/matroskaenc.c using Plan A... Hunk #1 succeeded at 2933. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A12-videotoolbox-disable-H.264-10-bit-on-Intel-macOS-it-.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 6085fc84ba629e701e89dff9f9091d1374a10ad1 Mon Sep 17 00:00:00 2001 |From: Damiano Galassi |Date: Wed, 20 Mar 2024 09:17:17 +0100 |Subject: [PATCH 12/16] videotoolbox: disable H.264 10-bit on Intel macOS, it's | not decoded properly. Disable H.264 level 6.1 and 6.2 too, seems to have | issue in some specific cases. | |--- | libavcodec/videotoolbox.c | 17 +++++++++++++++++ | 1 file changed, 17 insertions(+) | |diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c |index 505483ef66..bbb00d2c8a 100644 |--- a/libavcodec/videotoolbox.c |+++ b/libavcodec/videotoolbox.c -------------------------- Patching file libavcodec/videotoolbox.c using Plan A... Hunk #1 succeeded at 916. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A13-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 890d42fdfef3d61a5dfcfa731df75c0557ed107b Mon Sep 17 00:00:00 2001 |From: Vladyslav Sosunovych |Date: Wed, 20 Mar 2024 09:17:42 +0100 |Subject: [PATCH 13/16] libswscale: fix yuv420p to p01xle color conversion bug | |--- | libswscale/swscale_unscaled.c | 6 +++--- | 1 file changed, 3 insertions(+), 3 deletions(-) | |diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c |index dc1d5f3593..73e7111d1f 100644 |--- a/libswscale/swscale_unscaled.c |+++ b/libswscale/swscale_unscaled.c -------------------------- Patching file libswscale/swscale_unscaled.c using Plan A... Hunk #1 succeeded at 341 (offset 2 lines). Hunk #2 succeeded at 352 (offset 2 lines). Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A14-hevc_mp4toannexb.c-fix-qsv-decode-of-10bit-hdr.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From a6e754b2ace03fbced335184539970212039c745 Mon Sep 17 00:00:00 2001 |From: galinart |Date: Wed, 20 Mar 2024 09:22:21 +0100 |Subject: [PATCH 14/16] hevc_mp4toannexb.c: fix qsv decode of 10bit hdr. | |--- | libavcodec/bsf/hevc_mp4toannexb.c | 6 +++++- | 1 file changed, 5 insertions(+), 1 deletion(-) | |diff --git a/libavcodec/bsf/hevc_mp4toannexb.c b/libavcodec/bsf/hevc_mp4toannexb.c |index f281185769..241fa07a0f 100644 |--- a/libavcodec/bsf/hevc_mp4toannexb.c |+++ b/libavcodec/bsf/hevc_mp4toannexb.c -------------------------- Patching file libavcodec/bsf/hevc_mp4toannexb.c using Plan A... Hunk #1 succeeded at 125. Hunk #2 succeeded at 159. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A15-Expose-the-unmodified-Dolby-Vision-RPU-T35-buffers.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 0f4a6a95ae5b73e4dc51f9ca3f94785fe5056bfc Mon Sep 17 00:00:00 2001 |From: Damiano Galassi |Date: Mon, 30 Sep 2024 13:41:29 +0200 |Subject: [PATCH 15/16] Expose the unmodified Dolby Vision RPU T35 buffers | |--- | libavcodec/av1dec.c | 14 ++++++++++++++ | libavcodec/libdav1d.c | 14 ++++++++++++++ | libavutil/frame.c | 1 + | libavutil/frame.h | 6 ++++++ | 4 files changed, 35 insertions(+) | |diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c |index 1d5b9ef4f4..f0d22af314 100644 |--- a/libavcodec/av1dec.c |+++ b/libavcodec/av1dec.c -------------------------- Patching file libavcodec/av1dec.c using Plan A... Hunk #1 succeeded at 1002. Hunk #2 succeeded at 1016. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c |index 546b42e9c6..04d0ca4b90 100644 |--- a/libavcodec/libdav1d.c |+++ b/libavcodec/libdav1d.c -------------------------- Patching file libavcodec/libdav1d.c using Plan A... Hunk #1 succeeded at 563 (offset 1 line). Hunk #2 succeeded at 577 (offset 1 line). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavutil/frame.c b/libavutil/frame.c |index f0a0dba018..ab48eaab2b 100644 |--- a/libavutil/frame.c |+++ b/libavutil/frame.c -------------------------- Patching file libavutil/frame.c using Plan A... Hunk #1 succeeded at 45. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavutil/frame.h b/libavutil/frame.h |index f7806566d5..8f2bbfdf6f 100644 |--- a/libavutil/frame.h |+++ b/libavutil/frame.h -------------------------- Patching file libavutil/frame.h using Plan A... Hunk #1 succeeded at 200. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A16-avcodec-amfenc-Add-support-for-on-demand-key-frames.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From d44504cc55d5a67c9c42941d7c65b963472957a9 Mon Sep 17 00:00:00 2001 |From: Cameron Gutman |Date: Mon, 23 Sep 2024 11:14:13 +0200 |Subject: [PATCH 16/16] avcodec/amfenc: Add support for on-demand key frames | |--- | libavcodec/amfenc.c | 41 +++++++++++++++++++++++++++++++++++++++- | libavcodec/amfenc.h | 1 + | libavcodec/amfenc_av1.c | 1 + | libavcodec/amfenc_h264.c | 1 + | libavcodec/amfenc_hevc.c | 1 + | 5 files changed, 44 insertions(+), 1 deletion(-) | |diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c |index a47aea6108..225fb9df27 100644 |--- a/libavcodec/amfenc.c |+++ b/libavcodec/amfenc.c -------------------------- Patching file libavcodec/amfenc.c using Plan A... Hunk #1 succeeded at 766. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h |index d985d01bb1..0f2abcbd82 100644 |--- a/libavcodec/amfenc.h |+++ b/libavcodec/amfenc.h -------------------------- Patching file libavcodec/amfenc.h using Plan A... Hunk #1 succeeded at 114. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c |index 2a7a782063..b40d54f70c 100644 |--- a/libavcodec/amfenc_av1.c |+++ b/libavcodec/amfenc_av1.c -------------------------- Patching file libavcodec/amfenc_av1.c using Plan A... Hunk #1 succeeded at 116. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c |index 8edd39c633..959be9eab6 100644 |--- a/libavcodec/amfenc_h264.c |+++ b/libavcodec/amfenc_h264.c -------------------------- Patching file libavcodec/amfenc_h264.c using Plan A... Hunk #1 succeeded at 133. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c |index 4898824f3a..fc25dcec1a 100644 |--- a/libavcodec/amfenc_hevc.c |+++ b/libavcodec/amfenc_hevc.c -------------------------- Patching file libavcodec/amfenc_hevc.c using Plan A... Hunk #1 succeeded at 100. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A17-avcodec-amfenc-properly-set-primaries-transfer-and-m.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From cb67a100fcdecd97d0bd78a31c4c17c60682c2e0 Mon Sep 17 00:00:00 2001 |From: Damiano Galassi |Date: Sat, 19 Oct 2024 14:31:13 +0200 |Subject: [PATCH] avcodec/amfenc: properly set primaries, transfer, and matrix | values | |HEVC and AV1 encoders had hard-coded color values for 8-bit and 10-bit depths, |and they were completely disregarding the provided values. |--- | libavcodec/amfenc.c | 109 +++++++++++++++++++++++++++++++++++++++ | libavcodec/amfenc.h | 2 + | libavcodec/amfenc_av1.c | 16 +++--- | libavcodec/amfenc_h264.c | 10 ++-- | libavcodec/amfenc_hevc.c | 15 +++--- | 5 files changed, 129 insertions(+), 23 deletions(-) | |diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c |index 225fb9df27..a83f5b2013 100644 |--- a/libavcodec/amfenc.c |+++ b/libavcodec/amfenc.c -------------------------- Patching file libavcodec/amfenc.c using Plan A... Hunk #1 succeeded at 917. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h |index 0f2abcbd82..0c0624e786 100644 |--- a/libavcodec/amfenc.h |+++ b/libavcodec/amfenc.h -------------------------- Patching file libavcodec/amfenc.h using Plan A... Hunk #1 succeeded at 174. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c |index b40d54f70c..a947c1d232 100644 |--- a/libavcodec/amfenc_av1.c |+++ b/libavcodec/amfenc_av1.c -------------------------- Patching file libavcodec/amfenc_av1.c using Plan A... Hunk #1 succeeded at 187. Hunk #2 succeeded at 241. Hunk #3 succeeded at 257. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c |index 959be9eab6..2406f7401f 100644 |--- a/libavcodec/amfenc_h264.c |+++ b/libavcodec/amfenc_h264.c -------------------------- Patching file libavcodec/amfenc_h264.c using Plan A... Hunk #1 succeeded at 202. Hunk #2 succeeded at 276. Hunk #3 succeeded at 294. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c |index fc25dcec1a..9d3604d0ea 100644 |--- a/libavcodec/amfenc_hevc.c |+++ b/libavcodec/amfenc_hevc.c -------------------------- Patching file libavcodec/amfenc_hevc.c using Plan A... Hunk #1 succeeded at 168. Hunk #2 succeeded at 244. Hunk #3 succeeded at 260. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A18-libavcodec-qsvenc-update-has_b_frames-value.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 95676fcc5c7141124a10bab0498110aed88680ce Mon Sep 17 00:00:00 2001 |From: galinart |Date: Thu, 17 Oct 2024 16:17:36 +0100 |Subject: [PATCH] libavcodec/qsvenc.c: update has_b_frames value after | initialization of encoder | |--- | libavcodec/qsvenc.c | 7 +++++++ | 1 file changed, 7 insertions(+) | |diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c |index 8200a14..c2bb5e5 100644 |--- a/libavcodec/qsvenc.c |+++ b/libavcodec/qsvenc.c -------------------------- Patching file libavcodec/qsvenc.c using Plan A... Hunk #1 succeeded at 1842. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A19-libavcodec-qsv-enable-av1-scc.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 71b77865d4955440106015bd08172b876abed1f5 Mon Sep 17 00:00:00 2001 |From: galinart |Date: Tue, 12 Nov 2024 15:50:06 +0000 |Subject: [PATCH] qsv: enable av1 scc | |--- | libavcodec/qsvenc.c | 42 +++++++++++++++++++++++++++++++++++++++++ | libavcodec/qsvenc.h | 8 +++++++- | libavcodec/qsvenc_av1.c | 4 ++++ | 3 files changed, 53 insertions(+), 1 deletion(-) | |diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c |index c2bb5e5..284b608 100644 |--- a/libavcodec/qsvenc.c |+++ b/libavcodec/qsvenc.c -------------------------- Patching file libavcodec/qsvenc.c using Plan A... Hunk #1 succeeded at 494. Hunk #2 succeeded at 569. Hunk #3 succeeded at 1292. Hunk #4 succeeded at 1421. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h |index 4bc77f2..2e0a19b 100644 |--- a/libavcodec/qsvenc.h |+++ b/libavcodec/qsvenc.h -------------------------- Patching file libavcodec/qsvenc.h using Plan A... Hunk #1 succeeded at 38. Hunk #2 succeeded at 189. Hunk #3 succeeded at 323. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/qsvenc_av1.c b/libavcodec/qsvenc_av1.c |index a86b409..4f035f3 100644 |--- a/libavcodec/qsvenc_av1.c |+++ b/libavcodec/qsvenc_av1.c -------------------------- Patching file libavcodec/qsvenc_av1.c using Plan A... Hunk #1 succeeded at 189. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A20-Revert-avcodec-amfenc-GPU-driver-version-check.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 9d5ef6ed5f21ccfb746667106fa1df3fdeef1a80 Mon Sep 17 00:00:00 2001 |From: Damiano Galassi |Date: Sat, 19 Oct 2024 09:50:44 +0200 |Subject: [PATCH] Revert "avcodec/amfenc: GPU driver version check" | |This reverts commit eda3fc60534c4a30f49c930611d4130427d08ff1. | |There is hardware with HEVC 10-bit encoders that has no updated drivers yet. |--- | libavcodec/amfenc.c | 4 ---- | 1 file changed, 4 deletions(-) | |diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c |index a83f5b2013..95fce9ac96 100644 |--- a/libavcodec/amfenc.c |+++ b/libavcodec/amfenc.c -------------------------- Patching file libavcodec/amfenc.c using Plan A... Hunk #1 succeeded at 415. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A21-lavc-pgssubdec-Add-graphic-plane-and-cropping.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 2a2fdb2c75d74e37840597cf88578d43ab2f5f70 Mon Sep 17 00:00:00 2001 |From: cubicibo <55701024+cubicibo@users.noreply.github.com> |Date: Thu, 22 Aug 2024 22:57:54 +0200 |Subject: [PATCH] lavc/pgssubdec: Add graphic plane and cropping. | |--- | libavcodec/pgssubdec.c | 554 ++++++++++++++++++++++++++--------------- | 1 file changed, 353 insertions(+), 201 deletions(-) | |diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c |index 5f76f12615..973a264105 100644 |--- a/libavcodec/pgssubdec.c |+++ b/libavcodec/pgssubdec.c -------------------------- Patching file libavcodec/pgssubdec.c using Plan A... Hunk #1 succeeded at 35 (offset 1 line). Hunk #2 succeeded at 50 (offset 1 line). Hunk #3 succeeded at 131 (offset 1 line). Hunk #4 succeeded at 172 (offset 1 line). Hunk #5 succeeded at 188 (offset 1 line). Hunk #6 succeeded at 241 (offset 1 line). Hunk #7 succeeded at 267 (offset 1 line). Hunk #8 succeeded at 290 (offset 1 line). Hunk #9 succeeded at 362 (offset 1 line). Hunk #10 succeeded at 435 (offset 1 line). Hunk #11 succeeded at 454 (offset 1 line). Hunk #12 succeeded at 581 (offset 1 line). Hunk #13 succeeded at 616 (offset 1 line). Hunk #14 succeeded at 800 (offset 1 line). Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A22-avformat-mov-read-and-write-additional-iTunes-style-.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From b62c3a69a5f286eee2be4d14cf3705c476a953a4 Mon Sep 17 00:00:00 2001 |From: Damiano Galassi |Date: Tue, 18 Feb 2025 07:32:08 +0100 |Subject: [PATCH 1/2] avformat/mov: read and write additional iTunes style | metadata | |--- | libavformat/mov.c | 67 +++++++++++++++++++++++++++++++++++++++++- | libavformat/movenc.c | 70 +++++++++++++++++++++++++++++++++++++++++--- | 2 files changed, 132 insertions(+), 5 deletions(-) | |diff --git a/libavformat/mov.c b/libavformat/mov.c |index e1e668e40c..e64b0dbe63 100644 |--- a/libavformat/mov.c |+++ b/libavformat/mov.c -------------------------- Patching file libavformat/mov.c using Plan A... Hunk #1 succeeded at 132. Hunk #2 succeeded at 460 (offset 16 lines). Hunk #3 succeeded at 485 (offset 16 lines). Hunk #4 succeeded at 502 (offset 16 lines). Hunk #5 succeeded at 515 (offset 16 lines). Hunk #6 succeeded at 533 (offset 16 lines). Hunk #7 succeeded at 544 (offset 16 lines). Hunk #8 succeeded at 568 (offset 16 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavformat/movenc.c b/libavformat/movenc.c |index 3486c6e3e5..11df7b0368 100644 |--- a/libavformat/movenc.c |+++ b/libavformat/movenc.c -------------------------- Patching file libavformat/movenc.c using Plan A... Hunk #1 succeeded at 4561 (offset 4 lines). Hunk #2 succeeded at 4581 (offset 4 lines). Hunk #3 succeeded at 4639 (offset 4 lines). Hunk #4 succeeded at 4651 (offset 4 lines). Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A23-avformat-movenc-write-iTunEXTC-and-iTunMOVI-metadata.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 2f4b1e3b6818ade62ae19e0abdcefdd50d401ad8 Mon Sep 17 00:00:00 2001 |From: Damiano Galassi |Date: Thu, 13 Feb 2025 09:46:30 +0100 |Subject: [PATCH 2/2] avformat/movenc: write iTunEXTC and iTunMOVI metadata | |--- | libavformat/movenc.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ | 1 file changed, 45 insertions(+) | |diff --git a/libavformat/movenc.c b/libavformat/movenc.c |index 11df7b0368..c45f15ad77 100644 |--- a/libavformat/movenc.c |+++ b/libavformat/movenc.c -------------------------- Patching file libavformat/movenc.c using Plan A... Hunk #1 succeeded at 4556 (offset 4 lines). Hunk #2 succeeded at 4751 (offset 4 lines). Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A24-AV1-videotoolbox.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From f9c5c5358cfef3847674c6f3b3ded9611ebc5647 Mon Sep 17 00:00:00 2001 |From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= |Date: Fri, 10 Nov 2023 22:11:44 +0200 |Subject: [PATCH] avcodec/videotoolbox: add AV1 hardware acceleration |MIME-Version: 1.0 |Content-Type: text/plain; charset=UTF-8 |Content-Transfer-Encoding: 8bit | |Use AV1DecContext's current_obu to access the original OBUs, and |feed them to videotoolbox, rather than the bare slice data passed |via decode_slice. | |This requires a small addition to AV1DecContext, for keeping track |of the current range of OBUs that belong to the current frame. | |Co-authored-by: Ruslan Chernenko |Co-authored-by: Martin Storsjö |Signed-off-by: Martin Storsjö |--- | configure | 4 ++ | libavcodec/Makefile | 1 + | libavcodec/av1dec.c | 22 ++++++- | libavcodec/av1dec.h | 3 +- | libavcodec/hwaccels.h | 1 + | libavcodec/version.h | 2 +- | libavcodec/videotoolbox.c | 34 +++++++++++ | libavcodec/videotoolbox_av1.c | 105 ++++++++++++++++++++++++++++++++++ | libavcodec/vt_internal.h | 4 ++ | 9 files changed, 171 insertions(+), 5 deletions(-) | create mode 100644 libavcodec/videotoolbox_av1.c | |diff --git a/configure b/configure |index c8fb49a7a4a58..dc1b9b2bea1be 100755 |--- a/configure |+++ b/configure -------------------------- Patching file configure using Plan A... Hunk #1 succeeded at 2461 (offset -6 lines). Hunk #2 succeeded at 3173 (offset -2 lines). Hunk #3 succeeded at 6702 (offset -9 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/Makefile b/libavcodec/Makefile |index a4fcce3b42156..21188b2479c73 100644 |--- a/libavcodec/Makefile |+++ b/libavcodec/Makefile -------------------------- Patching file libavcodec/Makefile using Plan A... Hunk #1 succeeded at 1008. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c |index 1d5b9ef4f4c62..6a9de07d16faa 100644 |--- a/libavcodec/av1dec.c |+++ b/libavcodec/av1dec.c -------------------------- Patching file libavcodec/av1dec.c using Plan A... Hunk #1 succeeded at 541. Hunk #2 succeeded at 569. Hunk #3 succeeded at 596. Hunk #4 succeeded at 1460 (offset 14 lines). Hunk #5 succeeded at 1474 (offset 14 lines). Hunk #6 succeeded at 1505 (offset 14 lines). Hunk #7 succeeded at 1532 (offset 14 lines). Hunk #8 succeeded at 1553 (offset 14 lines). Hunk #9 succeeded at 1621 (offset 14 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h |index 8b2a7b08961e6..10c807f73f98f 100644 |--- a/libavcodec/av1dec.h |+++ b/libavcodec/av1dec.h -------------------------- Patching file libavcodec/av1dec.h using Plan A... Hunk #1 succeeded at 114. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/hwaccels.h b/libavcodec/hwaccels.h |index 5171e4c7d7357..2b9bdc8fc97ad 100644 |--- a/libavcodec/hwaccels.h |+++ b/libavcodec/hwaccels.h -------------------------- Patching file libavcodec/hwaccels.h using Plan A... Hunk #1 succeeded at 26. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c |index 505483ef66d7a..a5a76e83271fc 100644 |--- a/libavcodec/videotoolbox.c |+++ b/libavcodec/videotoolbox.c -------------------------- Patching file libavcodec/videotoolbox.c using Plan A... Hunk #1 succeeded at 56. Hunk #2 succeeded at 96. Hunk #3 succeeded at 870. Hunk #4 succeeded at 943. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/videotoolbox_av1.c b/libavcodec/videotoolbox_av1.c |new file mode 100644 |index 0000000000000..b4d39194d5d0f |--- /dev/null |+++ b/libavcodec/videotoolbox_av1.c -------------------------- (Creating file libavcodec/videotoolbox_av1.c...) Patching file libavcodec/videotoolbox_av1.c using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/vt_internal.h b/libavcodec/vt_internal.h |index 9502d7c7dc373..effa96fc15c92 100644 |--- a/libavcodec/vt_internal.h |+++ b/libavcodec/vt_internal.h -------------------------- Patching file libavcodec/vt_internal.h using Plan A... Hunk #1 succeeded at 56. Hunk #2 succeeded at 67. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A25-videotoolbox-speedup-decoding.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 1325e2dabe9220f0d24eb0da3c9c98b3f10efc88 Mon Sep 17 00:00:00 2001 |From: Damiano Galassi |Date: Sat, 15 Feb 2025 09:47:36 +0100 |Subject: [PATCH] videotoolbox: speedup decoding | |HandBrake doesn't need OpenGL compatibility or CVBuffer attachments, disable both for a minor performance improvement. |Align buffers to 16 to avoid additional automatic pixel conversions in VTCompressionSession. |--- | libavcodec/videotoolbox.c | 5 +---- | libavutil/hwcontext_videotoolbox.c | 12 +++++++++++- | 2 files changed, 12 insertions(+), 5 deletions(-) | |diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c |index bbb00d2c8a..75fa4c6709 100644 |--- a/libavcodec/videotoolbox.c |+++ b/libavcodec/videotoolbox.c -------------------------- Patching file libavcodec/videotoolbox.c using Plan A... Hunk #1 succeeded at 132 (offset 24 lines). Hunk #2 succeeded at 811 (offset 24 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c |index 122a61d5e7..04e0f0c418 100644 |--- a/libavutil/hwcontext_videotoolbox.c |+++ b/libavutil/hwcontext_videotoolbox.c -------------------------- Patching file libavutil/hwcontext_videotoolbox.c using Plan A... Hunk #1 succeeded at 183. Hunk #2 succeeded at 217. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A28-enable-av1_mf-encoder.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/configure b/configure |index d77a55b653..810d34dc06 100755 |--- a/configure |+++ b/configure -------------------------- Patching file configure using Plan A... Hunk #1 succeeded at 3339 (offset 3 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c |index aa0fc47647..f5317616b7 100644 |--- a/libavcodec/allcodecs.c |+++ b/libavcodec/allcodecs.c -------------------------- Patching file libavcodec/allcodecs.c using Plan A... Hunk #1 succeeded at 838. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/mf_utils.c b/libavcodec/mf_utils.c |index 48e3a63efc..ff44130ca9 100644 |--- a/libavcodec/mf_utils.c |+++ b/libavcodec/mf_utils.c -------------------------- Patching file libavcodec/mf_utils.c using Plan A... Hunk #1 succeeded at 240. Hunk #2 succeeded at 508. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/mf_utils.h b/libavcodec/mf_utils.h |index 387c005f38..a59b36d015 100644 |--- a/libavcodec/mf_utils.h |+++ b/libavcodec/mf_utils.h -------------------------- Patching file libavcodec/mf_utils.h using Plan A... Hunk #1 succeeded at 113. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c |index b8f8a25f43..c062d87f11 100644 |--- a/libavcodec/mfenc.c |+++ b/libavcodec/mfenc.c -------------------------- Patching file libavcodec/mfenc.c using Plan A... Hunk #1 succeeded at 1315. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A30-qsv-fixed-BT2020-BT709-conversion.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 9ff8a988aeb77fc8501f27e28d924a350d52c8a8 Mon Sep 17 00:00:00 2001 |From: galinart |Date: Fri, 21 Feb 2025 09:41:34 +0000 |Subject: [PATCH] fixed BT2020 -> BT709 conversion via VPP | |--- | libavfilter/vf_vpp_qsv.c | 6 +++--- | 1 file changed, 3 insertions(+), 3 deletions(-) | |diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c |index 7f05f1f..223e919 100644 |--- a/libavfilter/vf_vpp_qsv.c |+++ b/libavfilter/vf_vpp_qsv.c -------------------------- Patching file libavfilter/vf_vpp_qsv.c using Plan A... Hunk #1 succeeded at 494. Hmm... Ignoring the trailing garbage. done /Users/pbulk/build/multimedia/handbrake/work/.tools/bin/patch -t -N -p1 -d ./contrib/ffmpeg/ffmpeg-7.1.1/ < ../contrib/ffmpeg/A31-Parse-EAC3-Atmos-ComplexityIndex-for-MP4-remuxing.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From d04f99e1c58623777d6405a7d5c02ff09fcf3117 Mon Sep 17 00:00:00 2001 |From: nyanmisaka |From: James Almer |Date: Tue, 3 Jun 2025 23:41:02 +0800 |Subject: [PATCH] Parse EAC3 Atmos ComplexityIndex for MP4 remuxing | |Signed-off-by: James Almer |--- | libavcodec/ac3_parser.c | 225 ++++++++++++++++++++++++++++++- | libavcodec/ac3_parser_internal.h | 19 +++ | libavcodec/ac3dec.c | 88 +++--------- | libavcodec/ac3dec.h | 3 +- | libavcodec/ac3defs.h | 2 + | libavcodec/eac3dec.c | 154 +++------------------ | libavformat/movenc.c | 30 ++--- | 7 files changed, 297 insertions(+), 224 deletions(-) | |diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c |index 69989690dd..a8bc3afc74 100644 |--- a/libavcodec/ac3_parser.c |+++ b/libavcodec/ac3_parser.c -------------------------- Patching file libavcodec/ac3_parser.c using Plan A... Hunk #1 succeeded at 73. Hunk #2 succeeded at 344. Hunk #3 succeeded at 380. Hunk #4 succeeded at 421. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/ac3_parser_internal.h b/libavcodec/ac3_parser_internal.h |index 46814bfb1f..ab5df34003 100644 |--- a/libavcodec/ac3_parser_internal.h |+++ b/libavcodec/ac3_parser_internal.h -------------------------- Patching file libavcodec/ac3_parser_internal.h using Plan A... Hunk #1 succeeded at 46. Hunk #2 succeeded at 63. Hunk #3 succeeded at 89. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c |index 3cc20f32a9..fcd165057d 100644 |--- a/libavcodec/ac3dec.c |+++ b/libavcodec/ac3dec.c -------------------------- Patching file libavcodec/ac3dec.c using Plan A... Hunk #1 succeeded at 252. Hunk #2 succeeded at 309. Hunk #3 succeeded at 1511. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h |index 98de7b5abf..863651c561 100644 |--- a/libavcodec/ac3dec.h |+++ b/libavcodec/ac3dec.h -------------------------- Patching file libavcodec/ac3dec.h using Plan A... Hunk #1 succeeded at 255. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/ac3defs.h b/libavcodec/ac3defs.h |index ff92f0ac4a..508f4d93f6 100644 |--- a/libavcodec/ac3defs.h |+++ b/libavcodec/ac3defs.h -------------------------- Patching file libavcodec/ac3defs.h using Plan A... Hunk #1 succeeded at 34. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c |index 2b3bffda6e..c5095b1917 100644 |--- a/libavcodec/eac3dec.c |+++ b/libavcodec/eac3dec.c -------------------------- Patching file libavcodec/eac3dec.c using Plan A... Hunk #1 succeeded at 53. Hunk #2 succeeded at 285. Hunk #3 succeeded at 321. Hunk #4 succeeded at 332. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/libavformat/movenc.c b/libavformat/movenc.c |index d6effda6fa..73704dcee8 100644 |--- a/libavformat/movenc.c |+++ b/libavformat/movenc.c -------------------------- Patching file libavformat/movenc.c using Plan A... Hunk #1 succeeded at 394 (offset 1 line). Hunk #2 succeeded at 477 (offset 1 line). Hunk #3 succeeded at 537 (offset 1 line). Hunk #4 succeeded at 547 (offset 1 line). Hunk #5 succeeded at 606 (offset 1 line). Hunk #6 succeeded at 623 (offset 1 line). Hunk #7 succeeded at 631 (offset 1 line). Hmm... Ignoring the trailing garbage. done touch contrib/ffmpeg/.stamp.ffmpeg.patch ERROR: download failure; ; continuing. ERROR: download failure; ; stop. downloading https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/xz-5.8.1.tar.bz2 to ../download/xz-5.8.1.tar.bz2 downloading https://tukaani.org/xz/xz-5.8.1.tar.bz2 to ../download/xz-5.8.1.tar.bz2 gmake: *** [../contrib/xz/module.rules:2: ../download/xz-5.8.1.tar.bz2] Error 1 *** Error code 2 Stop. bmake[1]: stopped making "all" in /Volumes/data/jenkins/workspace/pkgsrc-macos-trunk-arm64/multimedia/handbrake *** Error code 1 Stop. bmake: stopped making "all" in /Volumes/data/jenkins/workspace/pkgsrc-macos-trunk-arm64/multimedia/handbrake