dav1d: use nasm from ubuntu eoan since dav1d needs nasm-2.14 (#3375)

2020-02-11 21:29:36 +01:00 · 2020-02-11 21:29:36 +01:00 · e37ccaa85f
parent 0ed0f37ca2
commit e37ccaa85f
4 changed files with 5 additions and 5 deletions
--- a/projects/dav1d/Dockerfile
+++ b/projects/dav1d/Dockerfile
@ -17,7 +17,7 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER janne-vlc@jannau.net

-ADD bionic.list /etc/apt/sources.list.d/bionic.list
+ADD nasm.list /etc/apt/sources.list.d/nasm.list
 ADD nasm_apt.pin /etc/apt/preferences

 RUN dpkg --add-architecture i386 && \
--- a/projects/dav1d/bionic.list
+++ b/projects/dav1d/bionic.list
@ -1,2 +0,0 @@
-# use nasm 2.13.02 from bionic
-deb http://archive.ubuntu.com/ubuntu/ bionic universe
--- a/projects/dav1d/nasm.list
+++ b/projects/dav1d/nasm.list
@ -0,0 +1,2 @@
+# use nasm from a newer ubuntu release
+deb http://archive.ubuntu.com/ubuntu/ eoan universe
--- a/projects/dav1d/nasm_apt.pin
+++ b/projects/dav1d/nasm_apt.pin
@ -1,7 +1,7 @@
 Package: *
-Pin: release n=bionic
+Pin: release n=eoan
 Pin-Priority: 1

 Package: nasm
-Pin: release n=bionic
+Pin: release n=eoan
 Pin-Priority: 555