Skip to content
This repository has been archived by the owner on Sep 16, 2024. It is now read-only.

Commit

Permalink
[v21.6] Ubuntu 20.04 fix for vaapi tests due to lib change (#767)
Browse files Browse the repository at this point in the history 
* Update Docker image README (#704)

* update README

* Update dockerfiles

* [master] Fix Opencv 4.5.2 build with Toolset on Centos 7 (#746)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix opencv 4.5.2 build with toolset

Co-authored-by: jhou5 <[email protected]>

* [master] Upgrade Meson for Ubuntu-20.04 (#748)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* meson version fix

Co-authored-by: jhou5 <[email protected]>

* [master] Test fixes for Release v21.6 - part 1 (#750)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* v216 tests update - part 1

Co-authored-by: jhou5 <[email protected]>

* [master] Test fixes for Release v21.6 - part 2 (#755)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* v216 tests update - part 1

* Test fixes for Release v21.6 - part 2

Co-authored-by: jhou5 <[email protected]>

* [master] Bug fixes for Release v21.6 (#757)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* Bug fixes for v21.6. See details

- QAT Engine build param fix
- revert scvp change for owt360
- test name change for proper injection of tests
- devoolset opencv fix
- nginx conf sw_fallback off

* revert accidental fdkaac change

Co-authored-by: jhou5 <[email protected]>

* [master] Owt boost revert (#759)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* revert boost for owt on centos7

Co-authored-by: jhou5 <[email protected]>

* [master] Fix Ipsec caused u2004 bug (#762)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix ipsecmb caused system fault in u2004

Co-authored-by: jhou5 <[email protected]>

* [master] Dldt Video Analytics test fix (#764)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix dldt gva tests broken by links

Co-authored-by: jhou5 <[email protected]>

* fix u2004 images for vaapi due to lib change

Co-authored-by: jhou5 <[email protected]>
  • Loading branch information
@dpatel257 @jhou5
dpatel257 and jhou5 authored Jul 7, 2021
1 parent d335a87 commit c77bd0d
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ WORKDIR /home
RUN apt-get update && apt-get upgrade -y systemd
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.71.0 libboost-system1.71.0 libboost-program-options1.71.0 libjson-c4 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libwayland-egl1 libglib2.0-dev && \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.71.0 libboost-system1.71.0 libboost-program-options1.71.0 libjson-c4 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libwayland-egl1 libglib2.0-dev && \
rm -rf /var/lib/apt/lists/*

COPY --from=build /opt/dist /
Expand Down
2 changes: 1 addition & 1 deletion VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ WORKDIR /home
RUN apt-get update && apt-get upgrade -y systemd
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.71.0 libboost-system1.71.0 libboost-program-options1.71.0 libjson-c4 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libwayland-egl1 libglib2.0-dev && \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.71.0 libboost-system1.71.0 libboost-program-options1.71.0 libjson-c4 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libwayland-egl1 libglib2.0-dev && \
rm -rf /var/lib/apt/lists/*

COPY --from=build /opt/dist /
Expand Down
2 changes: 1 addition & 1 deletion XeonE3/ubuntu-20.04/analytics/dev/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ WORKDIR /home
RUN apt-get update && apt-get upgrade -y systemd
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \
rm -rf /var/lib/apt/lists/*

COPY --from=build /opt/dist /
Expand Down
2 changes: 1 addition & 1 deletion XeonE3/ubuntu-20.04/analytics/gst/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ WORKDIR /home
RUN apt-get update && apt-get upgrade -y systemd
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \
rm -rf /var/lib/apt/lists/*

COPY --from=build /opt/dist /
Expand Down
2 changes: 1 addition & 1 deletion XeonE3/ubuntu-20.04/media/dev/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ WORKDIR /home
RUN apt-get update && apt-get upgrade -y systemd
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 && \
rm -rf /var/lib/apt/lists/*

COPY --from=build /opt/dist /
Expand Down
2 changes: 1 addition & 1 deletion XeonE3/ubuntu-20.04/media/gst/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ WORKDIR /home
RUN apt-get update && apt-get upgrade -y systemd
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \
libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 && \
rm -rf /var/lib/apt/lists/*

COPY --from=build /opt/dist /
Expand Down
2 changes: 1 addition & 1 deletion template/components/gst-vaapi.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ include(gst-plugins-bad.m4)
ifelse(OS_NAME,ubuntu,`
define(`GSTVAAPI_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison ifdef(`ENABLE_INTEL_GFX_REPO',libva-dev)')

define(`GSTVAAPI_INSTALL_DEPS',`libdrm2 libglib2.0-0 libpciaccess0 libgl1-mesa-glx ifdef(`ENABLE_INTEL_GFX_REPO',libva2 libva-drm2 libva-x11-2 libva-wayland2)')
define(`GSTVAAPI_INSTALL_DEPS',`libdrm2 libglib2.0-0 libpciaccess0 libgl1-mesa-glx ifdef(`ENABLE_INTEL_GFX_REPO',libva2 libva-drm2 libva-x11-2 libva-wayland2)' ifelse(OS_NAME:OS_VERSION,ubuntu:20.04,libgles2))
')

ifelse(OS_NAME,centos,`
Expand Down

0 comments on commit c77bd0d

Please sign in to comment.