remove old openjpeg which was upgrade awhile back

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

diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build
index 20d6ea167b53de0cdb662ad71481fe9543ee71c8..736e1d90290a09571dd6f019d2192e0799674e53 100644 (file)
--- 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)
@@ -64,6 +64,8 @@ $(srcdir)/$(opencv_tar):
 $(opencv).src: $(srcdir)/$(opencv_tar)
        cd $(blddir) && rm -rf opencv opencv_contrib opencv.*
        tar -C $(blddir) -xzf $(srcdir)/$(opencv_tar);
+       $(foreach pch,$(sort $(wildcard $(srcdir)/$(opencv_tar).patch*)),\
+               patch -d $(blddir) -p1 < $(pch);)
        touch $@
 else
 $(error src not git/tar)
@@ -76,6 +78,7 @@ $(opencv)/build: $(opencv).src
   -DCMAKE_BUILD_TYPE=RELEASE \
   -DWITH_IPP=OFF \
   -DWITH_LAPACK=OFF \
+  -DWITH_GPHOTO2=OFF \
   -DBUILD_SHARED_LIBS=OFF \
   -DINSTALL_C_EXAMPLES=OFF \
   -DINSTALL_PYTHON_EXAMPLES=OFF \
@@ -87,7 +90,7 @@ $(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)/lib*/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)
@@ -97,6 +100,7 @@ $(opencv)/build: $(opencv).src
   -DCMAKE_BUILD_TYPE=RELEASE \
   -DWITH_IPP=OFF \
   -DWITH_LAPACK=OFF \
+  -DWITH_GPHOTO2=OFF \
   -DBUILD_SHARED_LIBS=ON \
   -DINSTALL_C_EXAMPLES=ON \
   -DINSTALL_PYTHON_EXAMPLES=ON \
@@ -106,7 +110,7 @@ $(opencv)/build: $(opencv).src
   -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/"
 
 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 +123,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