From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/ffmpeg: Improve logic for GnuTLS/OpenSSL
Date: Sun, 18 Oct 2015 21:06:09 +0200 [thread overview]
Message-ID: <20151018210609.6f73002d@free-electrons.com> (raw)
In-Reply-To: <1445184950-9386-2-git-send-email-bernd.kuhls@t-online.de>
Bernd,
On Sun, 18 Oct 2015 18:15:50 +0200, Bernd Kuhls wrote:
> diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
> index d4815ca..dd31847 100644
> --- a/package/ffmpeg/ffmpeg.mk
> +++ b/package/ffmpeg/ffmpeg.mk
> @@ -203,19 +203,12 @@ endif
> ifeq ($(BR2_PACKAGE_GNUTLS),y)
> FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl
> FFMPEG_DEPENDENCIES += gnutls
> -else
> -FFMPEG_CONF_OPTS += --disable-gnutls
> -ifeq ($(BR2_PACKAGE_OPENSSL),y)
> -# openssl isn't license compatible with GPL
> -ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
> -FFMPEG_CONF_OPTS += --disable-openssl
> -else
> +# OpenSSL license is not compatible with the LGPL license of ffmpeg.
> +else ifneq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
Where do you check that OpenSSL is enabled?
> FFMPEG_CONF_OPTS += --enable-openssl
> FFMPEG_DEPENDENCIES += openssl
> -endif
> else
> -FFMPEG_CONF_OPTS += --disable-openssl
> -endif
> +FFMPEG_CONF_OPTS += --disable-gnutls --disable-openssl
> endif
>
> ifeq ($(BR2_PACKAGE_LIBDCADEC),y)
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
prev parent reply other threads:[~2015-10-18 19:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-18 16:15 [Buildroot] [PATCH 1/2] Config.in.legacy: remove empty line Bernd Kuhls
2015-10-18 16:15 ` [Buildroot] [PATCH 2/2] package/ffmpeg: Improve logic for GnuTLS/OpenSSL Bernd Kuhls
2015-10-18 19:06 ` Thomas Petazzoni [this message]
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=20151018210609.6f73002d@free-electrons.com \
--to=thomas.petazzoni@free-electrons.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