From eecf057a9d6b8c8cffc7d0001bff89bc9cac7b05 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Wed, 2 May 2018 13:42:02 -0600 Subject: [PATCH] opencv lib path fix, ub18 fixes --- cinelerra-5.1/cinelerra/awindowgui.C | 2 ++ cinelerra-5.1/cinelerra/vwindowgui.C | 1 + cinelerra-5.1/debian/changelog | 2 +- cinelerra-5.1/debian/control | 2 +- cinelerra-5.1/opencv_build | 6 +++--- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index f49c67fb..f33b9cbc 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -552,6 +552,7 @@ void AssetPicon::create_objects() pixmap_w = pixmap_h * 16/9; icon_vframe = new VFrame(0, -1, pixmap_w, pixmap_h, BC_RGB888, -1); + icon_vframe->clear_frame(); { char string[BCTEXTLEN]; sprintf(string, _("Reading %s"), name); mwindow->gui->lock_window("AssetPicon::create_objects 3"); @@ -684,6 +685,7 @@ void AssetPicon::create_objects() pixmap_w = pixmap_h * 16/9; icon_vframe = new VFrame(0, -1, pixmap_w, pixmap_h, BC_RGB888, -1); + icon_vframe->clear_frame(); char string[BCTEXTLEN]; sprintf(string, _("Rendering %s"), name); mwindow->gui->lock_window("AssetPicon::create_objects 3"); diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C index f446a0f4..87909d2a 100644 --- a/cinelerra-5.1/cinelerra/vwindowgui.C +++ b/cinelerra-5.1/cinelerra/vwindowgui.C @@ -112,6 +112,7 @@ void VWindowGUI::draw_wave() int w = mwindow->edl->session->output_w; int h = mwindow->edl->session->output_h; VFrame *vframe = new VFrame(w, h, BC_RGB888); + vframe->clear_frame(); int sample_rate = mwindow->edl->get_sample_rate(); int channels = mwindow->edl->session->audio_channels; if( channels > 2 ) channels = 2; diff --git a/cinelerra-5.1/debian/changelog b/cinelerra-5.1/debian/changelog index e6b54ec5..7e977fe8 100644 --- a/cinelerra-5.1/debian/changelog +++ b/cinelerra-5.1/debian/changelog @@ -1,4 +1,4 @@ -cin (1:5.1.20180430) unstable; urgency=low +cin (1:5.1.20180502) unstable; urgency=low [ guy goode ] diff --git a/cinelerra-5.1/debian/control b/cinelerra-5.1/debian/control index aba3a186..52e86a7f 100644 --- a/cinelerra-5.1/debian/control +++ b/cinelerra-5.1/debian/control @@ -1,7 +1,7 @@ Source: cin Section: video Priority: optional -Standards-Version: 5.1.20180430 +Standards-Version: 5.1.20180502 Maintainer: mailing list Homepage: http://www.cinelerra-cv.org/ Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs, diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build index e5de69d3..73e2da52 100644 --- a/cinelerra-5.1/opencv_build +++ b/cinelerra-5.1/opencv_build @@ -81,8 +81,8 @@ $(opencv)/build: $(opencv).src -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/" LFLAGS += -Wl,--start-group -LFLAGS += $(shell ls -1 $(opencv_prefix)/lib*/libopencv_*.a 2> /dev/null) -LFLAGS += $(shell ls -1 $(opencv_prefix)/share/OpenCV/3rdparty/lib*/lib*.a 2> /dev/null) +LFLAGS += $(shell find $(opencv_prefix)/lib* -name "libopencv_*.a" 2> /dev/null) +LFLAGS += $(shell find $(opencv_prefix)/share/OpenCV/3rdparty/lib* -name "lib*.a" 2> /dev/null) LFLAGS += -Wl,--end-group else ifeq ($(bld),dyn) $(opencv)/build: $(opencv).src @@ -98,7 +98,7 @@ $(opencv)/build: $(opencv).src -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/" SYSLIB := $(lastword $(wildcard /usr/lib /usrlib32 /usr/lib64)) -CVLIBS := $(opencv_prefix)/lib +CVLIBS := $(dir (shell find $(opencv_prefix) -name libopencv_core.a)) LFLAGS += -L$(CVLIBS) $(patsubst $(CVLIBS)/lib%.so,-l%,$(wildcard $(CVLIBS)/libopencv_*.so)) LFLAGS += $(patsubst $(SYSLIB)/lib%.so,-l%,$(wildcard $(SYSLIB)/lib{Half,Imath,Ilm,Iex}*.so)) static_libs := -- 2.26.2