9 files changed, 167 insertions, 94 deletions

diff --git a/recipes-graphics/gmmlib/gmmlib_19.1.2.bb b/recipes-graphics/gmmlib/gmmlib_22.7.1.bb
index f47174da..d61a2fa1 100644
--- a/recipes-graphics/gmmlib/gmmlib_19.1.2.bb
+++ b/recipes-graphics/gmmlib/gmmlib_22.7.1.bb
@@ -4,18 +4,20 @@ device specific and buffer management for the Intel(R) Graphics \
 Compute Runtime for OpenCL(TM) and the Intel(R) Media Driver for VAAPI."
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d9a6e772cd4c362ee4c8ef87c5aad843"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=465fe90caea3edd6a2cecb3f0c28a654"
 
 SRC_URI = " \
-            git://github.com/intel/gmmlib.git;protocol=https \
+            git://github.com/intel/gmmlib.git;protocol=https;branch=master \
             "
 
-SRCREV = "50707fb182bc8fc8f9711d2c0da96f6ded1b8ef4"
+SRCREV = "aa4e5d6c8f1d798b78ffd7ea85296fdd3a3946b2"
 
-S = "${WORKDIR}/git"
+COMPATIBLE_HOST:x86-x32 = "null"
 
 UPSTREAM_CHECK_GITTAGREGEX = "^intel-gmmlib-(?P<pver>(\d+(\.\d+)+))$"
 
 inherit pkgconfig cmake
 
 EXTRA_OECMAKE += "-DRUN_TEST_SUITE=OFF"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch b/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch
new file mode 100644
index 00000000..6d32da43
--- /dev/null
+++ b/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch
@@ -0,0 +1,42 @@
+From 5cbcecff0bb7fa1c617d3082e7ad94c22e5f4eb1 Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Wed, 3 Jul 2019 17:13:15 +0800
+Subject: [PATCH] main: fix hdcpd service failure
+
+Child process not able to finish before parent process
+exits, which causing hdcpd service failure.
+
+Added wait function to block parent process
+until child process exits.
+
+Upstream-Status: Submitted [https://github.com/intel/hdcp/pull/17]
+
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ daemon/main.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/daemon/main.cpp b/daemon/main.cpp
+index 9a028d7..ef1e047 100644
+--- a/daemon/main.cpp
++++ b/daemon/main.cpp
+@@ -36,6 +36,7 @@
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <iostream>
++#include <sys/wait.h>
+ 
+ #include "hdcpdef.h"
+ #include "srm.h"
+@@ -93,6 +94,8 @@ int32_t daemon_init(void)
+     }
+     else if (pid != 0)
+     {
++        int status;
++        wait(&status);
+         exit(SUCCESS);    // parent exit
+     }
+ 
+-- 
+2.17.1
+
diff --git a/recipes-graphics/hdcp/hdcp_21.2.0.bb b/recipes-graphics/hdcp/hdcp_21.2.0.bb
new file mode 100644
index 00000000..f45dea02
--- /dev/null
+++ b/recipes-graphics/hdcp/hdcp_21.2.0.bb
@@ -0,0 +1,25 @@
+SUMMARY  = "Intel(R) unified HDCP SDK"
+DESCRIPTION = "This is a user space implementation to prevent copying of \
+digital audio & video content across digital display interfaces. It provides \
+Linux user space implementation to enable the HDCP1.4 and HDCP2.2 protection \
+for external digital display interface"
+LICENSE  = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c50969be4feb8b99c6baa3795ede4dce"
+SECTION = "lib"
+
+inherit pkgconfig cmake useradd systemd features_check
+
+SRC_URI = "git://github.com/intel/hdcp.git;branch=master;protocol=https \
+        file://0001-main-fix-hdcpd-service-failure.patch \
+"
+SRCREV = "cacc352159c5bdaf1c21846cecdd1eb7b031e1d3"
+
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+DEPENDS = "libdrm virtual/mesa systemd"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false --gid nogroup media"
+
+SYSTEMD_SERVICE:${PN} = "hdcpd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/recipes-graphics/igt-gpu-tools/files/0001-lib-fb-Fix-rgb24-to-nv12-conversion.patch b/recipes-graphics/igt-gpu-tools/files/0001-lib-fb-Fix-rgb24-to-nv12-conversion.patch
deleted file mode 100644
index 46b2eef5..00000000
--- a/recipes-graphics/igt-gpu-tools/files/0001-lib-fb-Fix-rgb24-to-nv12-conversion.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f01796214bbde31e37b0593e547ad9436fdd02ba Mon Sep 17 00:00:00 2001
-From: Petri Latvala <petri.latvala@intel.com>
-Date: Wed, 9 Jan 2019 14:28:29 +0200
-Subject: [PATCH] lib/fb: Fix rgb24 to nv12 conversion
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A typo fix in 1x2 pixel block conversion code, revealed by GCC 9
-
-Fixes: 1c7ef3890045 ("lib: Use igt_matrix for ycbcr<->rgb conversion")
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109257
-Reported-by: Martin Liska <mliska@suse.cz>
-Signed-off-by: Petri Latvala <petri.latvala@intel.com>
-Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
-Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
-
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- lib/igt_fb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/igt_fb.c b/lib/igt_fb.c
-index 8244e517..5cd1829a 100644
---- a/lib/igt_fb.c
-+++ b/lib/igt_fb.c
-@@ -1779,7 +1779,7 @@ static void convert_rgb24_to_nv12(struct fb_convert *cvt)
-                        struct igt_vec4 yuv[2];
- 
-                        read_rgb(&rgb[0], &rgb24[j * 8 + 0]);
--                       read_rgb(&rgb[2], &rgb24[j * 8 + 0 + rgb24_stride]);
-+                       read_rgb(&rgb[1], &rgb24[j * 8 + 0 + rgb24_stride]);
- 
-                        yuv[0] = igt_matrix_transform(&m, &rgb[0]);
-                        yuv[1] = igt_matrix_transform(&m, &rgb[1]);
--- 
-2.20.1
-
diff --git a/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.23.bb b/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.23.bb
deleted file mode 100644
index 33c04e77..00000000
--- a/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.23.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-require ${COREBASE}/meta/recipes-graphics/xorg-app/xorg-app-common.inc
-
-SUMMARY = "Intel GPU tools"
-DESCRIPTION = "Variety of small tools for testing intel graphics."
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=e4b3dd344780e0400593b21b115a6947"
-
-LICENSE_append = " & ISC"
-
-inherit autotools gtk-doc
-
-SRC_URI = "${XORG_MIRROR}/individual/app/${BP}.tar.xz \
-           file://0001-lib-fb-Fix-rgb24-to-nv12-conversion.patch \
-           "
-
-DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr procps libunwind kmod openssl"
-RDEPENDS_${PN} += "bash"
-RDEPENDS_${PN}-tests += "bash"
-
-PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests"
-
-SRC_URI[md5sum] = "04c1f10d6fd85e079271540b0ea786e9"
-SRC_URI[sha256sum] = "4d4b086c513bace5c23d0889de3f42ac3ebd3d968c64dedae6e28e006a499ad0"
-
-EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger"
-COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
-COMPATIBLE_HOST_libc-musl_class-target = "null"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[audio] = "--enable-audio,--disable-audio,alsa-lib gsl"
-
-gputools_sysroot_preprocess() {
-        rm -f ${SYSROOT_DESTDIR}${libdir}/pkgconfig/intel-gen4asm.pc
-}
-SYSROOT_PREPROCESS_FUNCS += "gputools_sysroot_preprocess"
-
-FILES_${PN} += "${libdir}/intel_aubdump.so"
-FILES_${PN}-benchmarks += "${libexecdir}/${BPN}/benchmarks"
-FILES_${PN}-tests += "\
-                ${libexecdir}/${BPN}/*\
-                ${datadir}/${BPN}/1080p-right.png\
-                ${datadir}/${BPN}/1080p-left.png\
-                ${datadir}/${BPN}/pass.png\
-                ${datadir}/${BPN}/test-list.txt"
diff --git a/recipes-graphics/libva/libva-intel-utils_2.22.0.bb b/recipes-graphics/libva/libva-intel-utils_2.22.0.bb
new file mode 100644
index 00000000..041ea1ed
--- /dev/null
+++ b/recipes-graphics/libva/libva-intel-utils_2.22.0.bb
@@ -0,0 +1,34 @@
+SUMMARY = "libva-utils is a collection of utilities from libva project"
+
+DESCRIPTION = "libva-utils is a collection of utilities \
+and examples to exercise VA-API in accordance with the libva \
+project.VA-API is an open-source library and API specification, \
+which provides access to graphics hardware acceleration capabilities \
+for video processing. It consists of a main library and driver-specific \
+acceleration backends for each supported hardware vendor"
+
+HOMEPAGE = "https://01.org/linuxmedia/vaapi"
+BUGTRACKER = "https://github.com/intel/libva-utils/issues"
+
+SECTION = "x11"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
+
+SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.22-branch;protocol=https"
+SRCREV = "1a13ae13382b7b548f3a7e8035e1d7df66662c0a"
+
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
+
+DEPENDS = "libva"
+
+inherit meson pkgconfig features_check
+
+# depends on libva which requires opengl
+REQUIRED_DISTRO_FEATURES = "opengl"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
+PACKAGECONFIG[x11] = "-Dx11=true, -Dx11=false,virtual/libx11 libxext libxfixes"
+PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false,wayland-native wayland"
+
+PROVIDES = "libva-utils"
+RPROVIDES:${PN} += "libva-utils"
diff --git a/recipes-graphics/libva/libva-intel_2.22.0.bb b/recipes-graphics/libva/libva-intel_2.22.0.bb
new file mode 100644
index 00000000..b6b1f6ed
--- /dev/null
+++ b/recipes-graphics/libva/libva-intel_2.22.0.bb
@@ -0,0 +1,54 @@
+SUMMARY = "Video Acceleration (VA) API for Linux"
+DESCRIPTION = "Video Acceleration API (VA API) is a library (libVA) \
+and API specification which enables and provides access to graphics \
+hardware (GPU) acceleration for video processing on Linux and UNIX \
+based operating systems. Accelerated processing includes video \
+decoding, video encoding, subpicture blending and rendering. The \
+specification was originally designed by Intel for its GMA (Graphics \
+Media Accelerator) series of GPU hardware, the API is however not \
+limited to GPUs or Intel specific hardware, as other hardware and \
+manufacturers can also freely use this API for hardware accelerated \
+video decoding."
+
+HOMEPAGE = "https://01.org/linuxmedia/vaapi"
+BUGTRACKER = "https://github.com/intel/libva/issues"
+
+SECTION = "x11"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
+
+SRC_URI = "git://github.com/intel/libva.git;protocol=https;branch=v2.22-branch \
+          "
+
+SRCREV = "217da1c28336d6a7e9c0c4cb8f1c303968a675f1"
+
+UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases"
+
+DEPENDS = "libdrm"
+
+inherit meson pkgconfig
+
+PACKAGECONFIG ??= " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \
+"
+
+PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxext libxfixes"
+PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/mesa"
+
+PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland"
+
+PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland"
+
+RDEPENDS:${PN}-x11 =+ "${PN}"
+RDEPENDS:${PN}-glx =+ "${PN}-x11"
+
+FILES:${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}"
+FILES:${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}"
+FILES:${PN}-wayland =+ "${libdir}/libva-wayland*${SOLIBS}"
+
+PROVIDES += "libva"
+RPROVIDES:${PN} += "libva"
+RPROVIDES:${PN}-x11 += "libva-x11"
+RPROVIDES:${PN}-glx += "libva-glx"
+RPROVIDES:${PN}-wayland += "libva-wayland"
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.5.102.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.13.178.bb
index 14dda35b..decac761 100644
--- a/recipes-graphics/metrics-discovery/metrics-discovery_1.5.102.bb
+++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.13.178.bb
@@ -2,14 +2,14 @@ SUMMARY  = "Intel Metrics Discovery Application Programming Interface"
 DESCRIPTION = "This software is a user mode library that provides access to \
 GPU performance data."
 LICENSE  = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5ac9e51fb25f5d5b10a1bea412a4b74c"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=195912d57508b573e068231099eba64c"
 SECTION = "lib"
 
 inherit pkgconfig cmake
 
-S = "${WORKDIR}/git"
-SRCREV = "ac8d17cfd7f33aefea353dfc4eda65f6beb0a9ae"
-SRC_URI = "git://github.com/intel/metrics-discovery.git"
+SRCREV = "65ffef89cf79d704f618768bcd3d95f4dd6d875b"
+SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \
+          "
 
 EXTRA_OECMAKE += "-DMD_PLATFORM=linux"
 EXTRA_OECMAKE += "-DMD_LIBDRM_SRC=${STAGING_INCDIR}"
diff --git a/recipes-graphics/xorg-driver/xf86-video-ast_1.1.5.bb b/recipes-graphics/xorg-driver/xf86-video-ast_1.1.6.bb
index 090efd62..d7e4eab4 100644
--- a/recipes-graphics/xorg-driver/xf86-video-ast_1.1.5.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-ast_1.1.6.bb
@@ -7,6 +7,6 @@ DESCRIPTION = "ast is an Xorg driver for ASpeed Technologies video cards"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0b8c242f0218eea5caa949b7910a774b"
 
 DEPENDS += "libpciaccess"
+XORG_DRIVER_COMPRESSOR = ".tar.gz"
 
-SRC_URI[md5sum] = "4f85febe48d51e53624550a96fc9e9ee"
-SRC_URI[sha256sum] = "1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de"
+SRC_URI[sha256sum] = "eeff52178ce2916a0e07b531bb23c8b105826b6e6e6c5f7c90e33f757827a7c7"