version update, tweak opencv_build rm lapack

diff --git a/cinelerra-5.1/blds/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD
index 9a3cf88f2e828e90185800ecaa272c29feea97d0..b70f7a2bd233fecb3b9d45ad9876840ebe2798a3 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
-pkgrel=20190930
+pkgrel=20191031
 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 31b1647e3342588ea83a9af571f9e5524360ecbe..cc2ce3795fdbfdf9e76b5fc2e766110168972ceb 100644 (file)
--- a/cinelerra-5.1/blds/cinelerra.spec
+++ b/cinelerra-5.1/blds/cinelerra.spec
@@ -1,4 +1,4 @@
-%define ver 20190930
+%define ver 20191031
 %define cin cinelerra
 Summary: Multimedia Editing and construction
 

diff --git a/cinelerra-5.1/blds/debian/changelog b/cinelerra-5.1/blds/debian/changelog
index 67877d8f2cd1a07a1bd74ce3acd42ffe3db32f71..586a0f69db9d67808232a880fc9ff15db433459d 100644 (file)
--- a/cinelerra-5.1/blds/debian/changelog
+++ b/cinelerra-5.1/blds/debian/changelog
@@ -1,4 +1,4 @@
-cin (1:5.1.20190930) unstable; urgency=low
+cin (1:5.1.20191031) unstable; urgency=low
 
   [ guy goode ]
 

diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control
index f79c270f662fe79a6b20f9f07eb2799478e96079..fc7378357a4f1a8d67fcbc8c4fb1c53037579a02 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
-Standards-Version: 5.1.20190930
+Standards-Version: 5.1.20191031
 Maintainer: mailing list <cin@lists.cinelerra-gg.org>
 Homepage: https://www.cinelerra-gg.org/
 Build-Depends:

diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build
index 91950aaf91fc3ed047836389a07a122b7295ed2a..20d6ea167b53de0cdb662ad71481fe9543ee71c8 100644 (file)
--- a/cinelerra-5.1/opencv_build
+++ b/cinelerra-5.1/opencv_build
@@ -75,6 +75,7 @@ $(opencv)/build: $(opencv).src
        cd $@ && cmake \
   -DCMAKE_BUILD_TYPE=RELEASE \
   -DWITH_IPP=OFF \
+  -DWITH_LAPACK=OFF \
   -DBUILD_SHARED_LIBS=OFF \
   -DINSTALL_C_EXAMPLES=OFF \
   -DINSTALL_PYTHON_EXAMPLES=OFF \
@@ -83,7 +84,6 @@ $(opencv)/build: $(opencv).src
   -DCMAKE_INSTALL_PREFIX=/usr/local \
   -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/"
 
-LFLAGS += -llapack -lcblas
 LFLAGS += -Wl,--start-group
 LFLAGS += $(shell find $(opencv_prefix)/lib* -name "libopencv_*.a" 2> /dev/null)
 #opencv4 breaks SIFT/SURF findobj
@@ -96,6 +96,7 @@ $(opencv)/build: $(opencv).src
        cd $@ && cmake \
   -DCMAKE_BUILD_TYPE=RELEASE \
   -DWITH_IPP=OFF \
+  -DWITH_LAPACK=OFF \
   -DBUILD_SHARED_LIBS=ON \
   -DINSTALL_C_EXAMPLES=ON \
   -DINSTALL_PYTHON_EXAMPLES=ON \
@@ -104,7 +105,6 @@ $(opencv)/build: $(opencv).src
   -DCMAKE_INSTALL_PREFIX=/usr/local \
   -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/"
 
-LFLAGS += -llapack -lcblas
 SYSLIB := $(lastword $(wildcard /usr/lib /usrlib32 /usr/lib64))
 CVLIBS := $(dir (shell find $(opencv_prefix) -name libopencv_core.a))
 LFLAGS += -L$(CVLIBS) $(patsubst $(CVLIBS)/lib%.so,-l%,$(wildcard $(CVLIBS)/libopencv_*.so))