Skip to contentSkip to conversation

Config.in.legacy: remove empty line

PATCH New Bernd Kuhls 2 participants 3 messages Oct 18, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

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

Signed-off-by Bernd Kuhls <[email protected]>
---
 Config.in.legacy | 1 -
 1 file changed, 1 deletion(-)
Config.in.legacy +0 -1
index 7d2d63f..a452bf5 100644
@@ -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
Signature · 1 line
2.6.1
author
#1 lore raw

PATCH 2/2 package/ffmpeg: Improve logic for GnuTLS/OpenSSL

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 <[email protected]>
---
 package/ffmpeg/ffmpeg.mk | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
package/ffmpeg/ffmpeg.mk +3 -10
index d4815ca..dd31847 100644
@@ -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)
Signature · 1 line
2.6.1
#2 lore raw

PATCH 2/2 package/ffmpeg: Improve logic for GnuTLS/OpenSSL

Bernd,

Quoted 7 lines · Bernd Kuhls
package/ffmpeg/ffmpeg.mk +0 -0
index d4815ca..dd31847 100644
@@ -203,19 +203,12 @@ endif
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl

package/ffmpeg/ffmpeg.mk endif · line 207

Quoted 10 lines
package/ffmpeg/ffmpeg.mk +2 -7
 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?

package/ffmpeg/ffmpeg.mk endif · line 214

Quoted 10 lines
package/ffmpeg/ffmpeg.mk +1 -3
 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

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