ah, two more patches, hopefully they will fix it for all..
On Wednesday, November 10, 2021, Andrew Randrianasulu < randrianas...@gmail.com> wrote: > > > On Wednesday, November 10, 2021, Andrew Randrianasulu < > randrianas...@gmail.com> wrote: > >> strangely enough, this patch series builds with dv-stuff correctly now.. >> no build/link/runtime errors.. >> >> based on git commit 9d54c23d957 >> > > > now lets try to define minimal patchset... > > randrik19/ is a directory $ > less > randrik19/00 0001-constify-fileffmpeg.C.patch = nope > 0002-TERMUX-ifdefs-in-guicast.patch = yes > 0003-libzmpeg-TERMUX-ifdefs.patch = yes > 0004-Add-libzmpeg-ifdef-in-fileac3-move-fireware-objects-.patch = yes > 0005-configure.ac-change-for-non-x86-cflags.patch = yes > 0006-configure.ac-ifdef-for-mjpegtools-on-non-x86.patch = yes > 0007-add-termux-specific-include-path.patch = yes > 0008-configure.ac-add-liconv-for-termux.patch = yes > 0009-attempt-to-fix-_probe-function-memory-leak.patch = yes > 0010-additional-XOpenIM-call-in-bcwindowbase.C.patch = yes > 0011-libbthread-source-and-Makefile-patch-not-integrated-.patch = nope > 0012-Additonal-mjpegtools-patches-for-termux-not-ifdefed.patch = nope > 0013-More-ffmpeg-4.4-patches-renaming-B0-to-B0_-due-to-te.patch = nope > 0014-add-libbthread-to-thirdparty-Makefile-do-not-install.patch = nope > 0015-add-libbthread-to-configure.ac-termux-specific.patch = nope > 0016-Fix-libzmpeg.h-x86-ifdef.patch = yes > 0017-libzmpeg3-Makefile-add-libbthread-termux.patch = nope > 0018-correctly-named-libbthread-patch.patch = nope > 0019-Add-support-for-conditional-Termux-related-libraries.patch = nope > 0020-Fix-mjpegtools-2.1.0.patch6-for-conditional-bthread..patch = nope > 0021-Untested-add-aarch64-support-to-guicast-Makefile.patch = yes > 0022-Add-timecode-to-output-mov-mxf.patch = nope > 0023-Hack-pix_fmts-for-yuv4mpegpipe-muxer-encoder-allow-f.patch = nope > 0024-Add-hackish-new-overlay-blend-modes.patch = nope > 0025-Workaround_bugs-1-for-ffmpeg.C-decode.patch = nope > 0026-Debug-add-printing-of-cpucount-from-ff_cpus.patch = nope > 0027-Debug-add-cpu-count-printing-for-mwindow.C.patch = nope > 0028-Hack-raise-cpu-cap-from-8-to-16-might-have-bad-effec.patch = nope > 0029-Hacks-in-audiopulse-do-not-fix-audio-encoding-crash-.patch = nope > 0030-HACK-try-to-speed-up-reverse-playback-for-i-only-for.patch = nope > 0031-configure-script-specially-for-termux.patch = nope > 0032-HACK-make-avi-demuxer-in-ffmpeg-use-cin-specific-see.patch = nope > 0033-Add-x11-inc-autodetect-for-shuttle-target-using-pkg-.patch = nope > 0034-additions-to-my_configure.patch = nope > 0035-fix-mjpegtools-patch4-and-patch5-termux.patch = nope > 0036-Try-to-fix-thirdparty-Makefile-libbthread-for-non-an.patch = nope > 0037-Shut-up-warnings-on-nasm-2.15-in-x265.patch = nope > 0038-Second-attempt-at-fixing-guicast-thread.h-on-non-and.patch = maybe > 0039-Try-to-fix-shuttle_keys.h-includes-if-pkg-cfg-return.patch = nope > 0040-fix-fireware-typo-in-cinelerra-Makefile.patch = yes > 0041-more-fix-to-firewire-objs.patch = yes > 0042-fix-typos-in-libdv-ifdefs-in-livevideo.patch = yes > 0043-Add-two-more-libx264-patches-for-ffmpe-enable-avcint.patch = nope > 0044-x265-3.5-patches-configure-update.patch = nope > 0045-Add-x265-3.5-multilib-patch3-should-be-faster-at-com.patch = nope > 0046-x265-patch3-was-malformed.patch = nope > 0047-add-with-booby-and-without-ladspa-build-to-my_config.patch = nope > 0048-sigh-i-deleted-make-in-x265_3.5.patch3-restored.patch = nope > 0049-with-booby-demands-execinfo.h.patch = nope > 0050-Hack-attempt-to-fix-last-flush-in-ffmpeg.c.patch = nope > 0051-Attempt-at-fixing-armed-status-while-attaching-plugi.patch = nope > 0052-Add-hidden-preference-armed_in_gang_mode.patch = nope > 0053-Alter-RMB-attach-effect-behavior-on-disarmed-tracks.patch = nope > 0054-Fix-mpeg2enc-build-install-was-broken-by-termux-seri.patch = maybe > 0055-Initialize-more-in-vrender.C-constructor-cppcheck.patch = nope > 0056-mem-and-resource-leaks-in-indexfile-indextate-cppche.patch = nope > 0057-cppcheck-in-cursor.C.patch = nope > 0058-cppcheck-in-resourcepixmap.C.patch = nope > 0059-cppcheck-in-disabled-videoconfig.C.patch = nope > 0060-cppcheck-in-disabled-recordengine.C.patch = nope > 0061-Avoid-two-undefined-behaviors-in-vframe.C.patch = nope > 0062-TMP-add-fsanitize-undefined-to-ldflags.patch = nope > 0063-libaom-3.2.0-patches-update.patch = nope > 0064-Can-be-built-with-dv-fireware.patch = nope > > so, in summary... > > try 2-10, 16, 21, 40-42 > > may be 38, 54 >
From fdffdb7cfb82233a4e7d6f16159190b6dd3013f6 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <randrianas...@gmail.com> Date: Wed, 10 Nov 2021 20:07:35 +0300 Subject: [PATCH 66/66] Fix libzmpeg3 x86 ifdefs again ... --- cinelerra-5.1/libzmpeg3/libzmpeg3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinelerra-5.1/libzmpeg3/libzmpeg3.h b/cinelerra-5.1/libzmpeg3/libzmpeg3.h index c1fec34f..8ea33b15 100644 --- a/cinelerra-5.1/libzmpeg3/libzmpeg3.h +++ b/cinelerra-5.1/libzmpeg3/libzmpeg3.h @@ -5,7 +5,7 @@ /* for quicktime build */ #define MAXFRAMESAMPLES 65536 #define ZDVB -#ifdef __i386__ || __x86-64__ +#if defined(__i386__) || defined(__x86_64__) #define USE_FUTEX #endif -- 2.33.1
From accfae9b1d8ac0b1c54cc6b52cdc4a474d3ffa68 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <randrianas...@gmail.com> Date: Wed, 10 Nov 2021 19:45:55 +0300 Subject: [PATCH 65/66] Fixes from Mat for x86 ifdefs in db/tdb.h and cinelerra/ --- cinelerra-5.1/cinelerra/commercials.h | 2 +- cinelerra-5.1/cinelerra/dbwindow.h | 2 +- cinelerra-5.1/cinelerra/mediadb.h | 2 +- cinelerra-5.1/db/tdb.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cinelerra-5.1/cinelerra/commercials.h b/cinelerra-5.1/cinelerra/commercials.h index 7869c3c3..aa55662e 100644 --- a/cinelerra-5.1/cinelerra/commercials.h +++ b/cinelerra-5.1/cinelerra/commercials.h @@ -1,4 +1,4 @@ -#ifdef __I386__ || __x86-64__ +#if defined( __i386__) || defined(__x86_64__) #ifndef _COMMERCIALS_H_ #define _COMMERCIALS_H_ diff --git a/cinelerra-5.1/cinelerra/dbwindow.h b/cinelerra-5.1/cinelerra/dbwindow.h index c8a12f66..7d40792f 100644 --- a/cinelerra-5.1/cinelerra/dbwindow.h +++ b/cinelerra-5.1/cinelerra/dbwindow.h @@ -1,4 +1,4 @@ -#ifdef __I386__ || __x86-64__ +#if defined( __i386__) || defined(__x86_64__) #ifndef _DBWINDOW_H_ #define _DBWINDOW_H_ diff --git a/cinelerra-5.1/cinelerra/mediadb.h b/cinelerra-5.1/cinelerra/mediadb.h index 71e96bfb..f55cc6b0 100644 --- a/cinelerra-5.1/cinelerra/mediadb.h +++ b/cinelerra-5.1/cinelerra/mediadb.h @@ -1,4 +1,4 @@ -#ifdef __I386__ || __x86-64__ +#if defined(__i386__) || defined(__x86_64__) #ifndef _MEDIA_DB_H_ #define _MEDIA_DB_H_ diff --git a/cinelerra-5.1/db/tdb.h b/cinelerra-5.1/db/tdb.h index e4a08565..24c8617c 100644 --- a/cinelerra-5.1/db/tdb.h +++ b/cinelerra-5.1/db/tdb.h @@ -1,4 +1,4 @@ -#ifdef __I386__ || __x86-64__ +#if defined(__i386__) || defined(__x86_64__) #ifndef __DB_H__ #define __DB_H__ #include <cstring> -- 2.33.1
-- Cin mailing list Cin@lists.cinelerra-gg.org https://lists.cinelerra-gg.org/mailman/listinfo/cin
