X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fopencv_build;h=e02d8d7120b0deea9d90817720f5ba904f7971b0;hb=d39e86b13734da9fb9eeec852bb0759bb051965b;hp=73e2da52788e85ba01606d10e4f15a01949e1f9e;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build
index 73e2da52..e02d8d71 100644
--- a/cinelerra-5.1/opencv_build
+++ b/cinelerra-5.1/opencv_build
@@ -40,13 +40,15 @@ $(foreach p,$(params),\
 src?=git
 bld?=sys
 git_url?=https://github.com/opencv
-tar_url?=https://cinelerra-cv.org/five/src/opencv-20170916.tgz
+tar_url?=https://www.cinelerra-gg.org/download/opencv/opencv-20180401.tgz
 opencv_tar:=$(notdir $(tar_url))
 
 cpus:=$(shell grep -c "^proc" /proc/cpuinfo)
 jobs:=-j$(shell echo $$(($(cpus) + $(cpus)/2 +2)))
 
-CFLAGS += -I$(opencv_prefix)/include
+#opencv4 breaks SIFT/SURF findobj
+CFLAGS += -I$(opencv_prefix)/include/opencv4
+#CFLAGS += -I$(opencv_prefix)/include
 
 ifeq ($(src),git)
 $(opencv).src:
@@ -77,12 +79,15 @@ $(opencv)/build: $(opencv).src
   -DINSTALL_C_EXAMPLES=OFF \
   -DINSTALL_PYTHON_EXAMPLES=OFF \
   -DBUILD_EXAMPLES=OFF .. \
+  -DBUILD_opencv_python3=no \
   -DCMAKE_INSTALL_PREFIX=/usr/local \
   -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/"
 
 LFLAGS += -Wl,--start-group
 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)
+#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 += -Wl,--end-group
 else ifeq ($(bld),dyn)
 $(opencv)/build: $(opencv).src
@@ -94,6 +99,7 @@ $(opencv)/build: $(opencv).src
   -DINSTALL_C_EXAMPLES=ON \
   -DINSTALL_PYTHON_EXAMPLES=ON \
   -DBUILD_EXAMPLES=ON .. \
+  -DBUILD_opencv_python3=no \
   -DCMAKE_INSTALL_PREFIX=/usr/local \
   -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/"