diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2010-12-08 22:08:39 +0000 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-12-09 22:32:55 +0100 |
| commit | 18d59f5fad41e4ea05b5d5a8c1588a0bdbdbf815 (patch) | |
| tree | 7621a2b38fbac0bd0933b2cbadc4a1dbf0ed4425 | |
| parent | 062dbf9ad81a7ee9feb6b8c445c08cc6c2164013 (diff) | |
| download | openembedded-18d59f5fad41e4ea05b5d5a8c1588a0bdbdbf815.tar.gz | |
ffmpeg: set default license to GPLv2+, because --enable-gpl is used.
* See http://www.ffmpeg.org/legal.html
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
| -rw-r--r-- | recipes/ffmpeg/ffmpeg.inc | 4 | ||||
| -rw-r--r-- | 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 b6dfe53943..9cfdc19042 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 6f51a6010a..573de03b43 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 |