X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fopencv_build;h=68771bc60f7160d576bdc3521a35fa58ee3ac8b0;hp=91950aaf91fc3ed047836389a07a122b7295ed2a;hb=9b18af02dc4ccbf052ef9d70180a3d16c0f9848b;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33

diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build
index 91950aaf..68771bc6 100644
--- a/cinelerra-5.1/opencv_build
+++ b/cinelerra-5.1/opencv_build
@@ -47,7 +47,7 @@ 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/opencv4
 CFLAGS += -I$(opencv_prefix)/include
 
 ifeq ($(src),git)
@@ -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,11 +84,10 @@ $(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
-#LFLAGS += $(shell find $(opencv_prefix)/lib64/opencv4/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)
@@ -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,9 +105,8 @@ $(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))
+CVLIBS := $(dir $(shell find $(opencv_prefix) -name libopencv_core.so))
 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 :=
@@ -119,6 +119,7 @@ LFLAGS += $(patsubst $(SYSLIB)/lib%.so,-l%,$(wildcard $(SYSLIB)/libopencv_*.so))
 LFLAGS += $(patsubst $(SYSLIB)/lib%.so,-l%,$(wildcard $(SYSLIB)/lib{Half,Imath,Ilm,Iex}*.so))
 static_libs :=
 static_incs :=
+CFLAGS += -I/usr/include/opencv4
 else
 $(error bld not sta/dyn/sys)
 endif