Use nasm from repository

This commit is contained in:
Ilya Fedin 2024-04-05 13:34:52 +04:00 committed by John Preston
parent 090fdfb458
commit 542153d950
1 changed files with 1 additions and 14 deletions

View File

@ -19,7 +19,7 @@ ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/loc
RUN dnf -y install epel-release \
&& dnf config-manager --set-enabled powertools \
&& dnf -y install autoconf automake libtool pkgconfig make patch git \
python3.11-pip python3.11-devel gperf flex bison clang lld yasm \
python3.11-pip python3.11-devel gperf flex bison clang lld nasm yasm \
file which perl-open perl-XML-Parser perl-IPC-Cmd xorg-x11-util-macros \
gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils \
gcc-toolset-12-libasan-devel libffi-devel fontconfig-devel freetype-devel \
@ -55,17 +55,6 @@ RUN git init patches \
&& git reset --hard FETCH_HEAD \
&& rm -rf .git
FROM builder AS nasm
RUN git clone -b nasm-2.15.05 --depth=1 {{ GIT }}/netwide-assembler/nasm.git \
&& cd nasm \
&& ./autogen.sh \
&& ./configure \
&& make -j$(nproc) \
&& mkdir -p "{{ LibrariesPath }}/nasm-cache/usr/local/bin" \
&& install -c nasm "{{ LibrariesPath }}/nasm-cache/usr/local/bin/nasm" \
&& cd .. \
&& rm -rf nasm
FROM builder AS zlib
RUN git init zlib \
&& cd zlib \
@ -166,8 +155,6 @@ RUN git clone -b v1.4 --depth=1 {{ GIT }}/xiph/opus.git \
&& rm -rf opus
FROM builder AS dav1d
COPY --link --from=nasm {{ LibrariesPath }}/nasm-cache /
RUN git clone -b 1.4.1 --depth=1 {{ GIT }}/videolan/dav1d.git \
&& cd dav1d \
&& meson build \