ffmpeg: set default license to GPLv2+, because --enable-gpl is used.
PATCH 1/2 ffmpeg: set default license to GPLv2+, because --enable-gpl is used.
* See http://www.ffmpeg.org/legal.html
Signed-off-by Andreas Oberritter <[email protected]>
--- recipes/ffmpeg/ffmpeg.inc | 4 ++-- recipes/ffmpeg/ffmpeg_svn.bb | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-)
recipes/ffmpeg/ffmpeg.inc +2 -2
@@ -3,7 +3,7 @@ HOMEPAGE = "http://ffmpeg.mplayerhq.hu/" AUTHOR = "Fabrice Bellard [email protected]" 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
recipes/ffmpeg/ffmpeg_svn.bb +0 -3
@@ -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
Signature · 1 line
1.7.2.3
PATCH 2/2 ffmpeg: add recipe for 0.6.1 (LGPLv2.1+)
Signed-off-by Andreas Oberritter <[email protected]>
--- recipes/ffmpeg/ffmpeg_0.6.1.bb | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) create mode 100644 recipes/ffmpeg/ffmpeg_0.6.1.bb
recipes/ffmpeg/ffmpeg_0.6.1.bb new file +39 -0
@@ -0,0 +1,39 @@ +require ffmpeg.inc + +LICENSE = "LGPLv2.1+" +DEPENDS += "schroedinger libgsm" +PR = "${INC_PR}.0" + +SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2" +SRC_URI[md5sum] = "4f5d732d25eedfb072251b5314ba2093" +SRC_URI[sha256sum] = "e348aa6d0bb199f231aa3a48e8f457f037c763219bccc8b395e007ccd87ebd5f" + +EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" +EXTRA_FFCONF_mipsel = "--arch=mips" + +EXTRA_OECONF = " \ + --arch=${TARGET_ARCH} \ + --cross-prefix=${TARGET_PREFIX} \ + --disable-stripping \ + --enable-cross-compile \ + --enable-libgsm \ + --enable-libmp3lame \ + --enable-libschroedinger \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-pthreads \ + --enable-shared \ + --enable-swscale \ + --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-ldflags="${TARGET_LDFLAGS}" \ + --prefix=${prefix}/ \ + --target-os=linux \ + ${EXTRA_FFCONF} \ +" + +do_configure() { + ./configure ${EXTRA_OECONF} +} + +FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math" +BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
Signature · 1 line
1.7.2.3