Skip to content

Commit cf04012

Browse files
author
Zennoe
committed
rebase with upstream. ran ./update.py
2 parents 25e65d0 + 4bed344 commit cf04012

File tree

42 files changed

+1386
-1554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1386
-1554
lines changed

‎docker-images/3.2/alpine/Dockerfile‎

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,44 +20,43 @@ ARG MAKEFLAGS="-j2"
2020

2121
ENV FFMPEG_VERSION=3.2.14 \
2222
AOM_VERSION=v1.0.0 \
23-
FDKAAC_VERSION=0.1.5 \
24-
FONTCONFIG_VERSION=2.12.4 \
25-
FREETYPE_VERSION=2.5.5 \
26-
FRIBIDI_VERSION=0.19.7 \
27-
KVAZAAR_VERSION=1.2.0 \
23+
FDKAAC_VERSION=2.0.1 \
24+
FONTCONFIG_VERSION=2.13.92 \
25+
FREETYPE_VERSION=2.10.1 \
26+
FRIBIDI_VERSION=1.0.8 \
27+
KVAZAAR_VERSION=1.3.0 \
2828
LAME_VERSION=3.100 \
29-
LIBASS_VERSION=0.13.7 \
29+
LIBASS_VERSION=0.14.0 \
3030
LIBPTHREAD_STUBS_VERSION=0.4 \
3131
LIBVIDSTAB_VERSION=1.1.0 \
3232
LIBXCB_VERSION=1.13.1 \
3333
XCBPROTO_VERSION=1.13 \
34-
OGG_VERSION=1.3.2 \
34+
OGG_VERSION=1.3.4 \
3535
OPENCOREAMR_VERSION=0.1.5 \
36-
OPUS_VERSION=1.2 \
37-
OPENJPEG_VERSION=2.1.2 \
36+
OPUS_VERSION=1.3.1 \
37+
OPENJPEG_VERSION=2.3.1 \
3838
THEORA_VERSION=1.1.1 \
39-
VORBIS_VERSION=1.3.5 \
40-
VPX_VERSION=1.8.0 \
41-
WEBP_VERSION=1.0.2 \
42-
X264_VERSION=20170226-2245-stable \
43-
X265_VERSION=3.1.1 \
39+
VORBIS_VERSION=1.3.6 \
40+
VPX_VERSION=1.8.2 \
41+
WEBP_VERSION=1.0.3 \
42+
X265_VERSION=3.2.1 \
4443
XAU_VERSION=1.0.9 \
4544
XORG_MACROS_VERSION=1.19.2 \
4645
XPROTO_VERSION=7.0.31 \
47-
XVID_VERSION=1.3.4 \
46+
XVID_VERSION=1.3.7 \
4847
LIBXML2_VERSION=2.9.10 \
4948
LIBBLURAY_VERSION=1.1.2 \
5049
SRC=/usr/local
5150

52-
ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz"
53-
ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz"
54-
ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz"
51+
ARG FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz"
52+
ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2"
53+
ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.tar.gz"
5554
ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz"
56-
ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz"
57-
ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz"
58-
ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz"
59-
ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz"
60-
ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz"
55+
ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz"
56+
ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz"
57+
ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2"
58+
ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz"
59+
ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz"
6160
ARG LIBXML2_SHA256SUM="f07dab13bf42d2b8db80620cce7419b3b87827cc937c8bb20fe13b8571ee9501 libxml2-v2.9.10.tar.gz"
6261
ARG LIBBLURAY_SHA256SUM="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42 libbluray-1.1.2.tar.bz2"
6362

@@ -102,7 +101,7 @@ RUN \
102101
DIR=/tmp/x264 && \
103102
mkdir -p ${DIR} && \
104103
cd ${DIR} && \
105-
curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \
104+
curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \
106105
tar -jx --strip-components=1 && \
107106
./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \
108107
make && \
@@ -163,9 +162,9 @@ RUN \
163162
DIR=/tmp/theora && \
164163
mkdir -p ${DIR} && \
165164
cd ${DIR} && \
166-
curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \
165+
curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \
167166
echo ${THEORA_SHA256SUM} | sha256sum --check && \
168-
tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \
167+
tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \
169168
./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \
170169
make && \
171170
make install && \
@@ -209,7 +208,7 @@ RUN \
209208
DIR=/tmp/xvid && \
210209
mkdir -p ${DIR} && \
211210
cd ${DIR} && \
212-
curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \
211+
curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \
213212
echo ${XVID_SHA256SUM} | sha256sum --check && \
214213
tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \
215214
cd xvidcore/build/generic && \
@@ -270,12 +269,10 @@ RUN \
270269
DIR=/tmp/fribidi && \
271270
mkdir -p ${DIR} && \
272271
cd ${DIR} && \
273-
curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \
272+
curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \
274273
echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \
275-
tar -zx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.gz && \
276-
sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \
277-
./bootstrap --no-config && \
278-
./configure -prefix="${PREFIX}" --disable-static --enable-shared && \
274+
tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \
275+
./autogen.sh && \
279276
make -j 1 && \
280277
make install && \
281278
rm -rf ${DIR}
@@ -284,8 +281,8 @@ RUN \
284281
DIR=/tmp/fontconfig && \
285282
mkdir -p ${DIR} && \
286283
cd ${DIR} && \
287-
curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 &&\
288-
tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \
284+
curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\
285+
tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \
289286
./configure -prefix="${PREFIX}" --disable-static --enable-shared && \
290287
make && \
291288
make install && \
@@ -295,10 +292,9 @@ RUN \
295292
DIR=/tmp/libass && \
296293
mkdir -p ${DIR} && \
297294
cd ${DIR} && \
298-
curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\
295+
curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\
299296
echo ${LIBASS_SHA256SUM} | sha256sum --check && \
300-
tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \
301-
./autogen.sh && \
297+
tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \
302298
./configure -prefix="${PREFIX}" --disable-static --enable-shared && \
303299
make && \
304300
make install && \

‎docker-images/3.2/centos/Dockerfile‎

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -22,44 +22,43 @@ ARG MAKEFLAGS="-j2"
2222

2323
ENV FFMPEG_VERSION=3.2.14 \
2424
AOM_VERSION=v1.0.0 \
25-
FDKAAC_VERSION=0.1.5 \
26-
FONTCONFIG_VERSION=2.12.4 \
27-
FREETYPE_VERSION=2.5.5 \
28-
FRIBIDI_VERSION=0.19.7 \
29-
KVAZAAR_VERSION=1.2.0 \
25+
FDKAAC_VERSION=2.0.1 \
26+
FONTCONFIG_VERSION=2.13.92 \
27+
FREETYPE_VERSION=2.10.1 \
28+
FRIBIDI_VERSION=1.0.8 \
29+
KVAZAAR_VERSION=1.3.0 \
3030
LAME_VERSION=3.100 \
31-
LIBASS_VERSION=0.13.7 \
31+
LIBASS_VERSION=0.14.0 \
3232
LIBPTHREAD_STUBS_VERSION=0.4 \
3333
LIBVIDSTAB_VERSION=1.1.0 \
3434
LIBXCB_VERSION=1.13.1 \
3535
XCBPROTO_VERSION=1.13 \
36-
OGG_VERSION=1.3.2 \
36+
OGG_VERSION=1.3.4 \
3737
OPENCOREAMR_VERSION=0.1.5 \
38-
OPUS_VERSION=1.2 \
39-
OPENJPEG_VERSION=2.1.2 \
38+
OPUS_VERSION=1.3.1 \
39+
OPENJPEG_VERSION=2.3.1 \
4040
THEORA_VERSION=1.1.1 \
41-
VORBIS_VERSION=1.3.5 \
42-
VPX_VERSION=1.8.0 \
43-
WEBP_VERSION=1.0.2 \
44-
X264_VERSION=20170226-2245-stable \
45-
X265_VERSION=3.1.1 \
41+
VORBIS_VERSION=1.3.6 \
42+
VPX_VERSION=1.8.2 \
43+
WEBP_VERSION=1.0.3 \
44+
X265_VERSION=3.2.1 \
4645
XAU_VERSION=1.0.9 \
4746
XORG_MACROS_VERSION=1.19.2 \
4847
XPROTO_VERSION=7.0.31 \
49-
XVID_VERSION=1.3.4 \
48+
XVID_VERSION=1.3.7 \
5049
LIBXML2_VERSION=2.9.10 \
5150
LIBBLURAY_VERSION=1.1.2 \
5251
SRC=/usr/local
5352

54-
ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz"
55-
ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz"
56-
ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz"
53+
ARG FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz"
54+
ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2"
55+
ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.tar.gz"
5756
ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz"
58-
ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz"
59-
ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz"
60-
ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz"
61-
ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz"
62-
ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz"
57+
ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz"
58+
ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz"
59+
ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2"
60+
ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz"
61+
ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz"
6362
ARG LIBXML2_SHA256SUM="f07dab13bf42d2b8db80620cce7419b3b87827cc937c8bb20fe13b8571ee9501 libxml2-v2.9.10.tar.gz"
6463
ARG LIBBLURAY_SHA256SUM="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42 libbluray-1.1.2.tar.bz2"
6564

@@ -105,7 +104,7 @@ RUN \
105104
DIR=/tmp/x264 && \
106105
mkdir -p ${DIR} && \
107106
cd ${DIR} && \
108-
curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \
107+
curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \
109108
tar -jx --strip-components=1 && \
110109
./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \
111110
make && \
@@ -166,9 +165,9 @@ RUN \
166165
DIR=/tmp/theora && \
167166
mkdir -p ${DIR} && \
168167
cd ${DIR} && \
169-
curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \
168+
curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \
170169
echo ${THEORA_SHA256SUM} | sha256sum --check && \
171-
tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \
170+
tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \
172171
./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \
173172
make && \
174173
make install && \
@@ -212,7 +211,7 @@ RUN \
212211
DIR=/tmp/xvid && \
213212
mkdir -p ${DIR} && \
214213
cd ${DIR} && \
215-
curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \
214+
curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \
216215
echo ${XVID_SHA256SUM} | sha256sum --check && \
217216
tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \
218217
cd xvidcore/build/generic && \
@@ -273,12 +272,10 @@ RUN \
273272
DIR=/tmp/fribidi && \
274273
mkdir -p ${DIR} && \
275274
cd ${DIR} && \
276-
curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \
275+
curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \
277276
echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \
278-
tar -zx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.gz && \
279-
sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \
280-
./bootstrap --no-config && \
281-
./configure -prefix="${PREFIX}" --disable-static --enable-shared && \
277+
tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \
278+
./autogen.sh && \
282279
make -j 1 && \
283280
make install && \
284281
rm -rf ${DIR}
@@ -287,8 +284,8 @@ RUN \
287284
DIR=/tmp/fontconfig && \
288285
mkdir -p ${DIR} && \
289286
cd ${DIR} && \
290-
curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 &&\
291-
tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \
287+
curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\
288+
tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \
292289
./configure -prefix="${PREFIX}" --disable-static --enable-shared && \
293290
make && \
294291
make install && \
@@ -298,10 +295,9 @@ RUN \
298295
DIR=/tmp/libass && \
299296
mkdir -p ${DIR} && \
300297
cd ${DIR} && \
301-
curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\
298+
curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\
302299
echo ${LIBASS_SHA256SUM} | sha256sum --check && \
303-
tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \
304-
./autogen.sh && \
300+
tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \
305301
./configure -prefix="${PREFIX}" --disable-static --enable-shared && \
306302
make && \
307303
make install && \

0 commit comments

Comments
 (0)