diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-07-31 17:47:03 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-07-31 17:47:03 +0800 |
commit | 0584f638797a816b29b909d4611d5a099df7bbc1 (patch) | |
tree | 1ec4bdacf824c304290b5086fd54bba9b84158e2 /recipes-multimedia | |
parent | 7a5e47b6a594eb29dfe84e47f043a49974bc0402 (diff) | |
download | meta-intel-0584f638797a816b29b909d4611d5a099df7bbc1.tar.gz |
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 <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r-- | recipes-multimedia/itt/itt_3.18.13.bb | 2 | ||||
-rw-r--r-- | recipes-multimedia/libva/intel-media-driver_21.2.3.bb | 12 | ||||
-rw-r--r-- | recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb | 6 | ||||
-rw-r--r-- | recipes-multimedia/libyami/libyami_1.3.2.bb | 2 | ||||
-rw-r--r-- | recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb | 10 | ||||
-rw-r--r-- | recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb | 2 | ||||
-rw-r--r-- | recipes-multimedia/onevpl/onevpl_2021.4.0.bb | 6 |
7 files changed, 20 insertions, 20 deletions
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() { | |||
34 | 34 | ||
35 | } | 35 | } |
36 | 36 | ||
37 | RDEPENDS_${PN}-dev_remove = "${PN} (= ${EXTENDPKGV})" | 37 | 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 \ | |||
26 | SRCREV = "008fb3b400dd906276f999eeaef3f49d52fd3d05" | 26 | SRCREV = "008fb3b400dd906276f999eeaef3f49d52fd3d05" |
27 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
28 | 28 | ||
29 | COMPATIBLE_HOST_x86-x32 = "null" | 29 | COMPATIBLE_HOST:x86-x32 = "null" |
30 | 30 | ||
31 | UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P<pver>(?!600\..*)\d+(\.\d+)+)$" | 31 | UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P<pver>(?!600\..*)\d+(\.\d+)+)$" |
32 | 32 | ||
33 | inherit cmake pkgconfig | 33 | inherit cmake pkgconfig |
34 | 34 | ||
35 | MEDIA_DRIVER_ARCH_x86 = "32" | 35 | MEDIA_DRIVER_ARCH:x86 = "32" |
36 | MEDIA_DRIVER_ARCH_x86-64 = "64" | 36 | MEDIA_DRIVER_ARCH:x86-64 = "64" |
37 | 37 | ||
38 | EXTRA_OECMAKE += " \ | 38 | EXTRA_OECMAKE += " \ |
39 | -DMEDIA_RUN_TEST_SUITE=OFF \ | 39 | -DMEDIA_RUN_TEST_SUITE=OFF \ |
@@ -41,12 +41,12 @@ EXTRA_OECMAKE += " \ | |||
41 | -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ | 41 | -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ |
42 | " | 42 | " |
43 | 43 | ||
44 | CXXFLAGS_append_x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" | 44 | CXXFLAGS:append:x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" |
45 | 45 | ||
46 | do_configure_prepend_toolchain-clang() { | 46 | do_configure:prepend:toolchain-clang() { |
47 | sed -i -e '/-fno-tree-pre/d' ${S}/media_driver/cmake/linux/media_compile_flags_linux.cmake | 47 | sed -i -e '/-fno-tree-pre/d' ${S}/media_driver/cmake/linux/media_compile_flags_linux.cmake |
48 | } | 48 | } |
49 | 49 | ||
50 | FILES_${PN} += " \ | 50 | FILES:${PN} += " \ |
51 | ${libdir}/dri/ \ | 51 | ${libdir}/dri/ \ |
52 | " | 52 | " |
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)} | |||
29 | PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no" | 29 | PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no" |
30 | PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no, wayland wayland-native virtual/egl" | 30 | PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no, wayland wayland-native virtual/egl" |
31 | 31 | ||
32 | FILES_${PN} += "${libdir}/dri/*.so" | 32 | FILES:${PN} += "${libdir}/dri/*.so" |
33 | FILES_${PN}-dev += "${libdir}/dri/*.la" | 33 | FILES:${PN}-dev += "${libdir}/dri/*.la" |
34 | FILES_${PN}-dbg += "${libdir}/dri/.debug" | 34 | 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 \ | |||
13 | SRCREV = "08606d0a43e0ef15e5b61cc13563169370ce8715" | 13 | SRCREV = "08606d0a43e0ef15e5b61cc13563169370ce8715" |
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
16 | CXXFLAGS_append = " -Wno-error" | 16 | CXXFLAGS:append = " -Wno-error" |
17 | 17 | ||
18 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" | 18 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" |
19 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" | 19 | 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" | |||
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" |
@@ -44,17 +44,17 @@ inherit cmake pkgconfig | |||
44 | 44 | ||
45 | EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include" | 45 | EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include" |
46 | 46 | ||
47 | do_install_append() { | 47 | do_install:append() { |
48 | mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples | 48 | mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples |
49 | } | 49 | } |
50 | 50 | ||
51 | PACKAGE_BEFORE_PN = " ${PN}-samples" | 51 | PACKAGE_BEFORE_PN = " ${PN}-samples" |
52 | 52 | ||
53 | FILES_${PN} += " \ | 53 | FILES:${PN} += " \ |
54 | ${libdir}/mfx \ | 54 | ${libdir}/mfx \ |
55 | ${datadir}/mfx/plugins.cfg \ | 55 | ${datadir}/mfx/plugins.cfg \ |
56 | " | 56 | " |
57 | 57 | ||
58 | FILES_${PN}-samples = "${libdir}/mfx/samples" | 58 | FILES:${PN}-samples = "${libdir}/mfx/samples" |
59 | 59 | ||
60 | INSANE_SKIP_${PN}-samples += "staticdev" | 60 | 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" | |||
12 | 12 | ||
13 | # Only for 64 bit | 13 | # Only for 64 bit |
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 | DEPENDS += "libdrm libva intel-media-driver onevpl" | 17 | DEPENDS += "libdrm libva intel-media-driver onevpl" |
18 | 18 | ||
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' | |||
24 | 24 | ||
25 | PACKAGES =+ "${PN}-examples" | 25 | PACKAGES =+ "${PN}-examples" |
26 | 26 | ||
27 | FILES_${PN}-examples = "${datadir}/oneVPL/examples \ | 27 | FILES:${PN}-examples = "${datadir}/oneVPL/examples \ |
28 | " | 28 | " |
29 | 29 | ||
30 | FILES_SOLIBSDEV = "" | 30 | FILES_SOLIBSDEV = "" |
31 | FILES_${PN}-dev += "${libdir}/libvpl.so" | 31 | FILES:${PN}-dev += "${libdir}/libvpl.so" |
32 | 32 | ||
33 | FILES_${PN} += "${datadir} \ | 33 | FILES:${PN} += "${datadir} \ |
34 | ${libdir}/libvpl_wayland.so \ | 34 | ${libdir}/libvpl_wayland.so \ |
35 | " | 35 | " |