[Cin] latest hacks

[Andrea paz]

Like yesterday, today "git am" fails leaving many errors. See attachment.
I guess, due to my incompetence, I can only apply the patches one by one.
NOTE: having downloaded ffmpeg-4.4, should I delete ffmpeg-4.3 and all
its patches?
-------------- next part --------------
$ LC_ALL=C git am /home/paz/Download/randrik9/*.patch
Applying: constify fileffmpeg.C
Applying: ifdef for DV
Applying: TERMUX ifdefs in guicast
Applying: libzmpeg TERMUX ifdefs
Applying: Add libzmpeg ifdef in fileac3, move fireware objects into their own group in Makefile in cinelerra/
Applying: more ifdefs for file.C (ac3 demand libzmpeg)
Applying: configure.ac update for libaom 3.1.0
Applying: configure.ac update for ffmpeg-4.4
Applying: configure.ac change for non-x86 cflags
Applying: libaom 3.1.0 and libwebp 1.1.0 patches for thirdparty
.git/rebase-apply/patch:21: trailing whitespace.
 
.git/rebase-apply/patch:25: trailing whitespace.
 
.git/rebase-apply/patch:30: trailing whitespace.
 
.git/rebase-apply/patch:35: trailing whitespace.
 
.git/rebase-apply/patch:46: trailing whitespace.
 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Applying: add ffmpeg-4.4 patches into thirdparty/src
.git/rebase-apply/patch:33: trailing whitespace.
 
.git/rebase-apply/patch:52: trailing whitespace.
 
.git/rebase-apply/patch:56: trailing whitespace.
 
.git/rebase-apply/patch:76: trailing whitespace.
 
.git/rebase-apply/patch:78: trailing whitespace.
 
warning: squelched 10 whitespace errors
warning: 15 lines add whitespace errors.
Applying: libaom and libopus cfg fixes for termux/arm
Applying: configure.ac ifdef for mjpegtools on non-x86
Applying: ifdef commercials db only for x86
Applying: fixed x86 ifdefs
Applying: add termux-specific include path
Applying: configure.ac - add -liconv for termux
Applying: attempt to fix _probe function memory leak
Applying: additional XOpenIM call in bcwindowbase.C
Applying: change type of j variable in virtualanode.C to int64_t
Applying: libbthread source and Makefile patch (not integrated into buildsystem ye
.git/rebase-apply/patch:18: trailing whitespace.
+       cat `ls *.c` > just-pt.c 
.git/rebase-apply/patch:19: trailing whitespace.
+       g++ -c -o jpt.o just-pt.c -I. 
.git/rebase-apply/patch:20: trailing whitespace.
+       ar crs jpt.a jpt.o 
warning: 3 lines add whitespace errors.
Applying: Additonal mjpegtools patches for termux (not ifdefed)
.git/rebase-apply/patch:21: space before tab in indent.
                mjpeg_error_exit1 ("pthread_attr_init() failed: %s",
.git/rebase-apply/patch:22: space before tab in indent.
                        strerror (nErr));
.git/rebase-apply/patch:23: trailing whitespace.
 
.git/rebase-apply/patch:25: space before tab in indent.
        // Inherit scheduling parameters from the main thread.
.git/rebase-apply/patch:26: space before tab in indent.
        nErr = pthread_attr_setinheritsched (&sThreadAttributes,
warning: squelched 14 whitespace errors
warning: 19 lines add whitespace errors.
Applying: More ffmpeg-4.4 patches renaming B0 to B0_ due to termux-specific includes defining macro in termbits.h
.git/rebase-apply/patch:19: trailing whitespace.
 
.git/rebase-apply/patch:62: trailing whitespace.
 
.git/rebase-apply/patch:67: trailing whitespace.
 
.git/rebase-apply/patch:72: trailing whitespace.
 
.git/rebase-apply/patch:82: trailing whitespace.
 
warning: squelched 18 whitespace errors
warning: 23 lines add whitespace errors.
Applying: add libbthread to thirdparty/Makefile, do not install mpeg2enc/mplex from mjpegtools
Applying: add libbthread to configure.ac (termux-specific)
Applying: Fix libzmpeg.h x86 ifdef
Applying: libzmpeg3 Makefile: add libbthread (termux)
Applying: correctly-named libbthread patch
.git/rebase-apply/patch:17: trailing whitespace.
+       cat `ls *.c` > just-pt.c 
warning: 1 line adds whitespace errors.
Applying: DV ifdefs in plugins/livevide
Applying: Add support for conditional Termux-related libraries, auto-fix configure script because it demand bash
.git/rebase-apply/patch:36: trailing whitespace.
  
warning: 1 line adds whitespace errors.
Applying: Fix mjpegtools-2.1.0.patch6 for conditional bthread.h include
Applying: Untested: add aarch64 support to guicast/Makefile
Applying: Hack: add brender socket path for termux (no /tmp here)
Applying: Add multilib x265 (slower compilation, but you can render 10 bit h265 out of the box)
Applying: Add timecode to output mov/mxf
.git/rebase-apply/patch:14: trailing whitespace.

.git/rebase-apply/patch:21: trailing whitespace.

.git/rebase-apply/patch:41: trailing whitespace.

.git/rebase-apply/patch:45: trailing whitespace.

warning: 4 lines add whitespace errors.
Applying: Hack: pix_fmts for yuv4mpegpipe muxer/encoder allow format choice in cingg via std menu
.git/rebase-apply/patch:19: trailing whitespace.
 
.git/rebase-apply/patch:41: trailing whitespace.
+    AV_PIX_FMT_YUV444P16,    
.git/rebase-apply/patch:59: trailing whitespace.
 
warning: 3 lines add whitespace errors.
Applying: Add hackish new overlay/blend modes
Applying: Workaround_bugs=1 for ffmpeg.C decode
Applying: Add hidden fast/slow playback preference
.git/rebase-apply/patch:212: trailing whitespace.

.git/rebase-apply/patch:222: trailing whitespace.

.git/rebase-apply/patch:225: trailing whitespace.

.git/rebase-apply/patch:226: trailing whitespace.

.git/rebase-apply/patch:234: trailing whitespace.

warning: squelched 6 whitespace errors
warning: 11 lines add whitespace errors.
Applying: Fixup titler plugin after variable fast/slow speed change
Applying: Attempt at differenciating 601 pal and ntsc
error: patch failed: cinelerra-5.1/cinelerra/appearanceprefs.C:887
error: cinelerra-5.1/cinelerra/appearanceprefs.C: patch does not apply
error: patch failed: cinelerra-5.1/cinelerra/appearanceprefs.h:377
error: cinelerra-5.1/cinelerra/appearanceprefs.h: patch does not apply
error: patch failed: cinelerra-5.1/cinelerra/ffmpeg.C:1593
error: cinelerra-5.1/cinelerra/ffmpeg.C: patch does not apply
error: patch failed: cinelerra-5.1/cinelerra/preferences.C:104
error: cinelerra-5.1/cinelerra/preferences.C: patch does not apply
error: patch failed: cinelerra-5.1/guicast/bccolors.C:143
error: cinelerra-5.1/guicast/bccolors.C: patch does not apply
error: patch failed: cinelerra-5.1/guicast/bccolors.h:104
error: cinelerra-5.1/guicast/bccolors.h: patch does not apply
error: patch failed: cinelerra-5.1/guicast/bccolors.inc:25
error: cinelerra-5.1/guicast/bccolors.inc: patch does not apply
error: patch failed: cinelerra-5.1/plugins/colorspace/colorspace.C:35
error: cinelerra-5.1/plugins/colorspace/colorspace.C: patch does not apply
Patch failed at 0041 Attempt at differenciating 601 pal and ntsc
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
[paz at arch-paz cinelerra-5.1]$ git am --skip
Applicazione in corso: Fix yuv_color_space menu after adding bt601 variants
error: patch non riuscita: cinelerra-5.1/cinelerra/appearanceprefs.C:887
error: cinelerra-5.1/cinelerra/appearanceprefs.C: la patch non si applica correttamente
Patch non riuscita a 0042 Fix yuv_color_space menu after adding bt601 variants
suggerimento: Usa 'git am --show-current-patch=diff' per visualizzare la patch non riuscita
Una volta risolto questo problema, esegui "git am --continue".
Se preferisci saltare questa patch, esegui invece "git am --skip".
Per ripristinare il branch originario e terminare il patching, esegui "git am --abort".
[paz at arch-paz cinelerra-5.1]$ git am --abort