projects
/
goodguy
/
history.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d232fe4
)
opencv lib path fix, ub18 fixes
author
Good Guy
<good1.2guy@gmail.com>
Wed, 2 May 2018 19:42:02 +0000
(13:42 -0600)
committer
Good Guy
<good1.2guy@gmail.com>
Wed, 2 May 2018 19:42:02 +0000
(13:42 -0600)
cinelerra-5.1/cinelerra/awindowgui.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/vwindowgui.C
patch
|
blob
|
history
cinelerra-5.1/debian/changelog
patch
|
blob
|
history
cinelerra-5.1/debian/control
patch
|
blob
|
history
cinelerra-5.1/opencv_build
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/cinelerra/awindowgui.C
b/cinelerra-5.1/cinelerra/awindowgui.C
index f49c67fb5da709cb365c436d876b68ce54f6b27a..f33b9cbc1eb3f96eecdb44677167f7904aaa55da 100644
(file)
--- 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);
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");
{ 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);
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");
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 f446a0f475f758b70bae1c8e72cdc7ff7e10846d..87909d2a604aab85a5d009e69cc586de5455c19d 100644
(file)
--- 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);
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;
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 e6b54ec5825e067cdcf098c1cb4ebb9fd06ab125..7e977fe858bffa5414cd762ee9d7b436f25cb0bb 100644
(file)
--- a/
cinelerra-5.1/debian/changelog
+++ b/
cinelerra-5.1/debian/changelog
@@
-1,4
+1,4
@@
-cin (1:5.1.20180
430
) unstable; urgency=low
+cin (1:5.1.20180
502
) unstable; urgency=low
[ guy goode ]
[ guy goode ]
diff --git
a/cinelerra-5.1/debian/control
b/cinelerra-5.1/debian/control
index aba3a1862f8b899eacba87fff002f13703fa8cff..52e86a7f740be0e2efb5637bed5d36694f392767 100644
(file)
--- a/
cinelerra-5.1/debian/control
+++ b/
cinelerra-5.1/debian/control
@@
-1,7
+1,7
@@
Source: cin
Section: video
Priority: optional
Source: cin
Section: video
Priority: optional
-Standards-Version: 5.1.20180
430
+Standards-Version: 5.1.20180
502
Maintainer: mailing list <cinelerra@lists.cinelerra-cv.org>
Homepage: http://www.cinelerra-cv.org/
Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs,
Maintainer: mailing list <cinelerra@lists.cinelerra-cv.org>
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 e5de69d3b0ac92198e2eee7ee066bc21cc3297f5..73e2da52788e85ba01606d10e4f15a01949e1f9e 100644
(file)
--- 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
-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
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))
-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 :=
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 :=