try this in addition to all those patches? On Saturday, July 24, 2021, Andrew Randrianasulu <[email protected]> wrote:
> > > On Saturday, July 24, 2021, Andrea paz <[email protected]> > wrote: > >> My steps: >> >> 1) [patch randrik12 minus 0053] >> $ git am --whitespace=fix /home/paz/Download/randrik12/*.patch >> Applicazione in corso: constify fileffmpeg.C >> .git/rebase-apply/patch:33: trailing whitespace. >> if (!asset->interlace_mode && >> (ff->interlace_from_codec) ) asset->interlace_mode = >> ff->video_probe(1); >> warning: 1 riga aggiunge errori di spazi bianchi. >> Applicazione in corso: ifdef for DV >> Applicazione in corso: TERMUX ifdefs in guicast >> .git/rebase-apply/patch:95: space before tab in indent. >> } >> warning: 1 riga aggiunge errori di spazi bianchi. >> Applicazione in corso: libzmpeg TERMUX ifdefs >> Applicazione in corso: Add libzmpeg ifdef in fileac3, move fireware >> objects into their own group in Makefile in cinelerra/ >> Applicazione in corso: more ifdefs for file.C (ac3 demand libzmpeg) >> Applicazione in corso: configure.ac update for ffmpeg-4.4 >> Applicazione in corso: configure.ac change for non-x86 cflags >> Applicazione in corso: libaom 3.1.0 and libwebp 1.1.0 patches for >> thirdparty >> Applicazione in corso: add ffmpeg-4.4 patches into thirdparty/src >> Applicazione in corso: libaom and libopus cfg fixes for termux/arm >> Applicazione in corso: configure.ac ifdef for mjpegtools on non-x86 >> Applicazione in corso: ifdef commercials db only for x86 >> Applicazione in corso: fixed x86 ifdefs >> Applicazione in corso: add termux-specific include path >> Applicazione in corso: configure.ac - add -liconv for termux >> Applicazione in corso: attempt to fix _probe function memory leak >> Applicazione in corso: additional XOpenIM call in bcwindowbase.C >> Applicazione in corso: change type of j variable in virtualanode.C to >> int64_t >> Applicazione in corso: libbthread source and Makefile patch (not >> integrated into buildsystem ye >> Applicazione in corso: Additonal mjpegtools patches for termux (not >> ifdefed) >> Applicazione in corso: More ffmpeg-4.4 patches renaming B0 to B0_ due >> to termux-specific includes defining macro in termbits.h >> Applicazione in corso: add libbthread to thirdparty/Makefile, do not >> install mpeg2enc/mplex from mjpegtools >> Applicazione in corso: add libbthread to configure.ac (termux-specific) >> Applicazione in corso: Fix libzmpeg.h x86 ifdef >> Applicazione in corso: libzmpeg3 Makefile: add libbthread (termux) >> Applicazione in corso: correctly-named libbthread patch >> Applicazione in corso: DV ifdefs in plugins/livevide >> Applicazione in corso: Add support for conditional Termux-related >> libraries, auto-fix configure script because it demand bash >> Applicazione in corso: Fix mjpegtools-2.1.0.patch6 for conditional >> bthread.h include >> Applicazione in corso: Untested: add aarch64 support to guicast/Makefile >> Applicazione in corso: Hack: add brender socket path for termux (no /tmp >> here) >> Applicazione in corso: Add multilib x265 (slower compilation, but you >> can render 10 bit h265 out of the box) >> Applicazione in corso: Add timecode to output mov/mxf >> Applicazione in corso: Hack: pix_fmts for yuv4mpegpipe muxer/encoder >> allow format choice in cingg via std menu >> Applicazione in corso: Add hackish new overlay/blend modes >> Applicazione in corso: Workaround_bugs=1 for ffmpeg.C decode >> Applicazione in corso: Add hidden fast/slow playback preference >> .git/rebase-apply/patch:85: trailing whitespace. >> >> .git/rebase-apply/patch:93: trailing whitespace. >> >> .git/rebase-apply/patch:299: space before tab in indent. >> this->preferences = new Preferences; >> .git/rebase-apply/patch:302: space before tab in indent. >> this->preferences->copy_from(preferences); >> warning: 4 righe aggiungono errori di spazi bianchi. >> Applicazione in corso: Fixup titler plugin after variable fast/slow speed >> change >> Applicazione in corso: Debug: add printing of cpucount from ff_cpus. >> Applicazione in corso: Debug: add cpu count printing for mwindow.C >> Applicazione in corso: Hack: raise cpu cap from 8 to 16 (might have >> bad effect on non-ffmpeg encoders) >> Applicazione in corso: Hacks in audiopulse (do not fix audio encoding >> crash on termux sadly >> Applicazione in corso: HACK: try to speed-up reverse playback for i-only >> formats >> Applicazione in corso: Add openEXR format for background render >> Applicazione in corso: configure script specially for termux >> Applicazione in corso: HACK: make avi demuxer in ffmpeg use >> cin-specific seek flag (worked on dv avi) >> Applicazione in corso: Add x11 inc autodetect for shuttle target using >> pkg-confi >> Applicazione in corso: Add libaom 3.1.1 termux patch >> Applicazione in corso: LibAom configure tweak (type Release, no tests) >> Applicazione in corso: additions to my_configure >> Applicazione in corso: fix opus configure >> Applicazione in corso: Try to fix thirdparty/Makefile - libbthread for >> non-android >> Applicazione in corso: Shut up warnings on nasm-2.15 in x265 >> error: cinelerra-5.1/thirdparty/src/x265_3.4.patch4: esiste già nella >> directory di lavoro > > ---- > > not sure why 0054 failed to apply ( > > > >> Patch non riuscita a 0054 Shut up warnings on nasm-2.15 in x265 >> 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@arch-paz cinelerra-5.1]$ git am --skip >> Applicazione in corso: attempt at making mpegts/bluray patch for >> ffmpeg-4.4, might not work >> .git/rebase-apply/patch:23: trailing whitespace. >> >> .git/rebase-apply/patch:47: trailing whitespace. >> >> .git/rebase-apply/patch:57: trailing whitespace. >> >> .git/rebase-apply/patch:75: trailing whitespace. >> >> .git/rebase-apply/patch:80: trailing whitespace. >> >> warning: 85 errori di spazi bianchi soppressi >> warning: 89 righe applicate dopo la correzione di errori di spazi bianchi. >> >> 2) [patch 0053] >> $ git am --whitespace=nowarn >> /home/paz/Download/0053-fix-mjpegtools-patch4-and-patch5-termux.patch >> Applicazione in corso: fix mjpegtools patch4 and patch5 (termux) >> >> 3) [2 more patch] > > > === > i think i included both in my latest patch series... where patches go up > to 0056 > > > >> $ git am --whitespace=fix /home/paz/Download/randrik12/rand/*.patch >> Applicazione in corso: fix opus configure >> error: patch non riuscita: cinelerra-5.1/thirdparty/Makefile:243 >> error: cinelerra-5.1/thirdparty/Makefile: la patch non si applica >> correttamente >> Patch non riuscita a 0001 fix opus configure >> 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". >> >> >> >> 4) [last patch on top] > > > ==== > this one also should be included in 56-patch series.. > > > >> $ git am --whitespace=fix >> /home/paz/Download/0001-Try-to-fix-thirdparty-Makefile-libbt >> hread-for-non-an.patch >> fatal: la directory di rebase precedente .git/rebase-apply esiste >> ancora ma è stata specificata un'mbox. >> >> 5) [manual change in configure.ac: libbthread auto --> no] >> >> 6) Build cinelerra. >> >> The T of nvme never exceeded T=45°C (T critical =84°C) >> >> The build went on in multi-thread several times before becoming >> single-threaded. Then it went back to multi-thread and shortly >> afterwards the error occurred. I attach cin5.log. >> > > > oh, sigh... guicast/thread.h error ( > > hold on, i'll try to come up with something... > > we are making progress, but slow and painfu... time-consuming progress. >
From c628c6d22a10a31b929146c290b4d7f6ab4cee8a Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sat, 24 Jul 2021 19:07:27 +0300 Subject: [PATCH] Attempt at fixing guicast/thread.h for non-android --- cinelerra-5.1/guicast/thread.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cinelerra-5.1/guicast/thread.h b/cinelerra-5.1/guicast/thread.h index e701a8f4..7d64b387 100644 --- a/cinelerra-5.1/guicast/thread.h +++ b/cinelerra-5.1/guicast/thread.h @@ -26,17 +26,19 @@ #include <pthread.h> #include <unistd.h> +#if defined(__TERMUX__) +#define NO_TID +#endif + #ifndef NO_TID #include <sys/syscall.h> -#if !defined(__TERMUX__) // glibc >= 2.30 provides gettid() in unistd #if !defined(__GLIBC_PREREQ) || !__GLIBC_PREREQ(2, 30) static inline int gettid() { return syscall(SYS_gettid, 0, 0, 0); } #else static inline long gettid() { return (long)pthread_self(); } #endif -#endif // TERMUX #endif //no_tid // The thread does not autodelete by default. -- 2.32.0
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
