[FFmpeg-devel] [PATCH v2 0/3] Some small ASS conversion fixes

[Oneric]

On Sun, Nov 13, 2022 at 22:57:22 +0100, Oneric wrote:
> On Sun, Nov 13, 2022 at 21:01:34 +0000, Soft Works wrote:
> > I am unable to apply any of those patches. Neither v1 nor v2 neither
> > when downloading the series mbox or [2/3] from patchwork nor when
> > saving [2/3] from the e-mail.
> 
> Re patchwork, yes I rechecked and it appears all downloads are now broken
> (see prev message). Regarding applying the mails, all I can say is it
> works for me.

I now know why the mbox files from patchwork don’t work for v1.
For whatever reason patchwork thought it a good idea to reorder the binary
diffs and while doing so separated diff headers from diff content so
nothing makes sense to git anymore. This gives a plausible explanation for
the loongarch error message, but now I’m not sure how the x86 FATE box
manages to apply anything (but whatever it does apply is probably
corrupted explaining the test failures).

The mails received from the list — apart from v3-patch3 — or the archive
with format-patches I sent, ofc still work.

For illustration here’s a truncated bit of the difference between the
received mail after base64 decoding and what patchwork offers as a
download for v1 patch number 2:

diff --git a/tmp/0002-from-mail_v1__decoded_data.patch b/tmp/FFmpeg-devel-2-3-avcodec-ass-accurately-preserve-colours
.patch
index b2a7a93d7a..4691059715 100644
--- a/tmp/0002-from-mail_v1__decoded_data-.patch
+++ b/tmp/FFmpeg-devel-2-3-avcodec-ass-accurately-preserve-colours.patch
@@ -44,6 +154,95 @@ Link to libass’ docs regarding colour mangling:
  tests/ref/fate/sub-webvtt2       | Bin 1648 -> 1668 bytes
  25 files changed, 2 insertions(+)
 
+index 13f393cc86b9f797be24f37a07aafc7272c22e59..516d26af9ab09613f939d004826e44c80b3b1054 100644
+GIT binary patch
+delta 29
+kcmX at kcAITNgHWV%l5>%QZ(>PNW`&i4Uw&Td#=4VC0HTfx{Qv*}
+
+delta 10
+Rcmcc3cARZO!^SDcnE)Fg1kC^d
+
+index be28084887a9b7fb80ae4ff3369cf7192a978919..a97d29f70ba1d3984887eacb6e833abb8a406902 100644
+GIT binary patch
+delta 29
+kcmdnUew2MegHWV%l5>%QZ(>PNW`&i4Uw&Td#yVqW0G!DRJ^%m!
+
+delta 10
+RcmX at gzL9-G!^SCw%m5g91P%ZI
+
[.. and a bunch more additions like this]
@@ -66,14 +265,6 @@ delta 10
 RcmZ1|*(*7rVdE5D9sm~71J3{e
 
 diff --git a/tests/ref/fate/sub-cc b/tests/ref/fate/sub-cc
-index 13f393cc86b9f797be24f37a07aafc7272c22e59..516d26af9ab09613f939d004826e44c80b3b1054 100644
-GIT binary patch
-delta 29
-kcmX at kcAITNgHWV%l5>%QZ(>PNW`&i4Uw&Td#=4VC0HTfx{Qv*}
-
-delta 10
-Rcmcc3cARZO!^SDcnE)Fg1kC^d
-
 diff --git a/tests/ref/fate/sub-cc-realtime b/tests/ref/fate/sub-cc-realtime
 index 169361f540e4dff43a132df1111395e55a19ff73..98dfef55019719911d6c5d9faa0c057cc324f227 100644
 GIT binary patch
@@ -84,14 +275,6 @@ delta 10
 RcmeC+`NBP+VdIn%Rsb0Q1Y!UH
 
 diff --git a/tests/ref/fate/sub-cc-scte20 b/tests/ref/fate/sub-cc-scte20
-index be28084887a9b7fb80ae4ff3369cf7192a978919..a97d29f70ba1d3984887eacb6e833abb8a406902 100644
-GIT binary patch
-delta 29
-kcmdnUew2MegHWV%l5>%QZ(>PNW`&i4Uw&Td#yVqW0G!DRJ^%m!
-
-delta 10
-RcmX at gzL9-G!^SCw%m5g91P%ZI
-
 diff --git a/tests/ref/fate/sub-charenc b/tests/ref/fate/sub-charenc
 index 4efacb073d14b43002b58ab0b4aa55e9d34de029..339137ae0b5485c4c954f859316cf8b413b01505 100644
 GIT binary patch

[.. and more]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20221114/c83cd57f/attachment.sig>