From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4 1/1] package/ffmpeg: Add support for GnuTLS
Date: Sat, 17 Oct 2015 21:55:42 +0200 [thread overview]
Message-ID: <20151017195542.GF3717@free.fr> (raw)
In-Reply-To: <1445110736-1663-1-git-send-email-bernd.kuhls@t-online.de>
Bernd, All,
On 2015-10-17 21:38 +0200, Bernd Kuhls spake thusly:
> 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>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> v4: Removed Kconfig options (Thomas)
And I agreed with Thomas when we talked about this on IRC yesterday. ;-)
Regards,
Yann E. MORIN.
> v3: rebased
> v2: OpenSSL and gpl'ed code from ffmpeg play together when nonfree
>
> package/ffmpeg/ffmpeg.mk | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
> index 287338d..d4815ca 100644
> --- a/package/ffmpeg/ffmpeg.mk
> +++ b/package/ffmpeg/ffmpeg.mk
> @@ -200,6 +200,11 @@ else
> FFMPEG_CONF_OPTS += --disable-libfdk-aac
> 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)
> @@ -211,6 +216,7 @@ endif
> else
> FFMPEG_CONF_OPTS += --disable-openssl
> endif
> +endif
>
> ifeq ($(BR2_PACKAGE_LIBDCADEC),y)
> FFMPEG_CONF_OPTS += --enable-libdcadec
> --
> 2.6.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2015-10-17 19:55 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 [this message]
2015-10-18 13:45 ` Thomas Petazzoni
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=20151017195542.GF3717@free.fr \
--to=yann.morin.1998@free.fr \
--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.