[oe-commits] Andreas Oberritter : ffmpeg: set default license to GPLv2+, because --enable-gpl is used.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 18d59f5fad41e4ea05b5d5a8c1588a0bdbdbf815
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=18d59f5fad41e4ea05b5d5a8c1588a0bdbdbf815

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Wed Dec  8 22:08:39 2010 +0000

ffmpeg: set default license to GPLv2+, because --enable-gpl is used.

* See http://www.ffmpeg.org/legal.html

Signed-off-by: Andreas Oberritter <obi at opendreambox.org>

---

 recipes/ffmpeg/ffmpeg.inc    |    4 ++--
 recipes/ffmpeg/ffmpeg_svn.bb |    3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

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 at 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