summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-08-08 16:02:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:50 +0000
commit09aa2b1ed85408939a8bae433c032ea5da7cc7a5 (patch)
treeef8e79e1cf2ed9bdd66a6ea4f737cfbea3b3ef3f
parent872b656e884b2c1fc263a670e7c612e95feace58 (diff)
downloadpoky-09aa2b1ed85408939a8bae433c032ea5da7cc7a5.tar.gz
libav: drop older 0.8.* and use libav-9 by default
(From OE-Core rev: 4ceff7d0a1f28eb1ce5d288111015bff8d5e9a7e) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb3
-rw-r--r--meta/recipes-multimedia/libav/libav.inc8
-rw-r--r--meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch23
-rw-r--r--meta/recipes-multimedia/libav/libav_0.8.15.bb20
-rw-r--r--meta/recipes-multimedia/libav/libav_9.16.bb12
5 files changed, 9 insertions, 57 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
index 7304fffddf..219feaafc9 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -57,7 +57,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
57 file://0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch \ 57 file://0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch \
58 file://0001-avcodec-smc-fix-off-by-1-error.patch \ 58 file://0001-avcodec-smc-fix-off-by-1-error.patch \
59 file://0002-avcodec-mjpegdec-check-bits-per-pixel-for-changes-si.patch \ 59 file://0002-avcodec-mjpegdec-check-bits-per-pixel-for-changes-si.patch \
60 ${@bb.utils.contains('PACKAGECONFIG', 'libav9', 'file://libav-9.patch', '', d)} \ 60 file://libav-9.patch \
61" 61"
62 62
63SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" 63SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"
@@ -84,7 +84,6 @@ EXTRA_OECONF = "${FFMPEG_EXTRA_CONFIGURE_COMMON}"
84PACKAGECONFIG ??= "external-libav" 84PACKAGECONFIG ??= "external-libav"
85PACKAGECONFIG[external-libav] = "--with-system-ffmpeg,,libav" 85PACKAGECONFIG[external-libav] = "--with-system-ffmpeg,,libav"
86PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" 86PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
87PACKAGECONFIG[libav9] = ",,,"
88 87
89FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" 88FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
90FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" 89FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
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"
10LICENSE = "GPLv2+" 10LICENSE = "GPLv2+"
11LICENSE_FLAGS = "commercial" 11LICENSE_FLAGS = "commercial"
12 12
13LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
14 file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
15 file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
16 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
17
18SRC_URI = "http://libav.org/releases/${BP}.tar.xz"
19
13# Provides ffmpeg compat, see http://libav.org/about.html 20# Provides ffmpeg compat, see http://libav.org/about.html
14PROVIDES = "ffmpeg" 21PROVIDES = "ffmpeg"
15 22
@@ -86,6 +93,7 @@ do_install_append() {
86} 93}
87 94
88PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets" 95PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets"
96PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*"
89 97
90RSUGGESTS_${PN} = "mplayer" 98RSUGGESTS_${PN} = "mplayer"
91FILES_${PN} = "${bindir}" 99FILES_${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 @@
1From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001
2From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
3Date: Thu, 10 Jan 2013 12:42:19 +0100
4Subject: [PATCH] configure: enable pic for AArch64
5
6Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
7
8Upstream-Status: Backport
9---
10 configure | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13--- git.orig/configure
14+++ git/configure
15@@ -2393,7 +2393,7 @@ check_host_cflags -std=c99
16 check_host_cflags -Wall
17
18 case "$arch" in
19- alpha|ia64|mips|parisc|ppc|sparc)
20+ alpha|ia64|mips|parisc|ppc|sparc|aarch64)
21 spic=$shared
22 ;;
23 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 @@
1require libav.inc
2
3SRC_URI = "http://libav.org/releases/${BP}.tar.xz \
4 file://0001-configure-enable-pic-for-AArch64.patch"
5
6SRC_URI[md5sum] = "e483ea8f482b5ecd65ee1d09251b0a5b"
7SRC_URI[sha256sum] = "495789ec547e93632937f0f36b06f4dd3180bc61518181f124af6746c6218710"
8
9LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
12 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
13
14PROVIDES += "libpostproc"
15
16EXTRA_OECONF += " \
17 --enable-postproc \
18"
19
20PACKAGES_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 @@
1require libav.inc 1require libav.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
4 file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
5 file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
6 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
7
8SRC_URI = "http://libav.org/releases/${BP}.tar.xz"
9
10SRC_URI[md5sum] = "7b44b75cec24b8e7545e5029e76917e0" 3SRC_URI[md5sum] = "7b44b75cec24b8e7545e5029e76917e0"
11SRC_URI[sha256sum] = "ca846473b0b8ed8e3404c52e5e92df6d35cb5fa487eec498525de3ffda4367a0" 4SRC_URI[sha256sum] = "ca846473b0b8ed8e3404c52e5e92df6d35cb5fa487eec498525de3ffda4367a0"
12
13DEFAULT_PREFERENCE = "-1"
14
15# unlike 0.8.11 we don't provide libpostproc
16PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*"