From 0584f638797a816b29b909d4611d5a099df7bbc1 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Sat, 31 Jul 2021 17:47:03 +0800 Subject: Convert to new override syntax Use the convert-overrides.py to convert to new syntax and manually fix some additional changes. Signed-off-by: Anuj Mittal --- recipes-multimedia/itt/itt_3.18.13.bb | 2 +- recipes-multimedia/libva/intel-media-driver_21.2.3.bb | 12 ++++++------ recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb | 6 +++--- recipes-multimedia/libyami/libyami_1.3.2.bb | 2 +- recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb | 10 +++++----- recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb | 2 +- recipes-multimedia/onevpl/onevpl_2021.4.0.bb | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'recipes-multimedia') diff --git a/recipes-multimedia/itt/itt_3.18.13.bb b/recipes-multimedia/itt/itt_3.18.13.bb index d134c014..352d1166 100644 --- a/recipes-multimedia/itt/itt_3.18.13.bb +++ b/recipes-multimedia/itt/itt_3.18.13.bb @@ -34,4 +34,4 @@ do_install() { } -RDEPENDS_${PN}-dev_remove = "${PN} (= ${EXTENDPKGV})" +RDEPENDS:${PN}-dev:remove = "${PN} (= ${EXTENDPKGV})" diff --git a/recipes-multimedia/libva/intel-media-driver_21.2.3.bb b/recipes-multimedia/libva/intel-media-driver_21.2.3.bb index e955f15a..fed52120 100644 --- a/recipes-multimedia/libva/intel-media-driver_21.2.3.bb +++ b/recipes-multimedia/libva/intel-media-driver_21.2.3.bb @@ -26,14 +26,14 @@ SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ SRCREV = "008fb3b400dd906276f999eeaef3f49d52fd3d05" S = "${WORKDIR}/git" -COMPATIBLE_HOST_x86-x32 = "null" +COMPATIBLE_HOST:x86-x32 = "null" UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P(?!600\..*)\d+(\.\d+)+)$" inherit cmake pkgconfig -MEDIA_DRIVER_ARCH_x86 = "32" -MEDIA_DRIVER_ARCH_x86-64 = "64" +MEDIA_DRIVER_ARCH:x86 = "32" +MEDIA_DRIVER_ARCH:x86-64 = "64" EXTRA_OECMAKE += " \ -DMEDIA_RUN_TEST_SUITE=OFF \ @@ -41,12 +41,12 @@ EXTRA_OECMAKE += " \ -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ " -CXXFLAGS_append_x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +CXXFLAGS:append:x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" -do_configure_prepend_toolchain-clang() { +do_configure:prepend:toolchain-clang() { sed -i -e '/-fno-tree-pre/d' ${S}/media_driver/cmake/linux/media_compile_flags_linux.cmake } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/dri/ \ " diff --git a/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb b/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb index ccb9fec1..5038d8d7 100644 --- a/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb +++ b/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb @@ -29,6 +29,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no" PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no, wayland wayland-native virtual/egl" -FILES_${PN} += "${libdir}/dri/*.so" -FILES_${PN}-dev += "${libdir}/dri/*.la" -FILES_${PN}-dbg += "${libdir}/dri/.debug" +FILES:${PN} += "${libdir}/dri/*.so" +FILES:${PN}-dev += "${libdir}/dri/*.la" +FILES:${PN}-dbg += "${libdir}/dri/.debug" diff --git a/recipes-multimedia/libyami/libyami_1.3.2.bb b/recipes-multimedia/libyami/libyami_1.3.2.bb index c8628141..1eff8c9b 100644 --- a/recipes-multimedia/libyami/libyami_1.3.2.bb +++ b/recipes-multimedia/libyami/libyami_1.3.2.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/intel/libyami.git;branch=apache \ SRCREV = "08606d0a43e0ef15e5b61cc13563169370ce8715" S = "${WORKDIR}/git" -CXXFLAGS_append = " -Wno-error" +CXXFLAGS:append = " -Wno-error" PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb b/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb index 75faad35..acdc83e3 100644 --- a/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb +++ b/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb @@ -12,7 +12,7 @@ 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" +COMPATIBLE_HOST:x86-x32 = "null" inherit features_check REQUIRED_DISTRO_FEATURES = "opengl" @@ -44,17 +44,17 @@ inherit cmake pkgconfig EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include" -do_install_append() { +do_install:append() { mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples } PACKAGE_BEFORE_PN = " ${PN}-samples" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/mfx \ ${datadir}/mfx/plugins.cfg \ " -FILES_${PN}-samples = "${libdir}/mfx/samples" +FILES:${PN}-samples = "${libdir}/mfx/samples" -INSANE_SKIP_${PN}-samples += "staticdev" +INSANE_SKIP:${PN}-samples += "staticdev" diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb b/recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb index 21293584..cf63f842 100644 --- a/recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb +++ b/recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb @@ -12,7 +12,7 @@ PE = "1" # Only for 64 bit COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_x86-x32 = "null" +COMPATIBLE_HOST:x86-x32 = "null" DEPENDS += "libdrm libva intel-media-driver onevpl" diff --git a/recipes-multimedia/onevpl/onevpl_2021.4.0.bb b/recipes-multimedia/onevpl/onevpl_2021.4.0.bb index cefa38bd..cdd22a34 100644 --- a/recipes-multimedia/onevpl/onevpl_2021.4.0.bb +++ b/recipes-multimedia/onevpl/onevpl_2021.4.0.bb @@ -24,12 +24,12 @@ COMPATIBLE_HOST = '(x86_64).*-linux' PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${datadir}/oneVPL/examples \ +FILES:${PN}-examples = "${datadir}/oneVPL/examples \ " FILES_SOLIBSDEV = "" -FILES_${PN}-dev += "${libdir}/libvpl.so" +FILES:${PN}-dev += "${libdir}/libvpl.so" -FILES_${PN} += "${datadir} \ +FILES:${PN} += "${datadir} \ ${libdir}/libvpl_wayland.so \ " -- cgit v1.2.3-54-g00ecf