Drops patches already merged: * 0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch
Signed-off-by: Lim Siew Hoon <[email protected]> --- ...cmake-don-t-look-for-driver-at-build-time.patch | 35 ------------- .../mediasdk/intel-mediasdk_20.5.1.bb | 60 ---------------------- .../mediasdk/intel-mediasdk_21.1.1.bb | 60 ++++++++++++++++++++++ 3 files changed, 60 insertions(+), 95 deletions(-) delete mode 100644 recipes-multimedia/mediasdk/files/0001-FindOpenCL.cmake-don-t-look-for-driver-at-build-time.patch delete mode 100644 recipes-multimedia/mediasdk/intel-mediasdk_20.5.1.bb create mode 100644 recipes-multimedia/mediasdk/intel-mediasdk_21.1.1.bb 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 34ffb91..0000000 --- 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 <[email protected]> -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 <[email protected]> ---- - 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_20.5.1.bb deleted file mode 100644 index 965a4e3..0000000 --- a/recipes-multimedia/mediasdk/intel-mediasdk_20.5.1.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "Intel(R) Media SDK for hardware accelerated media processing" -DESCRIPTION = "Intel(R) Media SDK provides an API to access hardware-accelerated \ -video decode, encode and filtering on Intel® platforms with integrated graphics." - -HOMEPAGE = "https://github.com/Intel-Media-SDK/MediaSDK"; -BUGTRACKER = "https://github.com/Intel-Media-SDK/MediaSDK/issues"; - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3cb331af679cd8f968bf799a9c55b46e" - -CVE_DETAILS = "intel:media_sdk" - -# Only for 64 bit until media-driver issues aren't fixed -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_x86-x32 = "null" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "opengl" - -DEPENDS += "libdrm libva intel-media-driver" - -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ - samples \ - itt \ - " - -PACKAGECONFIG[dri3] = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF" -PACKAGECONFIG[itt] = "-DENABLE_ITT=ON, -DENABLE_ITT=OFF, itt" -PACKAGECONFIG[opencl] = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, ocl-icd opencl-clhpp opencl-headers" -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 \ - file://0001-FindITT.cmake-fix-detection-of-header-library.patch \ - " -SRCREV = "98c0c3639f74bc0d030642dd29592054aecffa64" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$" - -inherit cmake pkgconfig - -EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include" - -do_install_append() { - mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples -} - -PACKAGE_BEFORE_PN = " ${PN}-samples" - -FILES_${PN} += " \ - ${libdir}/mfx \ - ${datadir}/mfx/plugins.cfg \ - " - -FILES_${PN}-samples = "${libdir}/mfx/samples" - -INSANE_SKIP_${PN}-samples += "staticdev" diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_21.1.1.bb b/recipes-multimedia/mediasdk/intel-mediasdk_21.1.1.bb new file mode 100644 index 0000000..ce82af8 --- /dev/null +++ b/recipes-multimedia/mediasdk/intel-mediasdk_21.1.1.bb @@ -0,0 +1,60 @@ +SUMMARY = "Intel(R) Media SDK for hardware accelerated media processing" +DESCRIPTION = "Intel(R) Media SDK provides an API to access hardware-accelerated \ +video decode, encode and filtering on Intel® platforms with integrated graphics." + +HOMEPAGE = "https://github.com/Intel-Media-SDK/MediaSDK"; +BUGTRACKER = "https://github.com/Intel-Media-SDK/MediaSDK/issues"; + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3cb331af679cd8f968bf799a9c55b46e" + +CVE_DETAILS = "intel:media_sdk" + +# Only for 64 bit until media-driver issues aren't fixed +COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST_x86-x32 = "null" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "opengl" + +DEPENDS += "libdrm libva intel-media-driver" + +PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ + samples \ + itt \ + " + +PACKAGECONFIG[dri3] = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF" +PACKAGECONFIG[itt] = "-DENABLE_ITT=ON, -DENABLE_ITT=OFF, itt" +PACKAGECONFIG[opencl] = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, ocl-icd opencl-clhpp opencl-headers" +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;nobranch=1;lfs=0 \ + file://0001-FindITT.cmake-fix-detection-of-header-library.patch \ + " + +SRCREV = "c982e8cccc98c2ad0b3c6043cdbd6aaf7447cf54" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$" + +inherit cmake pkgconfig + +EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include" + +do_install_append() { + mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples +} + +PACKAGE_BEFORE_PN = " ${PN}-samples" + +FILES_${PN} += " \ + ${libdir}/mfx \ + ${datadir}/mfx/plugins.cfg \ + " + +FILES_${PN}-samples = "${libdir}/mfx/samples" + +INSANE_SKIP_${PN}-samples += "staticdev" -- 2.7.4
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6943): https://lists.yoctoproject.org/g/meta-intel/message/6943 Mute This Topic: https://lists.yoctoproject.org/mt/80870713/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
