From b74ec77719d9086384ae45ed8db05d4f4abcfe35 Mon Sep 17 00:00:00 2001
From: Yogesh Tyagi <yogesh.tyagi@intel.com>
Date: Tue, 8 Nov 2022 12:44:38 +0800
Subject: metrics-discovery : upgrade 1.5.108 -> 1.12.158

Drops patch already merged:
0001-md_internal.h-Replace-string.h-with-string-C-header-.patch

Release Notes:
https://github.com/intel/metrics-discovery/releases/tag/metrics-discovery-1.12.158

Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ....h-Replace-string.h-with-string-C-header-.patch | 34 ----------------------
 .../metrics-discovery_1.12.158.bb                  | 18 ++++++++++++
 .../metrics-discovery/metrics-discovery_1.5.108.bb | 19 ------------
 3 files changed, 18 insertions(+), 53 deletions(-)
 delete mode 100644 recipes-graphics/metrics-discovery/metrics-discovery/0001-md_internal.h-Replace-string.h-with-string-C-header-.patch
 create mode 100644 recipes-graphics/metrics-discovery/metrics-discovery_1.12.158.bb
 delete mode 100644 recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb

diff --git a/recipes-graphics/metrics-discovery/metrics-discovery/0001-md_internal.h-Replace-string.h-with-string-C-header-.patch b/recipes-graphics/metrics-discovery/metrics-discovery/0001-md_internal.h-Replace-string.h-with-string-C-header-.patch
deleted file mode 100644
index d97c6543..00000000
--- a/recipes-graphics/metrics-discovery/metrics-discovery/0001-md_internal.h-Replace-string.h-with-string-C-header-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8c11096a0e5cf980309692ae3e272108da5f2b4e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 9 Oct 2019 11:36:56 -0700
-Subject: [PATCH] md_internal.h: Replace string.h with <string> C++ header API
-
-This helps in compiling with libc++/Clang
-Fixes
-usr/include/c++/v1/type_traits:1561:38: error: implicit instantiation of undefined template 'std::__1::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >'
-: public integral_constant<bool, __is_empty(_Tp)> {};
-^
-
-Upstream-Status: Submitted [https://github.com/intel/metrics-discovery/pull/14]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- instrumentation/metrics_discovery/common/md_internal.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/instrumentation/metrics_discovery/common/md_internal.cpp b/instrumentation/metrics_discovery/common/md_internal.cpp
-index f9571ac..0767e81 100644
---- a/instrumentation/metrics_discovery/common/md_internal.cpp
-+++ b/instrumentation/metrics_discovery/common/md_internal.cpp
-@@ -27,8 +27,8 @@
- \*****************************************************************************/
- #include "md_internal.h"
- 
--#include <string.h>
- #include <stdlib.h>
-+#include <string>
- #include <new>
- #include <unordered_map>
- 
--- 
-2.23.0
-
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.158.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.158.bb
new file mode 100644
index 00000000..30b9d7be
--- /dev/null
+++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.158.bb
@@ -0,0 +1,18 @@
+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"
+SECTION = "lib"
+
+inherit pkgconfig cmake
+
+S = "${WORKDIR}/git"
+SRCREV = "24a1726b50aae8bb689381b9c293a617f4d7b0da"
+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}"
+
+DEPENDS = "libdrm"
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb
deleted file mode 100644
index dd6dc1d5..00000000
--- a/recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-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"
-SECTION = "lib"
-
-inherit pkgconfig cmake
-
-S = "${WORKDIR}/git"
-SRCREV = "a495db4682b7318bc82b1cccfb17fafdf2e3a2ff"
-SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \
-           file://0001-md_internal.h-Replace-string.h-with-string-C-header-.patch \
-          "
-
-EXTRA_OECMAKE += "-DMD_PLATFORM=linux"
-EXTRA_OECMAKE += "-DMD_LIBDRM_SRC=${STAGING_INCDIR}"
-
-DEPENDS = "libdrm"
-- 
cgit v1.2.3-54-g00ecf