summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2021-07-31 17:47:03 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2021-07-31 17:47:03 +0800
commit0584f638797a816b29b909d4611d5a099df7bbc1 (patch)
tree1ec4bdacf824c304290b5086fd54bba9b84158e2 /recipes-multimedia
parent7a5e47b6a594eb29dfe84e47f043a49974bc0402 (diff)
downloadmeta-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.bb2
-rw-r--r--recipes-multimedia/libva/intel-media-driver_21.2.3.bb12
-rw-r--r--recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb6
-rw-r--r--recipes-multimedia/libyami/libyami_1.3.2.bb2
-rw-r--r--recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb10
-rw-r--r--recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb2
-rw-r--r--recipes-multimedia/onevpl/onevpl_2021.4.0.bb6
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
37RDEPENDS_${PN}-dev_remove = "${PN} (= ${EXTENDPKGV})" 37RDEPENDS:${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 \
26SRCREV = "008fb3b400dd906276f999eeaef3f49d52fd3d05" 26SRCREV = "008fb3b400dd906276f999eeaef3f49d52fd3d05"
27S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
28 28
29COMPATIBLE_HOST_x86-x32 = "null" 29COMPATIBLE_HOST:x86-x32 = "null"
30 30
31UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P<pver>(?!600\..*)\d+(\.\d+)+)$" 31UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P<pver>(?!600\..*)\d+(\.\d+)+)$"
32 32
33inherit cmake pkgconfig 33inherit cmake pkgconfig
34 34
35MEDIA_DRIVER_ARCH_x86 = "32" 35MEDIA_DRIVER_ARCH:x86 = "32"
36MEDIA_DRIVER_ARCH_x86-64 = "64" 36MEDIA_DRIVER_ARCH:x86-64 = "64"
37 37
38EXTRA_OECMAKE += " \ 38EXTRA_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
44CXXFLAGS_append_x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" 44CXXFLAGS:append:x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
45 45
46do_configure_prepend_toolchain-clang() { 46do_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
50FILES_${PN} += " \ 50FILES:${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)}
29PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no" 29PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no"
30PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no, wayland wayland-native virtual/egl" 30PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no, wayland wayland-native virtual/egl"
31 31
32FILES_${PN} += "${libdir}/dri/*.so" 32FILES:${PN} += "${libdir}/dri/*.so"
33FILES_${PN}-dev += "${libdir}/dri/*.la" 33FILES:${PN}-dev += "${libdir}/dri/*.la"
34FILES_${PN}-dbg += "${libdir}/dri/.debug" 34FILES:${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 \
13SRCREV = "08606d0a43e0ef15e5b61cc13563169370ce8715" 13SRCREV = "08606d0a43e0ef15e5b61cc13563169370ce8715"
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
16CXXFLAGS_append = " -Wno-error" 16CXXFLAGS:append = " -Wno-error"
17 17
18PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" 18PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}"
19PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" 19PACKAGECONFIG[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
14COMPATIBLE_HOST = '(x86_64).*-linux' 14COMPATIBLE_HOST = '(x86_64).*-linux'
15COMPATIBLE_HOST_x86-x32 = "null" 15COMPATIBLE_HOST:x86-x32 = "null"
16 16
17inherit features_check 17inherit features_check
18REQUIRED_DISTRO_FEATURES = "opengl" 18REQUIRED_DISTRO_FEATURES = "opengl"
@@ -44,17 +44,17 @@ inherit cmake pkgconfig
44 44
45EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include" 45EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include"
46 46
47do_install_append() { 47do_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
51PACKAGE_BEFORE_PN = " ${PN}-samples" 51PACKAGE_BEFORE_PN = " ${PN}-samples"
52 52
53FILES_${PN} += " \ 53FILES:${PN} += " \
54 ${libdir}/mfx \ 54 ${libdir}/mfx \
55 ${datadir}/mfx/plugins.cfg \ 55 ${datadir}/mfx/plugins.cfg \
56 " 56 "
57 57
58FILES_${PN}-samples = "${libdir}/mfx/samples" 58FILES:${PN}-samples = "${libdir}/mfx/samples"
59 59
60INSANE_SKIP_${PN}-samples += "staticdev" 60INSANE_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
14COMPATIBLE_HOST = '(x86_64).*-linux' 14COMPATIBLE_HOST = '(x86_64).*-linux'
15COMPATIBLE_HOST_x86-x32 = "null" 15COMPATIBLE_HOST:x86-x32 = "null"
16 16
17DEPENDS += "libdrm libva intel-media-driver onevpl" 17DEPENDS += "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
25PACKAGES =+ "${PN}-examples" 25PACKAGES =+ "${PN}-examples"
26 26
27FILES_${PN}-examples = "${datadir}/oneVPL/examples \ 27FILES:${PN}-examples = "${datadir}/oneVPL/examples \
28 " 28 "
29 29
30FILES_SOLIBSDEV = "" 30FILES_SOLIBSDEV = ""
31FILES_${PN}-dev += "${libdir}/libvpl.so" 31FILES:${PN}-dev += "${libdir}/libvpl.so"
32 32
33FILES_${PN} += "${datadir} \ 33FILES:${PN} += "${datadir} \
34 ${libdir}/libvpl_wayland.so \ 34 ${libdir}/libvpl_wayland.so \
35 " 35 "