Patchwork [1/2] ffmpeg: set default license to GPLv2+, because --enable-gpl is used.

login
register
mail settings
Submitter Andreas Oberritter
Date Dec. 8, 2010, 2:08 p.m.
Message ID <1291817320-5270-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/30/
State Accepted
Commit 18d59f5fad41e4ea05b5d5a8c1588a0bdbdbf815
Headers show

Comments

Andreas Oberritter - Dec. 8, 2010, 2:08 p.m.
* See http://www.ffmpeg.org/legal.html

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 recipes/ffmpeg/ffmpeg.inc    |    4 ++--
 recipes/ffmpeg/ffmpeg_svn.bb |    3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

Patch

diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index b6dfe53..9cfdc19 100644
--- a/recipes/ffmpeg/ffmpeg.inc
+++ b/recipes/ffmpeg/ffmpeg.inc
@@ -3,7 +3,7 @@  HOMEPAGE = "http://ffmpeg.mplayerhq.hu/"
 AUTHOR = "Fabrice Bellard ffmpeg-devel@mplayerhq.hu"
 SECTION = "libs"
 PRIORITY = "optional"
-LICENSE = "LGPL"
+LICENSE = "GPLv2+"
 
 ARM_INSTRUCTION_SET = "arm"
 
@@ -12,7 +12,7 @@  PE = "2"
 DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
 RSUGGESTS_${PN} = "mplayer"
 
-INC_PR = "r16"
+INC_PR = "r17"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb
index 6f51a60..573de03 100644
--- a/recipes/ffmpeg/ffmpeg_svn.bb
+++ b/recipes/ffmpeg/ffmpeg_svn.bb
@@ -1,8 +1,5 @@ 
 require ffmpeg.inc
 
-# The license depends on the configure option selected in this recipe 'non-free' is disabled and 'gpl' is enabled
-LICENSE = "GPLv2+"
-
 DEPENDS += "virtual/libsdl schroedinger libgsm libvpx"
 
 # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes