jketreno/intel-media-ffmpeg
1
0
Fork 0
Code Issues Activity

Merge branch 'master' into '2-refactor-build-process'

Browse Source 
# Conflicts:
#   MANIFEST
This commit is contained in:
Hannan, Jason L 2019-10-09 13:18:55 -07:00
commit 1e76b1a1a2
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Dockerfile
View File

@ -147,10 +147,10 @@ RUN git clone --depth 1 --branch n4.2.1 https://github.com/ffmpeg/ffmpeg /home/a
# Install all required common packages:
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get -q -y install \
libva-dev=2.6.0.agama-194 \
libmfx-dev=19.2.pre3.agama-194 \
libmfx1=19.2.pre3.agama-194 \
vainfo=2.6.0.agama-194 \
libva-dev=2.6.0.agama-196 \
libmfx-dev=19.2.pre3.agama-196 \
libmfx1=19.2.pre3.agama-196 \
vainfo=2.6.0.agama-196 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
@ -173,11 +173,11 @@ ENV LIBVA_DRIVER_NAME=iHD
# so explicitly install it.
RUN apt-get -q update \
&& DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -q -y install \
intel-media-va-driver-non-free=19.3.pre4.agama-194 \
libigdgmm11=19.3.2.agama-194 \
libva2=2.6.0.agama-194 \
libmfx1=19.2.pre3.agama-194 \
vainfo=2.6.0.agama-194 \
intel-media-va-driver-non-free=19.3.pre4.agama-196 \
libigdgmm11=19.3.2.agama-196 \
libva2=2.6.0.agama-196 \
libmfx1=19.2.pre3.agama-196 \
vainfo=2.6.0.agama-196 \
libpciaccess0 \
pciutils \
&& apt-get clean \
@ -204,6 +204,6 @@ ENTRYPOINT [ "/assets/entry" ]
# Ensure that each Docker container self-documents the
# versions included in it
ENV AGAMA_VERSION=194
ENV AGAMA_VERSION=196
COPY MANIFEST SOLUTION Dockerfile /assets/

3
MANIFEST
View File

@ -1,5 +1,4 @@
AGAMA_VERSION=194
INTEL_MEDIA_VA_DRIVER_VERSION==19.3.pre4.agama-194
INTEL_MEDIA_VA_DRIVER_NON_FREE_VERSION==19.3.pre4.agama-194
INTEL_OPENCL_ICD_VERSION==19.37.14191.agama-194
LIBD3DADAPTER9_MESA_VERSION==19.1.0.agama-194
@ -53,4 +52,4 @@ PIGLIT_VERSION==1.0.20190905.agama-194
PIGLIT_SHARDS_VERSION==20191004.agama-194
VA_DRIVER_ALL_VERSION==2.6.0.agama-194
VAINFO_VERSION==2.6.0.agama-194
WAFFLE_UTILS_VERSION==1.6.90.agama-194
WAFFLE_UTILS_VERSION==1.6.90.agama-194