diff --git a/Dockerfile.opencv b/Dockerfile.opencv index 1b6ab2d4..694ff053 100644 --- a/Dockerfile.opencv +++ b/Dockerfile.opencv @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ git build-essential cmake pkg-config unzip libgtk2.0-dev \ curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ - libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev && \ + libjpeg-dev libpng-dev libtiff-dev libdc1394-dev && \ rm -rf /var/lib/apt/lists/* ARG OPENCV_VERSION="4.6.0" diff --git a/Dockerfile.opencv-gpu-cuda-10 b/Dockerfile.opencv-gpu-cuda-10 index dbfb166d..5cc61d32 100644 --- a/Dockerfile.opencv-gpu-cuda-10 +++ b/Dockerfile.opencv-gpu-cuda-10 @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ git build-essential cmake pkg-config unzip libgtk2.0-dev \ wget curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ - libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev && \ + libjpeg-dev libpng-dev libtiff-dev libdc1394-dev && \ rm -rf /var/lib/apt/lists/* ARG OPENCV_VERSION="4.6.0" diff --git a/Dockerfile.opencv-gpu-cuda-11 b/Dockerfile.opencv-gpu-cuda-11 index 14cbdb1c..ba8b3119 100644 --- a/Dockerfile.opencv-gpu-cuda-11 +++ b/Dockerfile.opencv-gpu-cuda-11 @@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ git build-essential cmake pkg-config unzip libgtk2.0-dev \ wget curl ca-certificates libcurl4-openssl-dev libssl-dev \ libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev \ - libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev && \ + libjpeg-dev libpng-dev libtiff-dev libdc1394-dev && \ rm -rf /var/lib/apt/lists/* ARG OPENCV_VERSION="4.6.0" diff --git a/Makefile b/Makefile index 2efb37bf..bdacb326 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,8 @@ BUILD_SHARED_LIBS?=ON # Package list for each well-known Linux distribution RPMS=cmake curl wget git gtk2-devel libpng-devel libjpeg-devel libtiff-devel tbb tbb-devel libdc1394-devel unzip gcc-c++ -DEBS=unzip wget build-essential cmake curl git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev -JETSON=build-essential cmake git unzip pkg-config libjpeg-dev libpng-dev libtiff-dev libavcodec-dev libavformat-dev libswscale-dev libgtk2.0-dev libcanberra-gtk* libxvidcore-dev libx264-dev libgtk-3-dev libtbb2 libtbb-dev libdc1394-22-dev libv4l-dev v4l-utils libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libavresample-dev libvorbis-dev libxine2-dev libfaac-dev libmp3lame-dev libtheora-dev libopencore-amrnb-dev libopencore-amrwb-dev libopenblas-dev libatlas-base-dev libblas-dev liblapack-dev libeigen3-dev gfortran libhdf5-dev protobuf-compiler libprotobuf-dev libgoogle-glog-dev libgflags-dev +DEBS=unzip wget build-essential cmake curl git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-dev +JETSON=build-essential cmake git unzip pkg-config libjpeg-dev libpng-dev libtiff-dev libavcodec-dev libavformat-dev libswscale-dev libgtk2.0-dev libcanberra-gtk* libxvidcore-dev libx264-dev libgtk-3-dev libtbb2 libtbb-dev libdc1394-dev libv4l-dev v4l-utils libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libavresample-dev libvorbis-dev libxine2-dev libfaac-dev libmp3lame-dev libtheora-dev libopencore-amrnb-dev libopencore-amrwb-dev libopenblas-dev libatlas-base-dev libblas-dev liblapack-dev libeigen3-dev gfortran libhdf5-dev protobuf-compiler libprotobuf-dev libgoogle-glog-dev libgflags-dev explain: @echo "For quick install with typical defaults of both OpenCV and GoCV, run 'make install'"