diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-09-09 15:08:51 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-09-09 15:20:56 +0800 |
commit | 36672e8b3526a8c70c915e7b93b0d4040342f4ec (patch) | |
tree | 9273b8d63fea747610f939f47577a1f946db68ef /recipes-multimedia/mediasdk | |
parent | cc1a6ac6df7bca6fc05422945ac7f3f1aa6af606 (diff) | |
download | meta-intel-36672e8b3526a8c70c915e7b93b0d4040342f4ec.tar.gz |
intel-mediasdk: add PACKAGECONFIG for opencl
Enables the OpenCL dependent code (which right now is just a sample) to
be built.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-multimedia/mediasdk')
-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_20.2.1.bb | 5 |
2 files changed, 39 insertions, 1 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 new file mode 100644 index 00000000..34ffb912 --- /dev/null +++ b/recipes-multimedia/mediasdk/files/0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch | |||
@@ -0,0 +1,35 @@ | |||
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.2.1.bb b/recipes-multimedia/mediasdk/intel-mediasdk_20.2.1.bb index a9e68f87..5a7439c0 100644 --- a/recipes-multimedia/mediasdk/intel-mediasdk_20.2.1.bb +++ b/recipes-multimedia/mediasdk/intel-mediasdk_20.2.1.bb | |||
@@ -25,10 +25,13 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d) | |||
25 | " | 25 | " |
26 | 26 | ||
27 | PACKAGECONFIG[dri3] = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF" | 27 | PACKAGECONFIG[dri3] = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF" |
28 | PACKAGECONFIG[opencl] = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, ocl-icd opencl-clhpp opencl-headers" | ||
28 | PACKAGECONFIG[samples] = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF" | 29 | PACKAGECONFIG[samples] = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF" |
29 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native" | 30 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native" |
30 | 31 | ||
31 | SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;branch=${BPN}-20.2;lfs=0" | 32 | SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;branch=${BPN}-20.2;lfs=0 \ |
33 | file://0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch \ | ||
34 | " | ||
32 | SRCREV = "f7ae8497b3e58a0ef8ad4ac94256f04928c20456" | 35 | SRCREV = "f7ae8497b3e58a0ef8ad4ac94256f04928c20456" |
33 | S = "${WORKDIR}/git" | 36 | S = "${WORKDIR}/git" |
34 | 37 | ||