Skip to content

Commit 4808583

Browse files
committed
opencv now bundles libjpeg-turbo
and the separate's onre buid fails dueto expired certificate at https://kent.dl.sourceforge.net
1 parent 8d12fd7 commit 4808583

File tree

2 files changed

+0
-36
lines changed

2 files changed

+0
-36
lines changed

docker/Dockerfile_i686

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,6 @@ RUN cd ~/ffmpeg_sources && \
9191
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
9292
ENV LDFLAGS -L/root/ffmpeg_build/lib
9393

94-
RUN mkdir libjpeg-turbo && \
95-
cd libjpeg-turbo && \
96-
export PATH=~/bin:$PATH && \
97-
curl -L https://kent.dl.sourceforge.net/project/libjpeg-turbo/1.5.3/libjpeg-turbo-1.5.3.tar.gz > libjpeg-turbo-1.5.3.tar.gz && \
98-
tar xf libjpeg-turbo-1.5.3.tar.gz && \
99-
cd libjpeg-turbo-1.5.3 && \
100-
export CFLAGS="-fPIC" && \
101-
export CXXFLAGS="-fPIC" && \
102-
autoreconf -fiv && \
103-
./configure --host=i686-pc-linux-gnu && \
104-
make && \
105-
make install && \
106-
cd ../../ && \
107-
rm -rf libjpeg-turbo
108-
109-
ENV JPEG_LIBRARY /opt/libjpeg-turbo/lib32/libjpeg.a
110-
ENV JPEG_INCLUDE_DIR /opt/libjpeg-turbo/include
111-
11294
RUN curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/videodev2.h && \
11395
curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-common.h && \
11496
curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-controls.h && \

docker/Dockerfile_x86_64

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -89,24 +89,6 @@ RUN cd ~/ffmpeg_sources && \
8989
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
9090
ENV LDFLAGS -L/root/ffmpeg_build/lib
9191

92-
RUN mkdir libjpeg-turbo && \
93-
cd libjpeg-turbo && \
94-
export PATH=~/bin:$PATH && \
95-
curl -L https://kent.dl.sourceforge.net/project/libjpeg-turbo/1.5.3/libjpeg-turbo-1.5.3.tar.gz > libjpeg-turbo-1.5.3.tar.gz && \
96-
tar -xf libjpeg-turbo-1.5.3.tar.gz && \
97-
cd libjpeg-turbo-1.5.3 && \
98-
export CFLAGS="-fPIC" && \
99-
export CXXFLAGS="-fPIC" && \
100-
autoreconf -fiv && \
101-
./configure && \
102-
make && \
103-
make install && \
104-
cd ../../ && \
105-
rm -rf libjpeg-turbo
106-
107-
ENV JPEG_LIBRARY /opt/libjpeg-turbo/lib64/libjpeg.a
108-
ENV JPEG_INCLUDE_DIR /opt/libjpeg-turbo/include
109-
11092
RUN curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/videodev2.h && \
11193
curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-common.h && \
11294
curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-controls.h && \

0 commit comments

Comments
 (0)