2 files changed, 51 insertions, 0 deletions

diff --git a/recipes-multimedia/mediasdk/files/0001-FindITT.cmake-fix-detection-of-header-library.patch b/recipes-multimedia/mediasdk/files/0001-FindITT.cmake-fix-detection-of-header-library.patch
new file mode 100644
index 00000000..87c4e82e
--- /dev/null
+++ b/recipes-multimedia/mediasdk/files/0001-FindITT.cmake-fix-detection-of-header-library.patch
@@ -0,0 +1,49 @@
+From be7cec47777bd35c44a59f2af73f12ce9c26d65c Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 7 Oct 2020 09:33:06 +0800
+Subject: [PATCH] FindITT.cmake: fix detection of header/library
+
+Use find_library to check for the library so distributions installing to
+standard locations can also work in addition to custom paths specified
+using CMAKE_ITT_HOME.
+
+Also add ittnotify to PATH_SUFFIXES for header for cases when
+ittnotify.h is installed in /usr/include/ittnotify for example.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ builder/FindITT.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/builder/FindITT.cmake b/builder/FindITT.cmake
+index ba2542c5..d96acf2e 100644
+--- a/builder/FindITT.cmake
++++ b/builder/FindITT.cmake
+@@ -35,19 +35,19 @@ if( ENABLE_ITT )
+ 
+     find_path( ITT_INCLUDE_DIRS ittnotify.h
+       PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME}
+-      PATH_SUFFIXES include )
++      PATH_SUFFIXES include ittnotify)
+ 
+     # Unfortunately SEAPI and VTune uses different names for itt library:
+     #  * SEAPI uses libittnotify${arch}.a
+     #  * VTune uses libittnotify.a
+     # We are trying to check both giving preference to SEAPI name.
+-    find_path( ITT_LIBRARY_DIRS libittnotify${arch}.a
++    find_library( ITT_LIBRARY_DIRS ittnotify${arch}
+       PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME}
+       PATH_SUFFIXES lib64 )
+     if( NOT ITT_LIBRARY_DIRS MATCHES NOTFOUND )
+       set( ITT_LIBRARIES "ittnotify${arch}" )
+     else()
+-      find_path( ITT_LIBRARY_DIRS libittnotify.a
++      find_library( ITT_LIBRARY_DIRS ittnotify
+         PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME}
+         PATH_SUFFIXES lib64 )
+       if( NOT ITT_LIBRARY_PATH MATCHES NOTFOUND )
+-- 
+2.26.2
+
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_20.2.1.bb b/recipes-multimedia/mediasdk/intel-mediasdk_20.2.1.bb
index 5a7439c0..f2d6551d 100644
--- a/recipes-multimedia/mediasdk/intel-mediasdk_20.2.1.bb
+++ b/recipes-multimedia/mediasdk/intel-mediasdk_20.2.1.bb
@@ -25,12 +25,14 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d)
                    "
 
 PACKAGECONFIG[dri3]     = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF"
+PACKAGECONFIG[itt]      = "-DENABLE_ITT=ON, -DENABLE_ITT=OFF, itt"
 PACKAGECONFIG[opencl]   = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, ocl-icd opencl-clhpp opencl-headers"
 PACKAGECONFIG[samples]  = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF"
 PACKAGECONFIG[wayland]  = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native"
 
 SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;branch=${BPN}-20.2;lfs=0 \
            file://0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch \
+           file://0001-FindITT.cmake-fix-detection-of-header-library.patch \
            "
 SRCREV = "f7ae8497b3e58a0ef8ad4ac94256f04928c20456"
 S = "${WORKDIR}/git"