summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartłomiej Burdukiewicz <bartlomiej.burdukiewicz@gmail.com>2020-04-29 22:27:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-02 09:08:53 +0100
commit5dbea455199d8033bdd45ca27db839e3fbcc8a12 (patch)
tree23de0d29902fa6d7036db91c73bddff6f7ff9bbf
parente5204fe6dbc6760623ca5e36f6b0393f7fca3c57 (diff)
downloadpoky-5dbea455199d8033bdd45ca27db839e3fbcc8a12.tar.gz
libva: add PACKAGECONFIG and additonal rules for glx.
* glx PACKAGECONFIG by default is selected when x11 and opengl flag is present in DISTRO_FEATURES. * virtual/mesa is only required when glx driver is selected to build. (From OE-Core rev: 65b7b48cd6c7ec88da4dc8bcc3e93fe2703a8fef) Signed-off-by: Bartłomiej Burdukiewicz <bartlomiej.burdukiewicz@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/libva/libva_2.6.1.bb14
1 files changed, 10 insertions, 4 deletions
diff --git a/meta/recipes-graphics/libva/libva_2.6.1.bb b/meta/recipes-graphics/libva/libva_2.6.1.bb
index 92cea83bc1..8c495bad70 100644
--- a/meta/recipes-graphics/libva/libva_2.6.1.bb
+++ b/meta/recipes-graphics/libva/libva_2.6.1.bb
@@ -23,15 +23,21 @@ SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e4862940
23 23
24UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" 24UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases"
25 25
26DEPENDS = "libdrm virtual/mesa" 26DEPENDS = "libdrm"
27 27
28inherit meson pkgconfig features_check 28inherit meson pkgconfig features_check
29 29
30REQUIRED_DISTRO_FEATURES = "opengl" 30REQUIRED_DISTRO_FEATURES = "opengl"
31 31
32PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" 32PACKAGECONFIG ??= " \
33PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no,virtual/libx11 libxext libxfixes" 33 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)} \
34PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no,wayland-native wayland" 34 ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \
35"
36
37PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxext libxfixes"
38PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/mesa"
39
40PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland"
35 41
36PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland" 42PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland"
37 43