All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: linux-media@vger.kernel.org
Cc: ezequiel@collabora.com, gjasny@googlemail.com,
	hverkuil@xs4all.nl, kieran.bingham@ideasonboard.com,
	mchehab@kernel.org, nicolas@ndufresne.ca, p.zabel@pengutronix.de,
	rosenp@gmail.com, sakari.ailus@iki.fi, sean@mess.org,
	user.vdr@gmail.com, xavier.claessens@collabora.com
Subject: [PATCH v6 08/13] [FIXUP] meson: Fix SDL dependency fallback check
Date: Mon, 29 Aug 2022 04:33:22 +0300	[thread overview]
Message-ID: <20220829013327.5791-9-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20220829013327.5791-1-laurent.pinchart@ideasonboard.com>

The SDL2 or SDL2_image can't be found using pkgconfig, we fall back to
searching for them using the find_library() function. This treats the
dependencies as required by mistake, unlike the dependency() calls that
correctly set 'required' to false. Fix it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index fce8a09b390b..a6816e2bee16 100644
--- a/meson.build
+++ b/meson.build
@@ -81,12 +81,12 @@ endif
 
 dep_sdl = dependency('SDL2', required: false)
 if not dep_sdl.found()
-    dep_sdl = cc.find_library('SDL2', has_headers: 'SDL2/SDL.h')
+    dep_sdl = cc.find_library('SDL2', has_headers: 'SDL2/SDL.h', required: false)
 endif
 
 dep_sdl_image = dependency('SDL2_image', required: false)
 if not dep_sdl_image.found()
-    dep_sdl_image = cc.find_library('SDL2_image', has_headers: 'SDL2/SDL_image.h')
+    dep_sdl_image = cc.find_library('SDL2_image', has_headers: 'SDL2/SDL_image.h', required: false)
 endif
 
 dep_threads = dependency('threads')
-- 
Regards,

Laurent Pinchart


  parent reply	other threads:[~2022-08-29  1:33 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-29  1:33 [PATCH v6 00/13] Add support for meson building Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 01/13] Move README to markdown syntax Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 02/13] Add support for meson building Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 03/13] [FIXUP] meson: Drop unneeded bpf option check Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 04/13] [FIXUP] meson: Avoid double-quoting strings Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 05/13] [FIXUP] meson: Use external_program object directly without calling path() Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 06/13] [FIXUP] meson: Specify check kwarg to run_command() Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 07/13] [FIXUP] meson: Replace deprecated get_cross_property() with get_external_property() Laurent Pinchart
2022-08-29  1:33 ` Laurent Pinchart [this message]
2022-08-29  1:33 ` [PATCH v6 09/13] [FIXUP] meson: Set the default build type to debugoptimized Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 10/13] Copy Doxygen configuration file to doc/ Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 11/13] [FIXUP] doc: Fix Doygen deprecation warnings Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 12/13] meson: Add support for doxygen documentation Laurent Pinchart
2022-08-29  1:33 ` [PATCH v6 13/13] Makefile.am: Distribute meson related files Laurent Pinchart

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220829013327.5791-9-laurent.pinchart@ideasonboard.com \
    --to=laurent.pinchart@ideasonboard.com \
    --cc=ezequiel@collabora.com \
    --cc=gjasny@googlemail.com \
    --cc=hverkuil@xs4all.nl \
    --cc=kieran.bingham@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=nicolas@ndufresne.ca \
    --cc=p.zabel@pengutronix.de \
    --cc=rosenp@gmail.com \
    --cc=sakari.ailus@iki.fi \
    --cc=sean@mess.org \
    --cc=user.vdr@gmail.com \
    --cc=xavier.claessens@collabora.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.