Skip to content

Commit e349a0a

Browse files
committed
change ninja
1 parent d3712a4 commit e349a0a

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

ffmpeg/Dockerfile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ RUN rm -fr /var/lib/apt/lists/* && \
101101
libportmidi-dev \
102102
libpq-dev \
103103
libproj-dev \
104-
libprotoc \
105-
libprotobuf \
104+
# libprotoc \
105+
# libprotobuf \
106106
libprotobuf-dev \
107107
libsdl-dev \
108108
libsdl-image1.2-dev \
@@ -167,7 +167,7 @@ RUN rm -fr /var/lib/apt/lists/* && \
167167
yasm \
168168
openssh-client openssh-server \
169169
build-essential \
170-
gcc g++ make \
170+
gcc-6 g++-6 make \
171171
git subversion \
172172
zlib1g-dev \
173173
&& \
@@ -456,7 +456,7 @@ RUN cd /tmp/opencv-${OPENCV_VERSION}/cmake_binary && \
456456
-D BUILD_opencv_java=OFF \
457457
-D BUILD_opencv_ml=ON \
458458
-D BUILD_opencv_objdetect=ON \
459-
-D BUILD_opencv_photo=ON \
459+
# -D BUILD_opencv_photo=ON \
460460
-D BUILD_opencv_python2=OFF \
461461
-D BUILD_opencv_python3=ON \
462462
-D BUILD_opencv_stitching=ON \
@@ -514,6 +514,7 @@ RUN cd /tmp/opencv-${OPENCV_VERSION}/cmake_binary && \
514514
-D WITH_IPP_A=OFF \
515515
-D WITH_JASPER=ON \
516516
-D WITH_JPEG=ON \
517+
-D WITH_LAPACK=OFF \
517518
-D WITH_LIBV4L=ON \
518519
-D WITH_NVCUVID=ON \
519520
-D WITH_OPENCL=ON \
@@ -525,6 +526,7 @@ RUN cd /tmp/opencv-${OPENCV_VERSION}/cmake_binary && \
525526
-D WITH_OPENMP=OFF \
526527
-D WITH_OPENNI=OFF \
527528
-D WITH_PNG=ON \
529+
-D WITH_PROTOBUF=ON \
528530
-D WITH_PTHREADS_PF=OFF \
529531
-D WITH_PVAPI=ON \
530532
-D WITH_QT=OFF \
@@ -538,11 +540,12 @@ RUN cd /tmp/opencv-${OPENCV_VERSION}/cmake_binary && \
538540
-D WITH_XIMEA=OFF \
539541
-D WITH_XINE=OFF \
540542
-D WITH_ZLIB=ON \
541-
# -G Ninja \
542-
# -D CMAKE_INSTALL_PREFIX=/usr/local \
543-
.. 2>&1 | tee cmake_messages.txt && \
544-
make -j$(nproc) && \
545-
make install
543+
-G Ninja \
544+
-D CMAKE_INSTALL_PREFIX=/usr/local \
545+
.. 2>&1 | tee cmake_messages.txt
546+
RUN cd /tmp/opencv-4.5.2/cmake_binary && ninja
547+
#make -j$(nproc) && \
548+
# make install
546549

547550

548551
WORKDIR /usr/local

0 commit comments

Comments
 (0)