diff options
author | Lim Siew Hoon <siew.hoon.lim@intel.com> | 2021-02-24 13:07:27 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-02-25 09:21:17 +0800 |
commit | 86a86abdce287db04abb57ee468e8e57754625c6 (patch) | |
tree | 3acc4264c2ef5267b8c24e9ed12ec817e96d0f46 /recipes-multimedia | |
parent | f695e532c010528f3c1cefbb803bdf1595137836 (diff) | |
download | meta-intel-86a86abdce287db04abb57ee468e8e57754625c6.tar.gz |
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>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r-- | recipes-multimedia/mediasdk/files/0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch | 35 | ||||
-rw-r--r-- | recipes-multimedia/mediasdk/intel-mediasdk_21.1.1.bb (renamed from recipes-multimedia/mediasdk/intel-mediasdk_20.5.1.bb) | 6 |
2 files changed, 3 insertions, 38 deletions
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 @@ | |||
1 | From cc30986a6033e3b3b8709cf62a84bd832209e493 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 9 Sep 2020 15:04:14 +0800 | ||
4 | Subject: [PATCH] FindOpenCL.cmake: don't look for driver at build time | ||
5 | |||
6 | We don't need the icd driver to be present when building. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | builder/FindOpenCL.cmake | 2 -- | ||
13 | 1 file changed, 2 deletions(-) | ||
14 | |||
15 | diff --git a/builder/FindOpenCL.cmake b/builder/FindOpenCL.cmake | ||
16 | index ed531bc8..d8ac00a6 100644 | ||
17 | --- a/builder/FindOpenCL.cmake | ||
18 | +++ b/builder/FindOpenCL.cmake | ||
19 | @@ -25,13 +25,11 @@ set( OCL_LIBS "" ) | ||
20 | |||
21 | if ( NOT OPENCL_INCLUDE MATCHES NOTFOUND ) | ||
22 | if ( NOT OPENCL_LIBRARY MATCHES NOTFOUND ) | ||
23 | - if ( EXISTS /etc/OpenCL/vendors/intel.icd ) | ||
24 | set ( OPENCL_FOUND TRUE ) | ||
25 | |||
26 | get_filename_component( OPENCL_LIBRARY_PATH ${OPENCL_LIBRARY} PATH ) | ||
27 | |||
28 | list( APPEND OPENCL_LIBS OpenCL ) | ||
29 | - endif() | ||
30 | endif() | ||
31 | endif() | ||
32 | |||
33 | -- | ||
34 | 2.26.2 | ||
35 | |||
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_20.5.1.bb b/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 | |||
31 | PACKAGECONFIG[samples] = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF" | 31 | PACKAGECONFIG[samples] = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF" |
32 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native" | 32 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native" |
33 | 33 | ||
34 | SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;branch=${BPN}-20.5;lfs=0 \ | 34 | SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \ |
35 | file://0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch \ | ||
36 | file://0001-FindITT.cmake-fix-detection-of-header-library.patch \ | 35 | file://0001-FindITT.cmake-fix-detection-of-header-library.patch \ |
37 | " | 36 | " |
38 | SRCREV = "98c0c3639f74bc0d030642dd29592054aecffa64" | 37 | |
38 | SRCREV = "c982e8cccc98c2ad0b3c6043cdbd6aaf7447cf54" | ||
39 | S = "${WORKDIR}/git" | 39 | S = "${WORKDIR}/git" |
40 | 40 | ||
41 | UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$" | 41 | UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$" |