fixed error

Author: hephaex

ffmpeg/Dockerfile.cv

@@ -30,94 +30,50 @@ RUN set -xe && \
     apt-get install -y --no-install-recommends software-properties-common wget && \
     add-apt-repository -y ppa:deadsnakes/ppa && \
     apt-get update -y && \
-    apt-get install -y \
-	autoconf \
-	automake \
-	build-essential \
-	gir1.2-gtk-3.0 \
-	git \
-  	openssh-client \
-        build-essential \
-        cmake \
-        python${PYTHON_VERSION} \
-        python${PYTHON_VERSION}-dev \
-        qtbase5-dev \
-	graphviz \
-	make \
-	mercurial \
-	mime-support \
-	net-tools \
-	openssh-server \
-	pdsh \
-	pkg-config \
-	proj-bin \
-	protobuf-compiler \
-	subversion \
-	texinfo \
-	unzip \
-	v4l-utils \	
-	x264 \
-	xvfb \
-	xz-utils \
-	yasm \
-	zip \
-	zlib1g-dev \
+    apt-get install -y --no-install-recommends \
+	ca-certificates \
+	curl \
+	dkms \
+	fonts-nanum \
+	fonts-nanum-coding \
+	fonts-nanum-extra \
+	g++ \
+	gfortran \
+	htop \
+	iputils-ping \
 	libasound2-dev \
-	libass-dev \
-	libatlas-base-dev \
 	libavcodec-dev \
-	libavformat-dev \
-	libavresample-dev \
 	libboost-dev \
 	libboost-filesystem-dev \
 	libboost-system-dev \
-	libcairo2-dev \
-	libdc1394-22-dev \
-	libeigen3-dev \
-	libfaac-dev \
-	libfreetype6-dev \
+	libcairo2-dev libgirepository1.0-dev pkg-config gir1.2-gtk-3.0 \
 	libgdal-dev python3-gdal \
-	libgeos++-dev \
-	libgeos-dev \
-	libgirepository1.0-dev \
-	libgoogle-glog-dev \
-	libgflags-dev \
-	libgphoto2-dev \
-	libgstreamer-plugins-base1.0-dev \
-	libgstreamer1.0-dev \
-	libgtk-3-dev \
-	libhdf5-dev \	
-	liblapack-dev \
-	libmp3lame-dev \
 	libnuma-dev \
-	libopenblas-dev \
-	libopencore-amrnb-dev \
-	libopencore-amrwb-dev \
-	libportmidi-dev \
-	libproj-dev \
-	libprotobuf-dev \
-	libsdl-image1.2-dev \
-	libsdl-mixer1.2-dev \
-	libsdl-ttf2.0-dev \
-	libsdl2-dev \
+	libopenblas-dev liblapack-dev \
 	libsm6 \
 	libswscale-dev \
-	libtheora-dev \
-	libtool \
 	libv4l-dev \
-	libva-dev \
-	libvdpau-dev \
-	libvorbis-dev \
-	libx264-dev \
-	libxcb-shm0-dev \
-	libxcb-xfixes0-dev \
 	libxext6 \
 	libxine2-dev \
 	libxml2-dev \
 	libxrender-dev \
 	libxslt1-dev \
-	libxvidcore-dev \
-	libzmq3-dev \
+	make \
+	mime-support \
+	net-tools \
+	openssh-server \
+	pdsh \
+	proj-bin libproj-dev libgeos-dev libgeos++-dev graphviz \
+	subversion \
+	unzip \
+	xvfb \
+	xz-utils \
+	yasm \
+	zip \
+  	openssh-client \
+        build-essential \
+        gcc \
+        git \
         libavformat-dev \
         libcurl3-dev \
         libfreetype6-dev \
@@ -126,15 +82,26 @@ RUN set -xe && \
         libjpeg-dev \
         libmpdec2 \
         libpng-dev \
-        libsdl-dev \
-        libsmpeg-dev \
+        libsdl-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev \
+        libsmpeg-dev libportmidi-dev libavformat-dev libswscale-dev \
         libssl-dev \
-        libtbb-dev \
         libtiff-dev \
-        libxcb1-dev \
-    && \
+        libzmq3-dev \
+        pkg-config \
+        python${PYTHON_VERSION} \
+        python${PYTHON_VERSION}-dev \
+        vim \
+        wget \
+        zlib1g-dev \
+        wget build-essential automake autoconf git libtool libvorbis-dev \
+        libass-dev libfreetype6-dev libsdl2-dev libva-dev libvdpau-dev \
+        libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev \
+        mercurial libnuma-dev texinfo zlib1g-dev \
+        qtbase5-dev && \
     mkdir -p /usr/local/ffmpeg_sources && \
     ln -s /usr/include/libv4l1-videodev.h /usr/include/linux/videodev.h && \
+    mkdir -p /etc/OpenCL/vendors && \
+    echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icdn && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/
 
@@ -149,37 +116,18 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
     echo "/usr/local/cuda/lib64/stubs" > /etc/ld.so.conf.d/z-cuda-stubs.conf && \
     ldconfig
 
-RUN rm /usr/bin/python /usr/bin/python3 && \
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0-Linux-x86_64.sh \
+         -q -O /tmp/cmake-install.sh && \
+    chmod u+x /tmp/cmake-install.sh && \
+    mkdir /usr/bin/cmake && \
+    /tmp/cmake-install.sh --skip-license --prefix=/usr/bin/cmake && \
+    rm /tmp/cmake-install.sh
+
+RUN rm /usr/bin/python3 && \
     ln -s /usr/bin/python3.8 /usr/bin/python3 && \
     update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
     update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 2
 
-# OFED
-WORKDIR /tmp
-RUN wget -q -O - https://www.mellanox.com/downloads/ofed/MLNX_OFED-5.1-2.3.7.1/MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-ubuntu18.04-x86_64.tgz | tar xzf - && \
-    cd /tmp/MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-ubuntu18.04-x86_64 && \
-    ./mlnxofedinstall --user-space-only --without-fw-update --all -q && \
-    cd /tmp && \
-    rm -rf /tmp/MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-ubuntu18.04-x86_64*
-    
-# nvidia-peer
-WORKDIR /tmp
-RUN git clone https://github.com/Mellanox/nv_peer_memory.git /tmp/nv_peer_memory && \
-    cd /tmp/nv_peer_memory && \
-    ./build_module.sh && \
-    cd /tmp && \
-    tar xzf /tmp/nvidia-peer-memory_1.1.orig.tar.gz && \
-    cd /tmp/nvidia-peer-memory-1.1 && \
-    dpkg-buildpackage -us -uc && \
-    dpkg -i /tmp/nvidia-peer-memory_1.1-0_all.deb
-
-#RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0-Linux-x86_64.sh \
-#         -q -O /tmp/cmake-install.sh && \
-#    chmod u+x /tmp/cmake-install.sh && \
-#    mkdir /usr/bin/cmake && \
-#    /tmp/cmake-install.sh --skip-license --prefix=/usr/bin/cmake && \
-#    chmod +x /usr/bin/cmake && \
-#    rm /tmp/cmake-install.sh
 
 # Instaling NASM
 WORKDIR /usr/local/ffmpeg_sources