diff options
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/files/fix-gcc13.patch | 15 | ||||
-rw-r--r-- | recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb (renamed from recipes-multimedia/mediasdk/intel-mediasdk_20.3.0.bb) | 23 |
3 files changed, 28 insertions, 45 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/files/fix-gcc13.patch b/recipes-multimedia/mediasdk/files/fix-gcc13.patch new file mode 100644 index 00000000..fb973870 --- /dev/null +++ b/recipes-multimedia/mediasdk/files/fix-gcc13.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Inactive-Upstream | ||
2 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | |||
4 | diff --git a/api/mfx_dispatch/linux/mfxparser.cpp b/api/mfx_dispatch/linux/mfxparser.cpp | ||
5 | index 9d3823ec3e..12e46d1881 100644 | ||
6 | --- a/api/mfx_dispatch/linux/mfxparser.cpp | ||
7 | +++ b/api/mfx_dispatch/linux/mfxparser.cpp | ||
8 | @@ -20,6 +20,7 @@ | ||
9 | |||
10 | #include <ctype.h> | ||
11 | #include <stdio.h> | ||
12 | +#include <stdint.h> | ||
13 | #include <stdlib.h> | ||
14 | #include <string.h> | ||
15 | |||
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_20.3.0.bb b/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb index 62cc2a5c..f00a4404 100644 --- a/recipes-multimedia/mediasdk/intel-mediasdk_20.3.0.bb +++ b/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb | |||
@@ -12,12 +12,14 @@ CVE_DETAILS = "intel:media_sdk" | |||
12 | 12 | ||
13 | # Only for 64 bit until media-driver issues aren't fixed | 13 | # Only for 64 bit until media-driver issues aren't fixed |
14 | COMPATIBLE_HOST = '(x86_64).*-linux' | 14 | COMPATIBLE_HOST = '(x86_64).*-linux' |
15 | COMPATIBLE_HOST_x86-x32 = "null" | 15 | COMPATIBLE_HOST:x86-x32 = "null" |
16 | 16 | ||
17 | inherit features_check | 17 | inherit features_check |
18 | REQUIRED_DISTRO_FEATURES = "opengl" | 18 | REQUIRED_DISTRO_FEATURES = "opengl" |
19 | 19 | ||
20 | DEPENDS += "libdrm libva intel-media-driver" | 20 | DEPENDS += "libva" |
21 | |||
22 | RDEPENDS:${PN} += "intel-media-driver" | ||
21 | 23 | ||
22 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d)} \ | 24 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d)} \ |
23 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ | 25 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ |
@@ -27,15 +29,16 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d) | |||
27 | 29 | ||
28 | PACKAGECONFIG[dri3] = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF" | 30 | PACKAGECONFIG[dri3] = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF" |
29 | PACKAGECONFIG[itt] = "-DENABLE_ITT=ON, -DENABLE_ITT=OFF, itt" | 31 | PACKAGECONFIG[itt] = "-DENABLE_ITT=ON, -DENABLE_ITT=OFF, itt" |
30 | PACKAGECONFIG[opencl] = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, ocl-icd opencl-clhpp opencl-headers" | 32 | PACKAGECONFIG[opencl] = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, virtual/opencl-icd opencl-clhpp opencl-headers" |
31 | PACKAGECONFIG[samples] = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF" | 33 | PACKAGECONFIG[samples] = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF" |
32 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native" | 34 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native" |
33 | 35 | ||
34 | SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;branch=${BPN}-20.3;lfs=0 \ | 36 | 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 \ | 37 | file://0001-FindITT.cmake-fix-detection-of-header-library.patch \ |
38 | file://fix-gcc13.patch \ | ||
37 | " | 39 | " |
38 | SRCREV = "34c7cbbb3775bd547a16ea37576297b290b603a4" | 40 | |
41 | SRCREV = "869b60a6c3d7b5e9f7c3b3b914986322dca4bbae" | ||
39 | S = "${WORKDIR}/git" | 42 | S = "${WORKDIR}/git" |
40 | 43 | ||
41 | UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$" | 44 | UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$" |
@@ -44,17 +47,17 @@ inherit cmake pkgconfig | |||
44 | 47 | ||
45 | EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include" | 48 | EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include" |
46 | 49 | ||
47 | do_install_append() { | 50 | do_install:append() { |
48 | mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples | 51 | mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples |
49 | } | 52 | } |
50 | 53 | ||
51 | PACKAGE_BEFORE_PN = " ${PN}-samples" | 54 | PACKAGE_BEFORE_PN = " ${PN}-samples" |
52 | 55 | ||
53 | FILES_${PN} += " \ | 56 | FILES:${PN} += " \ |
54 | ${libdir}/mfx \ | 57 | ${libdir}/mfx \ |
55 | ${datadir}/mfx/plugins.cfg \ | 58 | ${datadir}/mfx/plugins.cfg \ |
56 | " | 59 | " |
57 | 60 | ||
58 | FILES_${PN}-samples = "${libdir}/mfx/samples" | 61 | FILES:${PN}-samples = "${libdir}/mfx/samples" |
59 | 62 | ||
60 | INSANE_SKIP_${PN}-samples += "staticdev" | 63 | INSANE_SKIP:${PN}-samples += "staticdev" |