fast drag/drop rework, modify labels in mwin->cwin locks, mods to cut/paste, marks...

[goodguy/cinelerra.git] / cinelerra-5.1 / opencv_build

diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build
index 73e2da52788e85ba01606d10e4f15a01949e1f9e..b42fb611079b1fdef3666ddb5a1d94b9e7086987 100644 (file)
--- a/cinelerra-5.1/opencv_build
+++ b/cinelerra-5.1/opencv_build
@@ -40,12 +40,14 @@ $(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)))
 
+#opencv4 breaks SIFT/SURF findobj
+#CFLAGS += -I$(opencv_prefix)/include/opencv4
 CFLAGS += -I$(opencv_prefix)/include
 
 ifeq ($(src),git)
@@ -82,6 +84,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 += -Wl,--end-group
 else ifeq ($(bld),dyn)