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

Cleared MANIFEST version pins so we can build a release and a devel version

Browse Source 
Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James Ketrenos 2019-10-22 16:28:56 -07:00
parent a8586c6a85
commit c28ce2bbe5
3 changed files with 19 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Dockerfile
View File

@ -24,12 +24,14 @@ FROM amr-registry.caas.intel.com/vtt-osgc/os/ubuntu:disco AS base
# Pre-install proxy configuration values
#
# This uses the linux-ftp.ostc.intel.com as a mirror.
RUN echo "Acquire::http::proxy \"http://proxy-chain.intel.com:911/\";\n" \
"Acquire::https::proxy \"https://proxy-chain.intel.com:911/\";\n" \
"Acquire::ftp::proxy \"ftp://proxy-chain.intel.com:911/\";\n" \
"Acquire::socks::proxy \"socks://proxy-chain.intel.com:1080/\";\n" \
"Acquire::http::Proxy::linux-ftp.ostc.intel.com DIRECT;\n" \
"Acquire::http::Proxy::osgc.jf.intel.com DIRECT;\n" > /etc/apt/apt.conf
RUN { \
echo "Acquire::http::proxy \"http://proxy-chain.intel.com:911/\";\n" ; \
echo "Acquire::https::proxy \"http://proxy-chain.intel.com:912/\";\n" ; \
echo "Acquire::ftp::proxy \"ftp://proxy-chain.intel.com:911/\";\n" ; \
echo "Acquire::socks::proxy \"socks://proxy-chain.intel.com:1080/\";\n" ; \
echo "Acquire::http::Proxy::linux-ftp.ostc.intel.com DIRECT;\n" ; \
echo "Acquire::http::Proxy::osgc.jf.intel.com DIRECT;\n" ; \
} > /etc/apt/apt.conf
#
# Template from templates/templates/08-intel-certs.in
@ -158,10 +160,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-198 \
libmfx-dev=19.2.pre3.agama-198 \
libmfx1=19.2.pre3.agama-198 \
vainfo=2.6.0.agama-198 \
libva-dev \
libmfx-dev \
libmfx1 \
vainfo \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
@ -184,10 +186,10 @@ 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-198 \
libva2=2.6.0.agama-198 \
libmfx1=19.2.pre3.agama-198 \
vainfo=2.6.0.agama-198 \
intel-media-va-driver-non-free \
libva2 \
libmfx1 \
vainfo \
libpciaccess0 \
pciutils \
&& apt-get clean \
@ -214,6 +216,6 @@ ENTRYPOINT [ "/assets/entry" ]
# Ensure that each Docker container self-documents the
# versions included in it
ENV AGAMA_VERSION=198
ENV AGAMA_VERSION=N/A
COPY MANIFEST SOLUTION Dockerfile /assets/

63
MANIFEST
View File

@ -1,62 +1 @@
AGAMA_VERSION=198
INTEL_MEDIA_VA_DRIVER_NON_FREE_VERSION==19.3.pre4.agama-198
INTEL_OPENCL_ICD_VERSION==19.37.14191.agama-198
LIBD3DADAPTER9_MESA_VERSION==19.2.1.agama-198
LIBD3DADAPTER9_MESA_DEV_VERSION==19.2.1.agama-198
LIBDRM_AMDGPU1_VERSION==2.4.99.agama-198
LIBDRM_COMMON_VERSION==2.4.99.agama-198
LIBDRM_DEV_VERSION==2.4.99.agama-198
LIBDRM_INTEL1_VERSION==2.4.99.agama-198
LIBDRM_NOUVEAU2_VERSION==2.4.99.agama-198
LIBDRM_RADEON1_VERSION==2.4.99.agama-198
LIBDRM2_VERSION==2.4.99.agama-198
LIBEGL_MESA0_VERSION==19.2.1.agama-198
LIBEGL1_MESA_VERSION==19.2.1.agama-198
LIBEGL1_MESA_DEV_VERSION==19.2.1.agama-198
LIBGBM_DEV_VERSION==19.2.1.agama-198
LIBGBM1_VERSION==19.2.1.agama-198
LIBGL1_MESA_DEV_VERSION==19.2.1.agama-198
LIBGL1_MESA_DRI_VERSION==19.2.1.agama-198
LIBGL1_MESA_GLX_VERSION==19.2.1.agama-198
LIBGLAPI_MESA_VERSION==19.2.1.agama-198
LIBGLES2_MESA_VERSION==19.2.1.agama-198
LIBGLES2_MESA_DEV_VERSION==19.2.1.agama-198
LIBGLX_MESA0_VERSION==19.2.1.agama-198
LIBIGC_DEV_VERSION==1.0.11.agama-198
LIBIGC_TOOLS_VERSION==1.0.11.agama-198
LIBIGC1_VERSION==1.0.11.agama-198
LIBIGDFCL_DEV_VERSION==1.0.11.agama-198
LIBIGDFCL1_VERSION==1.0.11.agama-198
LIBIGDGMM_DEV_VERSION==19.3.1.agama-198
LIBIGDGMM9_VERSION==19.3.1.agama-198
LIBIGFXCMRT_DEV_VERSION==19.3.pre4.agama-198
LIBIGFXCMRT7_VERSION==19.3.pre4.agama-198
LIBMFX_DEV_VERSION==19.2.pre3.agama-198
LIBMFX_TOOLS_VERSION==19.2.pre3.agama-198
LIBMFX1_VERSION==19.2.pre3.agama-198
LIBOPENCL_CLANG_DEV_VERSION==8.0.0.agama-198
LIBOPENCL_CLANG8_VERSION==8.0.0.agama-198
LIBOSMESA6_VERSION==19.2.1.agama-198
LIBOSMESA6_DEV_VERSION==19.2.1.agama-198
LIBVA_DEV_VERSION==2.6.0.agama-198
LIBVA_DRM2_VERSION==2.6.0.agama-198
LIBVA_GLX2_VERSION==2.6.0.agama-198
LIBVA_WAYLAND2_VERSION==2.6.0.agama-198
LIBVA_X11_2_VERSION==2.6.0.agama-198
LIBVA2_VERSION==2.6.0.agama-198
LIBWAFFLE_1_0_VERSION==1.6.90.agama-198
LIBWAFFLE_DEV_VERSION==1.6.90.agama-198
LIBWAFFLE_DOC_VERSION==1.6.90.agama-198
LIBWAYLAND_EGL1_MESA_VERSION==19.2.1.agama-198
LIBXATRACKER_DEV_VERSION==19.2.1.agama-198
LIBXATRACKER2_VERSION==19.2.1.agama-198
MESA_COMMON_DEV_VERSION==19.2.1.agama-198
MESA_OPENCL_ICD_VERSION==19.2.1.agama-198
MESA_VA_DRIVERS_VERSION==19.2.1.agama-198
MESA_VDPAU_DRIVERS_VERSION==19.2.1.agama-198
MESA_VULKAN_DRIVERS_VERSION==19.2.1.agama-198
PIGLIT_VERSION==1.0.20190905.agama-198
PIGLIT_SHARDS_VERSION==20191014.agama-198
VA_DRIVER_ALL_VERSION==2.6.0.agama-198
VAINFO_VERSION==2.6.0.agama-198
WAFFLE_UTILS_VERSION==1.6.90.agama-198
AGAMA_VERSION="N/A"

1
SOLUTION
View File

@ -5,6 +5,7 @@ OS_DISTRO=${OS_DISTRO:-ubuntu}
OS_RELEASE=${OS_RELEASE:-disco}
PACKAGE_STREAM=${PACKAGE_STREAM:-${OS_RELEASE}}
PACKAGE_KEYFILE=https://osgc.jf.intel.com/graphics/ubuntu/aptly_repo_signing.key
#PACKAGE_REPOSITORY=http://dvgo6jxukvox2.cloudfront.net/graphics/${OS_DISTRO}
PACKAGE_REPOSITORY=https://osgc.jf.intel.com/graphics/${OS_DISTRO}
#PACKAGE_KEYFILE=https://repositories.intel.com/graphics/ubuntu/repository.key
#PACKAGE_REPOSITORY=https://repositories.intel.com/graphics/${OS_DISTRO}