Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to 4.3.1 and fix some bugs in Docker image #48

Closed
wants to merge 2 commits into from
Closed

Bump to 4.3.1 and fix some bugs in Docker image #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d828cd0
Upgrade to 4.3.1
joshuaboniface Jul 19, 2020
8953bb6
Fix several bugs in Dockerfile
joshuaboniface Jul 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"
ARG SRC=/usr/local

ARG FFMPEG_VERSION=4.2.1
ARG FFMPEG_VERSION=4.3.1
ARG LAME_VERSION=3.100
ARG OPENCOREAMR_VERSION=0.1.5
ARG OPENJPEG_VERSION=2.1.2
Expand Down Expand Up @@ -75,11 +75,11 @@ RUN buildDeps="autoconf \
libtool \
make \
nasm \
ninja-build \
ninja-build \
perl \
pkg-config \
python \
python3-setuptools \
python3-setuptools \
python3-pip \
libgnutls28-dev \
yasm \
Expand All @@ -88,19 +88,22 @@ RUN buildDeps="autoconf \
apt-get -yqq update && \
apt-get install -yq --no-install-recommends ${buildDeps}
## dav1d https://code.videolan.org/videolan/dav1d
RUN \
pip3 install meson && \
DIR=/tmp/dav1d && \
mkdir -p ${DIR} && \
cd ${DIR} && \
git clone --depth=1 https://code.videolan.org/videolan/dav1d.git && \
cd dav1d && \
RUN \
pip3 install meson && \
DIR=/tmp/dav1d && \
mkdir -p ${DIR} && \
cd ${DIR} && \
git clone --depth=1 https://code.videolan.org/videolan/dav1d.git && \
cd dav1d && \
mkdir build && \
cd build && \
meson -Denable_asm=true -Denable_avx512=false -Ddefault_library=shared --prefix=${PREFIX} .. && \
ninja && \
meson install

ninja && \
meson install && \
mkdir -p ${PREFIX}/lib/pkgconfig/ && \
mv ${PREFIX}/lib/x86_64-linux-gnu/libdav1d* ${PREFIX}/lib/ && \
mv ${PREFIX}/lib/x86_64-linux-gnu/pkgconfig/dav1d.pc ${PREFIX}/lib/pkgconfig/ && \
rm -rf ${DIR} ${PREFIX}/lib/x86_64-linux-gnu
## opencore-amr https://sourceforge.net/projects/opencore-amr/
RUN \
DIR=/tmp/opencore-amr && \
Expand Down Expand Up @@ -332,7 +335,7 @@ RUN \
DIR=/tmp/ffnvcodec && \
git clone --branch ${NVCODECHEADERS_VERSION} --depth 1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} ; \
cd ${DIR} ; \
make install PREFEX=${PREFIX} ; \
make install PREFIX=${PREFIX} ; \
rm -rf ${DIR}

## ffmpeg https://ffmpeg.org/
Expand All @@ -358,10 +361,9 @@ RUN \
sed -i 's/ require_pkg_config libx265 x265 x265.h x265_api_get &&//' configure \
;; \
x86*) \
PLATFORM_ARGS="--enable-libaom --enable-cuvid --enable-nvenc" \
PLATFORM_ARGS="--enable-libaom --enable-cuvid --enable-nvenc --enable-libdav1d" \
;; \
esac && \

./configure \
--disable-debug \
--disable-doc \
Expand Down Expand Up @@ -390,7 +392,6 @@ RUN \
--enable-postproc \
--enable-version3 \
--enable-rpath \
--enable-libdav1d \
--extra-cflags="-I${PREFIX}/include" \
--extra-ldflags="-L${PREFIX}/lib" \
--extra-libs=-ldl \
Expand Down