From d72d54c0e9d75486bb003e256630c77f77ce6368 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Tue, 30 Apr 2019 19:48:53 -0600 Subject: [PATCH] version update, rpm spec libva/vdpau fix, colorpicker tweaks, revert opencv v4->v3 --- cinelerra-5.1/blds/PKGBUILD | 2 +- cinelerra-5.1/blds/cinelerra.spec | 6 +++--- cinelerra-5.1/blds/debian/changelog | 2 +- cinelerra-5.1/blds/debian/control | 2 +- cinelerra-5.1/cinelerra/colorpicker.C | 6 ++++-- cinelerra-5.1/msg/txt | 6 ++++++ cinelerra-5.1/opencv_build | 8 ++++---- cinelerra-5.1/plugins/sketcher/sketcherwindow.C | 2 ++ cinelerra-5.1/plugins/titler/titlerwindow.C | 2 ++ 9 files changed, 24 insertions(+), 12 deletions(-) diff --git a/cinelerra-5.1/blds/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD index 79d1020b..bad88bc0 100644 --- a/cinelerra-5.1/blds/PKGBUILD +++ b/cinelerra-5.1/blds/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: goodguy pkgname=cin pkgver=5.1 -pkgrel=20190331 +pkgrel=20190430 pkgdesc="Cinelerra git://git.cinelerra-gg.org/goodguy/cinelerra.git ($pkgrel)" arch=('x86_64') url="https://www.cinelerra-gg.org" diff --git a/cinelerra-5.1/blds/cinelerra.spec b/cinelerra-5.1/blds/cinelerra.spec index 2e28e105..9736ff59 100644 --- a/cinelerra-5.1/blds/cinelerra.spec +++ b/cinelerra-5.1/blds/cinelerra.spec @@ -1,4 +1,4 @@ -%define ver 20190331 +%define ver 20190430 %define cin cinelerra Summary: Multimedia Editing and construction @@ -50,8 +50,8 @@ BuildRequires: ncurses-devel BuildRequires: texinfo BuildRequires: udftools BuildRequires: gtk2-devel -BuildRequires: va-devel -BuildRequires: vdpau-devel +BuildRequires: libva-devel +BuildRequires: libvdpau-devel %{?rhat:BuildRequires: alsa-lib-devel} %{?rhat:BuildRequires: bzip2-devel} %{?rhat:BuildRequires: xorg-x11-fonts-cyrillic} diff --git a/cinelerra-5.1/blds/debian/changelog b/cinelerra-5.1/blds/debian/changelog index 52f75089..c2d0b048 100644 --- a/cinelerra-5.1/blds/debian/changelog +++ b/cinelerra-5.1/blds/debian/changelog @@ -1,4 +1,4 @@ -cin (1:5.1.20190331) unstable; urgency=low +cin (1:5.1.20190430) unstable; urgency=low [ guy goode ] diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control index ef41478a..9abba848 100644 --- a/cinelerra-5.1/blds/debian/control +++ b/cinelerra-5.1/blds/debian/control @@ -1,7 +1,7 @@ Source: cin Section: video Priority: optional -Standards-Version: 5.1.20190331 +Standards-Version: 5.1.20190430 Maintainer: mailing list Homepage: https://www.cinelerra-gg.org/ Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs, diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C index f3637466..7238d59d 100644 --- a/cinelerra-5.1/cinelerra/colorpicker.C +++ b/cinelerra-5.1/cinelerra/colorpicker.C @@ -1342,7 +1342,8 @@ void ColorBoxButton::create_objects() void ColorBoxButton::set_color(int color) { - this->color = color; + this->color = (color & 0xffffff); + this->alpha = (~color>>24) & 0xff; int r = (color>>16) & 0xff; int g = (color>> 8) & 0xff; int b = (color>> 0) & 0xff; @@ -1403,7 +1404,8 @@ void ColorCircleButton::create_objects() void ColorCircleButton::set_color(int color) { - this->color = color; + this->color = (color & 0xffffff); + this->alpha = (~color>>24); int r = (color>>16) & 0xff; int g = (color>>8) & 0xff; int b = (color>>0) & 0xff; diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt index 1e782bc5..f13a2dce 100644 --- a/cinelerra-5.1/msg/txt +++ b/cinelerra-5.1/msg/txt @@ -8,6 +8,12 @@ Cinfinity icons selected in Preferences Sam (CC BY 3.0, Neophyte theme selected in Preferences by Olaf Wolff (CC BY 4.0, https://creativecommons.org/licenses/by/4.0/) . +April 2019 New Features of note: + GPU usage for MPEG/H.264 formats with vdpau/vaapi for decode. + New Tracer plugin to outline objects available. + A Clear button for 15 plugins sliders eases usage. + Camera and Projector slight improvements with yellow line. + Enhanced ffmpeg error reporting. March 2019 New Features of note: Mixers, multiple cameras, now has Audio Alignment. Additional options for Preview mode in Resources window. diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build index e02d8d71..caacceeb 100644 --- a/cinelerra-5.1/opencv_build +++ b/cinelerra-5.1/opencv_build @@ -47,8 +47,8 @@ cpus:=$(shell grep -c "^proc" /proc/cpuinfo) jobs:=-j$(shell echo $$(($(cpus) + $(cpus)/2 +2))) #opencv4 breaks SIFT/SURF findobj -CFLAGS += -I$(opencv_prefix)/include/opencv4 -#CFLAGS += -I$(opencv_prefix)/include +#CFLAGS += -I$(opencv_prefix)/include/opencv4 +CFLAGS += -I$(opencv_prefix)/include ifeq ($(src),git) $(opencv).src: @@ -86,8 +86,8 @@ $(opencv)/build: $(opencv).src LFLAGS += -Wl,--start-group LFLAGS += $(shell find $(opencv_prefix)/lib* -name "libopencv_*.a" 2> /dev/null) #opencv4 breaks SIFT/SURF findobj -LFLAGS += $(shell find $(opencv_prefix)/lib64/opencv4/3rdparty/lib* -name "lib*.a" 2> /dev/null) -#LFLAGS += $(shell find $(opencv_prefix)/share/OpenCV/3rdparty/lib* -name "lib*.a" 2> /dev/null) +#LFLAGS += $(shell find $(opencv_prefix)/lib64/opencv4/3rdparty/lib* -name "lib*.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 diff --git a/cinelerra-5.1/plugins/sketcher/sketcherwindow.C b/cinelerra-5.1/plugins/sketcher/sketcherwindow.C index df4d6d59..f835d007 100644 --- a/cinelerra-5.1/plugins/sketcher/sketcherwindow.C +++ b/cinelerra-5.1/plugins/sketcher/sketcherwindow.C @@ -460,6 +460,7 @@ void SketcherWindow::create_objects() void SketcherWindow::done_event(int result) { + curve_color->close_picker(); ungrab(plugin->server->mwindow->cwindow->gui); } @@ -778,6 +779,7 @@ int SketcherCurveList::handle_event() int SketcherCurveList::selection_changed() { + gui->curve_color->close_picker(); handle_event(); return 1; } diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.C b/cinelerra-5.1/plugins/titler/titlerwindow.C index c556968a..251389cd 100644 --- a/cinelerra-5.1/plugins/titler/titlerwindow.C +++ b/cinelerra-5.1/plugins/titler/titlerwindow.C @@ -118,6 +118,8 @@ TitleWindow::TitleWindow(TitleMain *client) void TitleWindow::done_event(int result) { + color_button->close_picker(); + outline_button->close_picker(); drag->drag_deactivate(); delete color_popup; color_popup = 0; delete png_popup; png_popup = 0; -- 2.26.2