All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4 1/1] package/ffmpeg: Add support for GnuTLS
Date: Sun, 18 Oct 2015 15:45:30 +0200	[thread overview]
Message-ID: <20151018154530.06efcfb9@free-electrons.com> (raw)
In-Reply-To: <1445110736-1663-1-git-send-email-bernd.kuhls@t-online.de>

Bernd, Yann,

On Sat, 17 Oct 2015 21:38:56 +0200, Bernd Kuhls wrote:
> Besides OpenSSL ffmpeg also supports GnuTLS.
> 
> If both GnuTLS and OpenSSL are enabled, the former takes precedence over
> the latter:
> http://git.videolan.org/?p=ffmpeg.git;a=blob;f=configure;h=7f9fed31a491ed0991aee2d354dba82e54e3291e;hb=refs/heads/release/2.8#l2719
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v4: Removed Kconfig options (Thomas)
> v3: rebased
> v2: OpenSSL and gpl'ed code from ffmpeg play together when nonfree

I've applied. However, I find the code to not be very pretty. What
about something like this instead:

ifeq ($(BR2_PACKAGE_GNUTLS),y)
FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl
FFMPEG_DEPENDENCIES += gnutls
# OpenSSL license is not compatible with the LGPL license of ffmpeg.
else ifeq ($(BR2_PACKAGE_OPENSSL):$(BR2_PACKAGE_FFMPEG_GPL):$(BR2_PACKAGE_FFMPEG_NONFREE),y::y)
FFMPEG_CONF_OPTS += --enable-openssl
FFMPEG_DEPENDENCIES += openssl
else
FFMPEG_CONF_OPTS += --disable-gnutls --disable-openssl
endif

I think it is functionally equivalent, but much nicer to read. If you
agree (and the above works), can you send a patch doing this?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

  parent reply	other threads:[~2015-10-18 13:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-17 19:38 [Buildroot] [PATCH v4 1/1] package/ffmpeg: Add support for GnuTLS Bernd Kuhls
2015-10-17 19:55 ` Yann E. MORIN
2015-10-18 13:45 ` Thomas Petazzoni [this message]
2015-10-19 19:23   ` Bernd Kuhls

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=20151018154530.06efcfb9@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 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.