I have those in my termux tree 09feb2022/0001-Add-x265-patch-for-aarch64-clang.patch
big one (186 kb), needed for clang compile on arm64/termux 09feb2022/0002-Missing-returns-in-videowindow.C.patch 09feb2022/0003-missing-returns-in-videowindowgui.C.patch 09feb2022/0004-Missing-return-in-videoconfig.C.patch not really hot, those files apparently not even compiled for now! 09feb2022/0005-noexecstack-by-default-in-cinelerra-Makefile.patch obvious from name 09feb2022/0006-D-build-fixes.patch for some reason netbsd.bld not executable by default, should we make it so? 09feb2022/0007-Disable-vulkan-in-embedded-ffmpeg.patch hopefully not needed after 0012 09feb2022/0008-Add-with-gnu-debuglink-to-cinelerra-Makefile.patch incomplete, I missed same thing with bdwrite 09feb2022/0009-Default-atrack-vtrack-to-64-in-localsession.patch our openEDL on viewer-created clip fix 09feb2022/0010-TMP-add-flto-to-cinelerra-Makefile.patch localhack, trying to make it crash on "fit all autos" like in Fedora, no luck so far! 09feb2022/0011-EXPERIMENTAL-try-to-init-two-variables-to-0-in-gloat.patch try to prevent said crash 09feb2022/0012-Add-patch-from-ffmpeg-5.1-branch-hopefully-fix-build.patch picked up from ffmpeg.git 5.1 branch, compile-tested
From 4de1b60a3d51ce9b3a61563df5476d9829b991ad Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 5 Feb 2023 00:22:36 +0300 Subject: [PATCH 09/12] Default atrack/vtrack to 64 in localsession --- cinelerra-5.1/cinelerra/localsession.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinelerra-5.1/cinelerra/localsession.C b/cinelerra-5.1/cinelerra/localsession.C index 96e0894b..c8428abd 100644 --- a/cinelerra-5.1/cinelerra/localsession.C +++ b/cinelerra-5.1/cinelerra/localsession.C @@ -74,8 +74,8 @@ LocalSession::LocalSession(EDL *edl) preview_start = 0; preview_end = -1; zoom_sample = DEFAULT_ZOOM_TIME; zoom_y = 0; - zoom_atrack = 0; - zoom_vtrack = 0; + zoom_atrack = 64; + zoom_vtrack = 64; x_pane = y_pane = -1; gang_tracks = GANG_NONE; -- 2.39.1
From a9e1d1442f43afb0569518f4b595876f2a8281ce Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 27 Nov 2022 12:08:18 +0300 Subject: [PATCH 04/12] Missing return in videoconfig.C --- cinelerra-5.1/cinelerra/videoconfig.C | 1 + 1 file changed, 1 insertion(+) diff --git a/cinelerra-5.1/cinelerra/videoconfig.C b/cinelerra-5.1/cinelerra/videoconfig.C index d6b4a192..1bbaee75 100644 --- a/cinelerra-5.1/cinelerra/videoconfig.C +++ b/cinelerra-5.1/cinelerra/videoconfig.C @@ -72,4 +72,5 @@ int VideoConfig::save_defaults(BC_Hash *defaults) defaults->update("VIDEO_CAPTURE_LENGTH", capture_length); defaults->update("VIDEO_OUT_DRIVER", video_out_driver); +return 0; } -- 2.39.1
From a71cf6c0339f0e5259265dcd214eae37ad1e7b21 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Thu, 9 Feb 2023 20:45:10 +0300 Subject: [PATCH 11/12] EXPERIMENTAL: try to init two variables to 0 in gloatautos.h --- cinelerra-5.1/cinelerra/floatautos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinelerra-5.1/cinelerra/floatautos.h b/cinelerra-5.1/cinelerra/floatautos.h index 94c62bad..06907894 100644 --- a/cinelerra-5.1/cinelerra/floatautos.h +++ b/cinelerra-5.1/cinelerra/floatautos.h @@ -58,7 +58,7 @@ public: static float calculate_bezier_derivation(FloatAuto *previous, FloatAuto *next, int64_t position); void get_extents(float *min, float *max, int *coords_undefined, - int64_t unit_start, int64_t unit_end); + int64_t unit_start=0, int64_t unit_end=0); void set_automation_mode(int64_t start, int64_t end, int mode); void set_proxy(int orig_scale, int new_scale); -- 2.39.1
From 4ffa78a618bf6d6cfc20c96b9308f3e0fdce0cf7 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 27 Nov 2022 12:06:41 +0300 Subject: [PATCH 02/12] Missing returns in videowindow.C --- cinelerra-5.1/cinelerra/videowindow.C | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cinelerra-5.1/cinelerra/videowindow.C b/cinelerra-5.1/cinelerra/videowindow.C index 8461ee26..9454d6a4 100644 --- a/cinelerra-5.1/cinelerra/videowindow.C +++ b/cinelerra-5.1/cinelerra/videowindow.C @@ -54,12 +54,14 @@ int VideoWindow::load_defaults(BC_Hash *defaults) { video_visible = defaults->get("VIDEOVISIBLE", 1); video_window_w = defaults->get("PLAYVIDEOW", video_window_w); +return 0; } int VideoWindow::update_defaults(BC_Hash *defaults) { defaults->update("VIDEOVISIBLE", video_visible); defaults->update("PLAYVIDEOW", video_window_w); +return 0; } void VideoWindow::create_objects() @@ -89,6 +91,7 @@ int VideoWindow::show_window() gui->show_window(); mwindow->gui->mainmenu->set_show_video(1); } +return 0; } int VideoWindow::hide_window() @@ -99,6 +102,7 @@ int VideoWindow::hide_window() gui->hide_window(); mwindow->gui->mainmenu->set_show_video(0); } +return 0; } int VideoWindow::resize_window() @@ -118,12 +122,14 @@ int VideoWindow::resize_window() if(video_cropping) gui->canvas->draw_crop_box(); gui->flash(); } +return 0; } int VideoWindow::fix_size(int &w, int &h, int width_given, float aspect_ratio) { w = width_given; h = (int)((float)width_given / aspect_ratio); +return 0; } int VideoWindow::original_size() @@ -132,6 +138,7 @@ int VideoWindow::original_size() get_full_sizes(w, h); video_window_w = w; resize_window(); +return 0; } int VideoWindow::get_full_sizes(int &w, int &h) @@ -160,6 +167,7 @@ int VideoWindow::init_video() { gui->canvas->start_video(); } +return 0; } int VideoWindow::stop_video() @@ -168,6 +176,7 @@ int VideoWindow::stop_video() { gui->canvas->stop_video(); } +return 0; } int VideoWindow::update(BC_Bitmap *frame) @@ -178,6 +187,7 @@ int VideoWindow::update(BC_Bitmap *frame) // gui->canvas->draw_bitmap(frame, 1); gui->unlock_window(); } +return 0; } int VideoWindow::get_w() @@ -199,6 +209,7 @@ BC_Bitmap* VideoWindow::get_bitmap() int VideoWindow::reset() { +return 0; } int VideoWindow::start_cropping() @@ -210,6 +221,7 @@ int VideoWindow::start_cropping() gui->y2 = gui->get_h(); gui->canvas->draw_crop_box(); gui->canvas->flash(); +return 0; } int VideoWindow::get_aspect_ratio(float &aspect_w, float &aspect_h) @@ -222,6 +234,7 @@ int VideoWindow::get_aspect_ratio(float &aspect_w, float &aspect_h) new_h = (int)((float)(gui->y2 - gui->y1) / zoom_factor); mwindow->create_aspect_ratio(aspect_w, aspect_h, new_w, new_h); +return 0; } int VideoWindow::stop_cropping() -- 2.39.1
From 0ea698b602e7bafafc27b520a6d489c995990d50 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Mon, 6 Feb 2023 19:58:06 +0300 Subject: [PATCH 10/12] TMP add flto to cinelerra/Makefile --- cinelerra-5.1/cinelerra/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index 1cb58d50..4de26d4a 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -495,7 +495,7 @@ LV2OBJS = \ LIBS += `pkg-config --libs lilv-0` endif -CFLAGS := \ +CFLAGS := -flto \ -I/usr/local/include \ -I$(GUICAST) \ -I$(LIBZMPEG3) \ -- 2.39.1
From c7f67ef1e91faa6e6d9402b8a7b1ea58249dce3f Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Tue, 31 Jan 2023 13:11:04 +0300 Subject: [PATCH 07/12] Disable vulkan in embedded ffmpeg --- cinelerra-5.1/thirdparty/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 1568b615..8b13b40c 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -130,7 +130,7 @@ esound.mak_vars+= CFLAGS="" esound.ldflags=" -lm -lstdc++" fftw.cfg_params= --disable-fortran --enable-shared=no ffmpeg.cfg_params= \ - --enable-pthreads --disable-avdevice --enable-gpl --disable-ffplay \ + --enable-pthreads --disable-vulkan --disable-avdevice --enable-gpl --disable-ffplay \ $(call if_want,VAAPI,--enable-vaapi,--disable-vaapi) \ $(call if_want,VDPAU,--enable-vdpau,--disable-vdpau) \ $(call if_want,NV, --enable-nvenc --enable-nvdec --enable-ffnvcodec) \ -- 2.39.1
From 176b58a6409356dddb3168f6c87cc9987fe6c8e6 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sat, 4 Feb 2023 15:40:11 +0300 Subject: [PATCH 08/12] Add --with-gnu-debuglink to cinelerra/Makefile --- cinelerra-5.1/cinelerra/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index 4210ab81..1cb58d50 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -544,6 +544,7 @@ all: $(OUTPUT) $(CUTADS) $(BDWRITE) $(LV2UI) $(OUTPUT): $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBRARIES) $(LINKER) `cat $(OBJDIR)/objs` $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G)) + $(if $(findstring -g,$(CFLAGS)),objcopy --add-gnu-debuglink=$(OUTPUT_G) $(OUTPUT)) $(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT)) ln -f -s ../bin/$(WANT_CIN) ci @@ -552,6 +553,7 @@ $(CUTADS): $(CUTOBJS) $(CUTLIBS) $(LIBRARIES) @echo $(CXX) -o $@ $(CUTOBJS) @$(CXX) $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS) $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(CUTADS) $(CUTADS).debuginfo) + $(if $(findstring -g,$(CFLAGS)),objcopy --add-gnu-debuglink=$(CUTADS).debuginfo $(CUTADS)) $(if $(findstring -ggdb,$(CFLAGS)),,strip $(CUTADS)) install-cutads: -- 2.39.1
From f268fc6102f40c9016fde8044159fa6cfe14aeef Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Wed, 11 Jan 2023 15:27:30 +0300 Subject: [PATCH 05/12] noexecstack by default in cinelerra/Makefile --- cinelerra-5.1/cinelerra/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index 5c358569..4210ab81 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -526,7 +526,7 @@ CFLAGS += -DUSE_ALPHA else -LDFLAGS1 = -Wl,-export-dynamic -g +LDFLAGS1 = -Wl,-export-dynamic -g -Wl,-z,noexecstack LDFLAGS2 = $(LDFLAGS) LINKER = $(CXX) -o $(OUTPUT) -- 2.39.1
From 2db57246e6fc74f9fa2baf422fc2b55bb68c857f Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 27 Nov 2022 12:07:18 +0300 Subject: [PATCH 03/12] missing returns in videowindowgui.C --- cinelerra-5.1/cinelerra/videowindowgui.C | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cinelerra-5.1/cinelerra/videowindowgui.C b/cinelerra-5.1/cinelerra/videowindowgui.C index 351f544d..2ba22d70 100644 --- a/cinelerra-5.1/cinelerra/videowindowgui.C +++ b/cinelerra-5.1/cinelerra/videowindowgui.C @@ -105,6 +105,7 @@ int VideoWindowGUI::update_title() int VideoWindowGUI::close_event() { thread->hide_window(); + return 0; } @@ -153,6 +154,7 @@ int VideoWindowCanvas::button_press() gui->y_offset = y - gui->y1; } } +return 0; } int VideoWindowCanvas::button_release() @@ -162,6 +164,7 @@ int VideoWindowCanvas::button_release() button_down = 0; corner_selected = 0; } +return 0; } int VideoWindowCanvas::cursor_motion() @@ -199,6 +202,7 @@ int VideoWindowCanvas::cursor_motion() draw_crop_box(); flash(); } +return 0; } int VideoWindowCanvas::draw_crop_box() @@ -214,5 +218,6 @@ int VideoWindowCanvas::draw_crop_box() draw_box(gui->x2 - CROPHANDLE_W, gui->y1 + 1, CROPHANDLE_W, CROPHANDLE_H - 1); draw_rectangle(gui->x1, gui->y1, w, h); set_opaque(); +return 0; } -- 2.39.1
From e72efd27f90911581713cf80bba6c03a7199f0df Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Thu, 12 Jan 2023 08:07:00 +0000 Subject: [PATCH 06/12] D build fixes --- cinelerra-5.1/blds/netbsd.bld | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 cinelerra-5.1/blds/netbsd.bld diff --git a/cinelerra-5.1/blds/netbsd.bld b/cinelerra-5.1/blds/netbsd.bld old mode 100644 new mode 100755 -- 2.39.1
From 98506112d0d4c54d757f168eb0287270408dabb7 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Thu, 9 Feb 2023 21:18:09 +0300 Subject: [PATCH 12/12] Add patch from ffmpeg 5.1 branch, hopefully fix build with new vulkan headers --- .../thirdparty/src/ffmpeg-5.1.patchE | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 cinelerra-5.1/thirdparty/src/ffmpeg-5.1.patchE diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-5.1.patchE b/cinelerra-5.1/thirdparty/src/ffmpeg-5.1.patchE new file mode 100644 index 00000000..444ab3af --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/ffmpeg-5.1.patchE @@ -0,0 +1,34 @@ +From: Lynne <[email protected]> +Date: Sun, 25 Dec 2022 00:03:30 +0000 (+0100) +Subject: hwcontext_vulkan: remove optional encode/decode extensions from the list +X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/7268323193d55365f914de39fadd5dbdb1f68976?hp=30d432f205538f6ef6c86ed0a90e27cdd735cd2b + +hwcontext_vulkan: remove optional encode/decode extensions from the list + +They're not currently used, so they don't need to be there. +Vulkan stabilized the decode extensions less than a week ago, and their +name prefixes were changed from EXT to KHR. It's a bit too soon to be +depending on it, so rather than bumping, just remove these for now. + +(cherry picked from commit eb0455d64690eed0068e5cb202f72ecdf899837c) +--- + +diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c +index 237caa4bc0..3bc0dc8a40 100644 +--- a/libavutil/hwcontext_vulkan.c ++++ b/libavutil/hwcontext_vulkan.c +@@ -354,14 +354,6 @@ static const VulkanOptExtension optional_device_exts[] = { + { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY }, + { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM }, + #endif +- +- /* Video encoding/decoding */ +- { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, +- { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, +- { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, +- { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, +- { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, +- { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, + }; + + /* Converts return values to strings */ -- 2.39.1
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
