projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework proxy scaler, fix crop-gui coord, video_data tweak for proxy_format
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
opencv_build
diff --git
a/cinelerra-5.1/opencv_build
b/cinelerra-5.1/opencv_build
index 612e4d29ef68a5f151c1bf2c0c0c2f62c43855c9..caacceebfb0cd8f646df9836839df236d45a25f7 100644
(file)
--- a/
cinelerra-5.1/opencv_build
+++ b/
cinelerra-5.1/opencv_build
@@
-40,7
+40,7
@@
$(foreach p,$(params),\
src?=git
bld?=sys
git_url?=https://github.com/opencv
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)
opencv_tar:=$(notdir $(tar_url))
cpus:=$(shell grep -c "^proc" /proc/cpuinfo)
@@
-79,6
+79,7
@@
$(opencv)/build: $(opencv).src
-DINSTALL_C_EXAMPLES=OFF \
-DINSTALL_PYTHON_EXAMPLES=OFF \
-DBUILD_EXAMPLES=OFF .. \
-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/"
-DCMAKE_INSTALL_PREFIX=/usr/local \
-DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/"
@@
-98,6
+99,7
@@
$(opencv)/build: $(opencv).src
-DINSTALL_C_EXAMPLES=ON \
-DINSTALL_PYTHON_EXAMPLES=ON \
-DBUILD_EXAMPLES=ON .. \
-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/"
-DCMAKE_INSTALL_PREFIX=/usr/local \
-DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/"