diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-08 16:02:37 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-29 10:37:51 +0000 |
| commit | 4ceff7d0a1f28eb1ce5d288111015bff8d5e9a7e (patch) | |
| tree | 3635062a9db9bd0305f79ce4b82355bb0e2132b3 /meta/recipes-multimedia/libav | |
| parent | bb6f073adb1613930a14c9c6f9d7d9ae2e7b59c0 (diff) | |
| download | openembedded-core-4ceff7d0a1f28eb1ce5d288111015bff8d5e9a7e.tar.gz openembedded-core-4ceff7d0a1f28eb1ce5d288111015bff8d5e9a7e.tar.bz2 openembedded-core-4ceff7d0a1f28eb1ce5d288111015bff8d5e9a7e.zip | |
libav: drop older 0.8.* and use libav-9 by default
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-multimedia/libav')
4 files changed, 8 insertions, 55 deletions
diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc index 8b470c1b8d..21c29fc5a7 100644 --- a/meta/recipes-multimedia/libav/libav.inc +++ b/meta/recipes-multimedia/libav/libav.inc @@ -10,6 +10,13 @@ SECTION = "libs" LICENSE = "GPLv2+" LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ + file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI = "http://libav.org/releases/${BP}.tar.xz" + # Provides ffmpeg compat, see http://libav.org/about.html PROVIDES = "ffmpeg" @@ -86,6 +93,7 @@ do_install_append() { } PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets" +PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*" RSUGGESTS_${PN} = "mplayer" FILES_${PN} = "${bindir}" diff --git a/meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch b/meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch deleted file mode 100644 index d9b22b9b6a..0000000000 --- a/meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001 -From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> -Date: Thu, 10 Jan 2013 12:42:19 +0100 -Subject: [PATCH] configure: enable pic for AArch64 - -Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -Upstream-Status: Backport ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- git.orig/configure -+++ git/configure -@@ -2393,7 +2393,7 @@ check_host_cflags -std=c99 - check_host_cflags -Wall - - case "$arch" in -- alpha|ia64|mips|parisc|ppc|sparc) -+ alpha|ia64|mips|parisc|ppc|sparc|aarch64) - spic=$shared - ;; - x86) diff --git a/meta/recipes-multimedia/libav/libav_0.8.15.bb b/meta/recipes-multimedia/libav/libav_0.8.15.bb deleted file mode 100644 index 127a08815d..0000000000 --- a/meta/recipes-multimedia/libav/libav_0.8.15.bb +++ /dev/null @@ -1,20 +0,0 @@ -require libav.inc - -SRC_URI = "http://libav.org/releases/${BP}.tar.xz \ - file://0001-configure-enable-pic-for-AArch64.patch" - -SRC_URI[md5sum] = "e483ea8f482b5ecd65ee1d09251b0a5b" -SRC_URI[sha256sum] = "495789ec547e93632937f0f36b06f4dd3180bc61518181f124af6746c6218710" - -LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \ - file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" - -PROVIDES += "libpostproc" - -EXTRA_OECONF += " \ - --enable-postproc \ -" - -PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*" diff --git a/meta/recipes-multimedia/libav/libav_9.16.bb b/meta/recipes-multimedia/libav/libav_9.16.bb index 8ced2dca8a..79ff3f84d1 100644 --- a/meta/recipes-multimedia/libav/libav_9.16.bb +++ b/meta/recipes-multimedia/libav/libav_9.16.bb @@ -1,16 +1,4 @@ require libav.inc -LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ - file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" - -SRC_URI = "http://libav.org/releases/${BP}.tar.xz" - SRC_URI[md5sum] = "7b44b75cec24b8e7545e5029e76917e0" SRC_URI[sha256sum] = "ca846473b0b8ed8e3404c52e5e92df6d35cb5fa487eec498525de3ffda4367a0" - -DEFAULT_PREFERENCE = "-1" - -# unlike 0.8.11 we don't provide libpostproc -PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*" |