version update, rpm spec libva/vdpau fix, colorpicker tweaks, revert opencv v4->v3

diff --git a/cinelerra-5.1/blds/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD
index 79d1020b0936150e675ffdfaa52ed62c6c6f1f6c..bad88bc02d3ad06b62a41cbad5bf981323fe5615 100644 (file)
--- a/cinelerra-5.1/blds/PKGBUILD
+++ b/cinelerra-5.1/blds/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: goodguy <lists.cinelerra-gg.org>
 pkgname=cin
 pkgver=5.1
 # Maintainer: goodguy <lists.cinelerra-gg.org>
 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"
 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 2e28e105d1278422140b0bdffcfa8d1a37f26e1b..9736ff59a48103af169e23416bc3c1a42876b24e 100644 (file)
--- 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
 
 %define cin cinelerra
 Summary: Multimedia Editing and construction
 


@@ -50,8 +50,8 @@ BuildRequires: ncurses-devel
 BuildRequires: texinfo
 BuildRequires: udftools
 BuildRequires: gtk2-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}
 %{?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 52f750897409882fa540f50e3f8165da874eda7c..c2d0b048bdf6ae7dca2bc09e9cc7a531908b38fc 100644 (file)
--- 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 ]
 
 
   [ guy goode ]
 

diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control
index ef41478a0c3931dcb5d16e5d70500dc3b8b7878f..9abba848274fceb03af3a8c391cc84d2130d350b 100644 (file)
--- a/cinelerra-5.1/blds/debian/control
+++ b/cinelerra-5.1/blds/debian/control
@@ -1,7 +1,7 @@
 Source: cin
 Section: video
 Priority: optional
 Source: cin
 Section: video
 Priority: optional

-Standards-Version: 5.1.20190331
+Standards-Version: 5.1.20190430

 Maintainer: mailing list <cin@lists.cinelerra-gg.org>
 Homepage: https://www.cinelerra-gg.org/
 Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs,
 Maintainer: mailing list <cin@lists.cinelerra-gg.org>
 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 f36374669e8185d503ed1065693739e67586e2f0..7238d59d043a2adab7472bba5b5ef91e4565626f 100644 (file)
--- 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)
 {
 
 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;
        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)
 {
 
 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;
        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 1e782bc587adcf08e63f922a3acd845ec921ae9b..f13a2dceb96cad9c90ca33db7c5b0507d0f90f5b 100644 (file)
--- 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/)
 .
 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.
 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 e02d8d7120b0deea9d90817720f5ba904f7971b0..caacceebfb0cd8f646df9836839df236d45a25f7 100644 (file)
--- 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
 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:
 
 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 += -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
 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 df4d6d5903e53a1c6911fd5dd5dd0dc9a3d3ab9e..f835d0072f3415026defdd0d8b870e4387b5c175 100644 (file)
--- 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)
 {
 
 void SketcherWindow::done_event(int result)
 {

+       curve_color->close_picker();

        ungrab(plugin->server->mwindow->cwindow->gui);
 }
 
        ungrab(plugin->server->mwindow->cwindow->gui);
 }
 


@@ -778,6 +779,7 @@ int SketcherCurveList::handle_event()
 
 int SketcherCurveList::selection_changed()
 {
 
 int SketcherCurveList::selection_changed()
 {

+       gui->curve_color->close_picker();

        handle_event();
        return 1;
 }
        handle_event();
        return 1;
 }

diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.C b/cinelerra-5.1/plugins/titler/titlerwindow.C
index c556968aec3aa31ec0b54d398bb1b3598824178e..251389cd3240a5782c8330528a86acb506e6b883 100644 (file)
--- 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)
 {
 
 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;
        drag->drag_deactivate();
        delete color_popup;     color_popup = 0;
        delete png_popup;       png_popup = 0;