From 9deb61d0ffdcc83fb1d267e6bed6af6e0af07ac3 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Tue, 9 Feb 2021 08:41:45 +0800
Subject: itt: upgrade 3.15.12 -> 3.18.10

fixed QA Issue: Architecture did not match (x86, expected x86-64)

Error log:
QA Issue: Architecture did not match (x86, expected x86-64) in
/usr/include/ittnotify/fortran/posix/x86/ittfortran.o [arch]

Ref:
https://github.com/intel/ittapi/commit/d90eaa25a70f651e9f7e82a16b29074b5f77fed8

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 recipes-multimedia/itt/itt_3.15.12.bb | 30 ----------------------------
 recipes-multimedia/itt/itt_3.18.10.bb | 37 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 30 deletions(-)
 delete mode 100644 recipes-multimedia/itt/itt_3.15.12.bb
 create mode 100644 recipes-multimedia/itt/itt_3.18.10.bb

diff --git a/recipes-multimedia/itt/itt_3.15.12.bb b/recipes-multimedia/itt/itt_3.15.12.bb
deleted file mode 100644
index 010d5869..00000000
--- a/recipes-multimedia/itt/itt_3.15.12.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "Intel® Instrumentation and Tracing Technology (ITT) and Just-In-Time (JIT) API"
-DESCRIPTION = "The Instrumentation and Tracing Technology (ITT) API enables \
-application to generate and control the collection of trace data during its \
-execution across different Intel tools."
-
-LICENSE = "BSD-3-Clause & GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSES/BSD-3-Clause.txt;md5=c551872bcf41ce707df54c722edeca7b \
-                    file://LICENSES/GPL-2.0-only.txt;md5=e2d76e7801260c21b90eea3605508ad6 \
-                    "
-
-SRC_URI = "git://github.com/intel/ittapi.git;protocol=https"
-SRCREV = "8a3d4f4c4f8b66d1a242393efb82558dcfcd109b"
-S = "${WORKDIR}/git"
-PE = "1"
-
-UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
-
-inherit pkgconfig cmake
-
-EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release"
-EXTRA_OECMAKE += "${@oe.utils.conditional('TARGET_ARCH','x86_64','','-DFORCE_32=ON',d)}"
-
-do_install() {
-     install -d -m 755 ${D}${libdir} ${D}${includedir}/ittnotify
-     install -m 644 ${B}/bin/*.a ${D}${libdir}
-     cp -r ${S}/include/* ${D}${includedir}/ittnotify
-     cp -r ${S}/src/ittnotify/*.h ${D}${includedir}/ittnotify
-}
-
-RDEPENDS_${PN}-dev_remove = "${PN} (= ${EXTENDPKGV})"
diff --git a/recipes-multimedia/itt/itt_3.18.10.bb b/recipes-multimedia/itt/itt_3.18.10.bb
new file mode 100644
index 00000000..c410977b
--- /dev/null
+++ b/recipes-multimedia/itt/itt_3.18.10.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Intel® Instrumentation and Tracing Technology (ITT) and Just-In-Time (JIT) API"
+DESCRIPTION = "The Instrumentation and Tracing Technology (ITT) API enables \
+application to generate and control the collection of trace data during its \
+execution across different Intel tools."
+
+LICENSE = "BSD-3-Clause & GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSES/BSD-3-Clause.txt;md5=c551872bcf41ce707df54c722edeca7b \
+                    file://LICENSES/GPL-2.0-only.txt;md5=e2d76e7801260c21b90eea3605508ad6 \
+                    "
+
+SRC_URI = "git://github.com/intel/ittapi.git;protocol=https"
+SRCREV = "66ebaee7a44fcdfb6ae052beb9507318781f3cd0"
+S = "${WORKDIR}/git"
+PE = "1"
+
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
+
+inherit pkgconfig cmake
+
+EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release"
+EXTRA_OECMAKE += "${@oe.utils.conditional('TARGET_ARCH','x86_64','','-DFORCE_32=ON',d)}"
+
+do_install() {
+     install -d -m 755 ${D}${libdir} ${D}${includedir}/ittnotify
+     install -m 644 ${B}/bin/*.a ${D}${libdir}
+     cp -r ${S}/include/* ${D}${includedir}/ittnotify
+     cp -r ${S}/src/ittnotify/*.h ${D}${includedir}/ittnotify
+     rm -r ${D}${includedir}/ittnotify/fortran/win32
+     if [ "${TARGET_ARCH}" = "x86_64" ]; then
+        rm -r ${D}${includedir}/ittnotify/fortran/posix/x86
+     else
+        rm -r ${D}${includedir}/ittnotify/fortran/posix/x86_64
+     fi
+
+}
+
+RDEPENDS_${PN}-dev_remove = "${PN} (= ${EXTENDPKGV})"
-- 
cgit v1.2.3-54-g00ecf