git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 75730490d2c0416ae8ad4d3e2a47ccb66d260d9f Mon Sep 17 00:00:00 2001
   2 From: Nirbheek Chauhan <nirbheek@centricular.com>
   3 Date: Fri, 13 Sep 2024 14:37:10 +0530
   4 Subject: [PATCH] meson: Re-added required: lines accidentally removed
   5
   6 Broke in e3f086c648171c3c993f5dd73e2d025480c3729e
   7
   8 Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3801
   9
  10 Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7512>
  11 Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/577df3a02f7f26283b2749c58ae7738bbdf4be4c]
  12 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  13 ---
  14  meson.build | 6 +++---
  15  1 file changed, 3 insertions(+), 3 deletions(-)
  16
  17 diff --git a/meson.build b/meson.build
  18 index 1a8301f..6c61773 100644
  19 --- a/meson.build
  20 +++ b/meson.build
  21 @@ -80,9 +80,9 @@ else
  22  endif
  23
  24  libva_dep = dependency('libva', version: libva_req)
  25 -libva_drm_dep = dependency('libva-drm', version: libva_req)
  26 -libva_wayland_dep = dependency('libva-wayland', version: libva_req)
  27 -libva_x11_dep = dependency('libva-x11', version: libva_req)
  28 +libva_drm_dep = dependency('libva-drm', required: get_option('drm'), version: libva_req)
  29 +libva_wayland_dep = dependency('libva-wayland', required: get_option('wayland'), version: libva_req)
  30 +libva_x11_dep = dependency('libva-x11', required: get_option('x11'), version: libva_req)
  31
  32  libdrm_dep = dependency('libdrm', version: libdrm_req, required: get_option('drm'))
  33  libudev_dep = dependency('libudev', required: get_option('drm'))