From 86a86abdce287db04abb57ee468e8e57754625c6 Mon Sep 17 00:00:00 2001 From: Lim Siew Hoon Date: Wed, 24 Feb 2021 13:07:27 +0800 Subject: [PATCH] intel-mediasdk: upgrade 20.5.1 -> 21.1.1 Drops patches already merged: * 0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch Signed-off-by: Lim Siew Hoon Signed-off-by: Anuj Mittal --- ...-don-t-look-for-driver-at-build-time.patch | 35 ------------------- ...sdk_20.5.1.bb => intel-mediasdk_21.1.1.bb} | 6 ++-- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 recipes-multimedia/mediasdk/files/0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch rename recipes-multimedia/mediasdk/{intel-mediasdk_20.5.1.bb => intel-mediasdk_21.1.1.bb} (92%) diff --git a/recipes-multimedia/mediasdk/files/0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch b/recipes-multimedia/mediasdk/files/0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch deleted file mode 100644 index 34ffb912..00000000 --- a/recipes-multimedia/mediasdk/files/0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cc30986a6033e3b3b8709cf62a84bd832209e493 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Wed, 9 Sep 2020 15:04:14 +0800 -Subject: [PATCH] FindOpenCL.cmake: don't look for driver at build time - -We don't need the icd driver to be present when building. - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal ---- - builder/FindOpenCL.cmake | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/builder/FindOpenCL.cmake b/builder/FindOpenCL.cmake -index ed531bc8..d8ac00a6 100644 ---- a/builder/FindOpenCL.cmake -+++ b/builder/FindOpenCL.cmake -@@ -25,13 +25,11 @@ set( OCL_LIBS "" ) - - if ( NOT OPENCL_INCLUDE MATCHES NOTFOUND ) - if ( NOT OPENCL_LIBRARY MATCHES NOTFOUND ) -- if ( EXISTS /etc/OpenCL/vendors/intel.icd ) - set ( OPENCL_FOUND TRUE ) - - get_filename_component( OPENCL_LIBRARY_PATH ${OPENCL_LIBRARY} PATH ) - - list( APPEND OPENCL_LIBS OpenCL ) -- endif() - endif() - endif() - --- -2.26.2 - diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_20.5.1.bb b/recipes-multimedia/mediasdk/intel-mediasdk_21.1.1.bb similarity index 92% rename from recipes-multimedia/mediasdk/intel-mediasdk_20.5.1.bb rename to recipes-multimedia/mediasdk/intel-mediasdk_21.1.1.bb index 965a4e33..ce82af8a 100644 --- a/recipes-multimedia/mediasdk/intel-mediasdk_20.5.1.bb +++ b/recipes-multimedia/mediasdk/intel-mediasdk_21.1.1.bb @@ -31,11 +31,11 @@ PACKAGECONFIG[opencl] = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, ocl-icd opencl 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.5;lfs=0 \ - file://0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch \ +SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \ file://0001-FindITT.cmake-fix-detection-of-header-library.patch \ " -SRCREV = "98c0c3639f74bc0d030642dd29592054aecffa64" + +SRCREV = "c982e8cccc98c2ad0b3c6043cdbd6aaf7447cf54" S = "${WORKDIR}/git" UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P(\d+(\.\d+)+))$"