From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] libv4l: fix build with sdl2_image
Date: Sat, 30 Jun 2018 18:19:15 +0200 [thread overview]
Message-ID: <20180630181915.65fd07f8@windsurf.home> (raw)
In-Reply-To: <20180629195248.4008-2-fontaine.fabrice@gmail.com>
Hello,
On Fri, 29 Jun 2018 21:52:48 +0200, Fabrice Fontaine wrote:
> sdlcam test includes jpeglib.h so add an option to disable tests
>
> Fixes:
> - http://autobuild.buildroot.net/results/1eded8b44cc369550566c6ce0b3c042f1aec8d44
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/libv4l/0004-Add-disable-tests-option.patch | 59 ++++++++++++++++++++++
> package/libv4l/libv4l.mk | 8 ++-
> 2 files changed, 66 insertions(+), 1 deletion(-)
> create mode 100644 package/libv4l/0004-Add-disable-tests-option.patch
>
> diff --git a/package/libv4l/0004-Add-disable-tests-option.patch b/package/libv4l/0004-Add-disable-tests-option.patch
> new file mode 100644
> index 0000000000..7d1e458112
> --- /dev/null
> +++ b/package/libv4l/0004-Add-disable-tests-option.patch
> @@ -0,0 +1,59 @@
> +From d244fc440dd18dacf9b820f333134cd842e2f970 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Fri, 29 Jun 2018 21:15:10 +0200
> +Subject: [PATCH] Add --disable-tests option
> +
> +Offer the possibiity to disable tests especially sdlcam test which
> +includes jpeglib.h
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
This patch is not the right/best solution to the problem. configure.ac
already checks for the availability of the jpeg library, and defines
HAVE_JPEG accordingly.
So in contrib/test/Makefile.am, just replace:
if HAVE_SDL
noinst_PROGRAMS += sdlcam
endif
by:
if HAVE_SDL
if HAVE_JPEG
noinst_PROGRAMS += sdlcam
endif
endif
Perhaps there is an automake "and" or "&&" operator, but I'm not sure.
Also, please submit this change upstream.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2018-06-30 16:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-29 19:52 [Buildroot] [PATCH 1/2] libv4l: add optional sdl2_image dependency Fabrice Fontaine
2018-06-29 19:52 ` [Buildroot] [PATCH 2/2] libv4l: fix build with sdl2_image Fabrice Fontaine
2018-06-30 16:19 ` Thomas Petazzoni [this message]
2018-06-30 16:20 ` [Buildroot] [PATCH 1/2] libv4l: add optional sdl2_image dependency Thomas Petazzoni
2018-07-19 9:55 ` Peter Korsgaard
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=20180630181915.65fd07f8@windsurf.home \
--to=thomas.petazzoni@bootlin.com \
--cc=buildroot@busybox.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox