[Buildroot] [PATCH 1/2] Config.in.legacy: remove empty line

[Buildroot] [PATCH 1/2] Config.in.legacy: remove empty line

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 Config.in.legacy | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 7d2d63f..a452bf5 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -250,7 +250,6 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST
 	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
 	  examples.
 
-
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_FIRE
 	bool "DirectFB example df_fire has been removed"
 	select BR2_LEGACY
-- 
2.6.1

[Buildroot] [PATCH 2/2] package/ffmpeg: Improve logic for GnuTLS/OpenSSL

[Bernd Kuhls]

Patch proposed by Thomas:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/129705

and improved because according to ffmpeg configure

http://git.videolan.org/?p=ffmpeg.git;a=blob;f=configure;h=7f9fed31a491ed0991aee2d354dba82e54e3291e;hb=refs/heads/release/2.8#l4664

OpenSSL can be used in the following cases:

OpenSSL| GPL    | nonfree |
---------------------------
  no   | yes    |  no     |
  yes  | no     |  yes    |
  yes  | yes    |  yes    |
  yes  | no     |  no     |
---------------------------

If BR2_PACKAGE_FFMPEG_GPL is enabled, option BR2_PACKAGE_FFMPEG_NONFREE
has to enabled at the same time.
If BR2_PACKAGE_FFMPEG_GPL is disabled, OpenSSL can be used, regardless
of BR2_PACKAGE_FFMPEG_NONFREE.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/ffmpeg/ffmpeg.mk | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

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)
 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)
-- 
2.6.1

[Buildroot] [PATCH 2/2] package/ffmpeg: Improve logic for GnuTLS/OpenSSL

[Thomas Petazzoni]

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