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 <siew.hoon.lim@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Lim Siew Hoon 2021-02-24 13:07:27 +08:00 committed by Anuj Mittal
parent f695e532c0
commit 86a86abdce
2 changed files with 3 additions and 38 deletions

View File

@ -1,35 +0,0 @@
From cc30986a6033e3b3b8709cf62a84bd832209e493 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
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 <anuj.mittal@intel.com>
---
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

View File

@ -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<pver>(\d+(\.\d+)+))$"