8 files changed, 11 insertions, 163 deletions

diff --git a/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch
deleted file mode 100644
index 21cffe24..00000000
--- a/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8729d66800995a9b7e693bd78249932bd12383e1 Mon Sep 17 00:00:00 2001
-From: John Machado <john.machado@intel.com>
-Date: Mon, 25 Mar 2024 11:13:27 +0530
-Subject: [PATCH] Add new DG2 device IDs (#194)
-
-Upstream-status: Backport
-https://github.com/intel/gmmlib/commit/dcc4b85ea3728c848b62fbb164c00f43b519b6fb
-
-Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
----
- Source/inc/common/igfxfmid.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h
-index 7969779..8e2c955 100644
---- a/Source/inc/common/igfxfmid.h
-+++ b/Source/inc/common/igfxfmid.h
-@@ -1932,6 +1932,8 @@ typedef enum __NATIVEGTTYPE
- #define DEV_ID_56BB                             0x56BB
- #define DEV_ID_56BC                             0x56BC
- #define DEV_ID_56BD                             0x56BD
-+#define DEV_ID_56BE                             0x56BE
-+#define DEV_ID_56BF                             0x56BF
- #define DEV_ID_56C0                             0x56C0
- #define DEV_ID_56C1                             0x56C1
- 
-@@ -1992,6 +1994,8 @@ typedef enum __NATIVEGTTYPE
-                                       ( d == DEV_ID_5690 )                              ||   \
-                                       ( d == DEV_ID_5691 )                              ||   \
-                                       ( d == DEV_ID_5692 )                              ||   \
-+                                      ( d == DEV_ID_56BE )                              ||   \
-+                                      ( d == DEV_ID_56BF )                              ||   \
-                                       ( d == DEV_ID_56C0 )                              ||   \
-                                       ( d == DEV_ID_4F80 )                              ||   \
-                                       ( d == DEV_ID_4F81 )                              ||   \
--- 
-2.34.1
-
diff --git a/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch b/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch
deleted file mode 100644
index ab4cb178..00000000
--- a/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2b267b72d6aaa922861b120da9c1543161797046 Mon Sep 17 00:00:00 2001
-From: John Machado <john.machado@intel.com>
-Date: Fri, 9 Feb 2024 13:10:18 +0530
-Subject: [PATCH] Introduce ARL-H support (#172)
-
-Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/544a8be6f66631e085c86c453aafd78b0e7f5179]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
----
- Source/inc/common/igfxfmid.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h
-index 99fc624..19aa505 100644
---- a/Source/inc/common/igfxfmid.h
-+++ b/Source/inc/common/igfxfmid.h
-@@ -1966,6 +1966,11 @@ typedef enum __NATIVEGTTYPE
- // ARL-S
- #define DEV_ID_7D67                             0x7D67
- 
-+// ARL-H
-+#define DEV_ID_7D41                             0x7D41
-+#define DEV_ID_7D51                             0x7D51
-+#define DEV_ID_7DD1                             0x7DD1
-+
- #define MGM_HAS     0
- 
- //#define SDG_HAS      1              //Reserve place for Springdale-G HAS
-@@ -2012,6 +2017,11 @@ typedef enum __NATIVEGTTYPE
- // Macro to identify ARL-S Device ID
- #define GFX_IS_ARL_S(d)  ( ( d == DEV_ID_7D67 ) )
- 
-+// Macro to identify ARL-H Device ID
-+#define GFX_IS_ARL_H(d)  ( ( d == DEV_ID_7D41 )  ||   \
-+                         ( d == DEV_ID_7D51 )    ||   \
-+                         ( d == DEV_ID_7DD1 ))
-+
- //we define the highest cap and lower cap of stepping IDs
- #define SI_REV_ID(lo,hi) (lo | hi<<16)
- 
--- 
-2.40.1
-
diff --git a/recipes-graphics/gmmlib/gmmlib_22.3.15.bb b/recipes-graphics/gmmlib/gmmlib_22.7.1.bb
index 875fbaf5..77c5e217 100644
--- a/recipes-graphics/gmmlib/gmmlib_22.3.15.bb
+++ b/recipes-graphics/gmmlib/gmmlib_22.7.1.bb
@@ -8,13 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=465fe90caea3edd6a2cecb3f0c28a654"
 
 SRC_URI = " \
             git://github.com/intel/gmmlib.git;protocol=https;branch=master \
-            file://0001-Introduce-ARL-H-support-172.patch \
-            file://0001-Add-new-DG2-device-IDs-194.patch \
             "
 
-SRCREV = "5fb4180e22695ad4e3c155cf680119913c9f44bc"
-
-S = "${WORKDIR}/git"
+SRCREV = "aa4e5d6c8f1d798b78ffd7ea85296fdd3a3946b2"
 
 COMPATIBLE_HOST:x86-x32 = "null"
 
@@ -22,6 +18,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "^intel-gmmlib-(?P<pver>(\d+(\.\d+)+))$"
 
 inherit pkgconfig cmake
 
-EXTRA_OECMAKE += "-DRUN_TEST_SUITE=OFF"
+EXTRA_OECMAKE += " \
+    -DRUN_TEST_SUITE=OFF \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+    "
 
 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
deleted file mode 100644
index 6d32da43..00000000
--- a/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
index 8529b5ab..00000000
--- a/recipes-graphics/hdcp/hdcp_21.2.0.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-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"
-S = "${WORKDIR}/git"
-
-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/libva/libva-intel-utils_2.20.1.bb b/recipes-graphics/libva/libva-intel-utils_2.22.0.bb
index 9c26f009..041ea1ed 100644
--- a/recipes-graphics/libva/libva-intel-utils_2.20.1.bb
+++ b/recipes-graphics/libva/libva-intel-utils_2.22.0.bb
@@ -14,9 +14,8 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
 
-SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.20-branch;protocol=https"
-SRCREV = "2ad888bb463dc9bfb3deb512ec9faf78f1d3bfa8"
-S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.22-branch;protocol=https"
+SRCREV = "1a13ae13382b7b548f3a7e8035e1d7df66662c0a"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
diff --git a/recipes-graphics/libva/libva-intel_2.20.0.bb b/recipes-graphics/libva/libva-intel_2.22.0.bb
index c81ed65c..b6b1f6ed 100644
--- a/recipes-graphics/libva/libva-intel_2.20.0.bb
+++ b/recipes-graphics/libva/libva-intel_2.22.0.bb
@@ -17,11 +17,10 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
 
-SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 \
+SRC_URI = "git://github.com/intel/libva.git;protocol=https;branch=v2.22-branch \
           "
-SRC_URI[sha256sum] = "f72bdb4f48dfe71ad01f1cbefe069672a2c949a6abd51cf3c4d4784210badc49"
 
-S = "${WORKDIR}/libva-${PV}"
+SRCREV = "217da1c28336d6a7e9c0c4cb8f1c303968a675f1"
 
 UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases"
 
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.13.178.bb
index 3ed1c9bd..decac761 100644
--- a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb
+++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.13.178.bb
@@ -2,13 +2,12 @@ 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=8c5c9ac8ffd04a5614befdf63fba6ba8"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=195912d57508b573e068231099eba64c"
 SECTION = "lib"
 
 inherit pkgconfig cmake
 
-S = "${WORKDIR}/git"
-SRCREV = "75b292eb1309e4ea10dce403065ee8ca5bf29ecc"
+SRCREV = "65ffef89cf79d704f618768bcd3d95f4dd6d875b"
 SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \
           "