<div dir="ltr">Hi Martin,<div><br></div><div>Can this be squashed with the previous patch which makes changes to libav 0.8? Merging the .inc and .bb together seems sensible too, especially as the .inc contains the checksums so isn't actually useful for multiple versions. Also theres a version typo in the commit shortlog.</div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 10 December 2014 at 14:17, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
---<br>
.../gstreamer/<a href="http://gst-ffmpeg_0.10.13.bb" target="_blank">gst-ffmpeg_0.10.13.bb</a> | 3 +--<br>
meta/recipes-multimedia/libav/libav.inc | 8 ++++++++<br>
.../0001-configure-enable-pic-for-AArch64.patch | 23 ----------------------<br>
meta/recipes-multimedia/libav/<a href="http://libav_0.8.15.bb" target="_blank">libav_0.8.15.bb</a> | 20 -------------------<br>
meta/recipes-multimedia/libav/<a href="http://libav_9.16.bb" target="_blank">libav_9.16.bb</a> | 12 -----------<br>
5 files changed, 9 insertions(+), 57 deletions(-)<br>
delete mode 100644 meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch<br>
delete mode 100644 meta/recipes-multimedia/libav/<a href="http://libav_0.8.15.bb" target="_blank">libav_0.8.15.bb</a><br>
<br>
diff --git a/meta/recipes-multimedia/gstreamer/<a href="http://gst-ffmpeg_0.10.13.bb" target="_blank">gst-ffmpeg_0.10.13.bb</a> b/meta/recipes-multimedia/gstreamer/<a href="http://gst-ffmpeg_0.10.13.bb" target="_blank">gst-ffmpeg_0.10.13.bb</a><br>
index 7304fff..219feaa 100644<br>
--- a/meta/recipes-multimedia/gstreamer/<a href="http://gst-ffmpeg_0.10.13.bb" target="_blank">gst-ffmpeg_0.10.13.bb</a><br>
+++ b/meta/recipes-multimedia/gstreamer/<a href="http://gst-ffmpeg_0.10.13.bb" target="_blank">gst-ffmpeg_0.10.13.bb</a><br>
@@ -57,7 +57,7 @@ SRC_URI = "<a href="http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2" target="_blank">http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2</a> \<br>
file://0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch \<br>
file://0001-avcodec-smc-fix-off-by-1-error.patch \<br>
file://0002-avcodec-mjpegdec-check-bits-per-pixel-for-changes-si.patch \<br>
- ${@bb.utils.contains('PACKAGECONFIG', 'libav9', 'file://libav-9.patch', '', d)} \<br>
+ file://libav-9.patch \<br>
"<br>
<br>
SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"<br>
@@ -84,7 +84,6 @@ EXTRA_OECONF = "${FFMPEG_EXTRA_CONFIGURE_COMMON}"<br>
PACKAGECONFIG ??= "external-libav"<br>
PACKAGECONFIG[external-libav] = "--with-system-ffmpeg,,libav"<br>
PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"<br>
-PACKAGECONFIG[libav9] = ",,,"<br>
<br>
FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"<br>
FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"<br>
diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc<br>
index 8b470c1..21c29fc 100644<br>
--- a/meta/recipes-multimedia/libav/libav.inc<br>
+++ b/meta/recipes-multimedia/libav/libav.inc<br>
@@ -10,6 +10,13 @@ SECTION = "libs"<br>
LICENSE = "GPLv2+"<br>
LICENSE_FLAGS = "commercial"<br>
<br>
+LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \<br>
+ file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \<br>
+ file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \<br>
+ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"<br>
+<br>
+SRC_URI = "<a href="http://libav.org/releases/${BP}.tar.xz" target="_blank">http://libav.org/releases/${BP}.tar.xz</a>"<br>
+<br>
# Provides ffmpeg compat, see <a href="http://libav.org/about.html" target="_blank">http://libav.org/about.html</a><br>
PROVIDES = "ffmpeg"<br>
<br>
@@ -86,6 +93,7 @@ do_install_append() {<br>
}<br>
<br>
PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets"<br>
+PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*"<br>
<br>
RSUGGESTS_${PN} = "mplayer"<br>
FILES_${PN} = "${bindir}"<br>
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<br>
deleted file mode 100644<br>
index d9b22b9..0000000<br>
--- a/meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch<br>
+++ /dev/null<br>
@@ -1,23 +0,0 @@<br>
-From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001<br>
-From: Marcin Juszkiewicz <<a href="mailto:marcin.juszkiewicz@linaro.org">marcin.juszkiewicz@linaro.org</a>><br>
-Date: Thu, 10 Jan 2013 12:42:19 +0100<br>
-Subject: [PATCH] configure: enable pic for AArch64<br>
-<br>
-Signed-off-by: Marcin Juszkiewicz <<a href="mailto:marcin.juszkiewicz@linaro.org">marcin.juszkiewicz@linaro.org</a>><br>
-<br>
-Upstream-Status: Backport<br>
----<br>
- configure | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
---- git.orig/configure<br>
-+++ git/configure<br>
-@@ -2393,7 +2393,7 @@ check_host_cflags -std=c99<br>
- check_host_cflags -Wall<br>
-<br>
- case "$arch" in<br>
-- alpha|ia64|mips|parisc|ppc|sparc)<br>
-+ alpha|ia64|mips|parisc|ppc|sparc|aarch64)<br>
- spic=$shared<br>
- ;;<br>
- x86)<br>
diff --git a/meta/recipes-multimedia/libav/<a href="http://libav_0.8.15.bb" target="_blank">libav_0.8.15.bb</a> b/meta/recipes-multimedia/libav/<a href="http://libav_0.8.15.bb" target="_blank">libav_0.8.15.bb</a><br>
deleted file mode 100644<br>
index 127a088..0000000<br>
--- a/meta/recipes-multimedia/libav/<a href="http://libav_0.8.15.bb" target="_blank">libav_0.8.15.bb</a><br>
+++ /dev/null<br>
@@ -1,20 +0,0 @@<br>
-require libav.inc<br>
-<br>
-SRC_URI = "<a href="http://libav.org/releases/${BP}.tar.xz" target="_blank">http://libav.org/releases/${BP}.tar.xz</a> \<br>
- file://0001-configure-enable-pic-for-AArch64.patch"<br>
-<br>
-SRC_URI[md5sum] = "e483ea8f482b5ecd65ee1d09251b0a5b"<br>
-SRC_URI[sha256sum] = "495789ec547e93632937f0f36b06f4dd3180bc61518181f124af6746c6218710"<br>
-<br>
-LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \<br>
- file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \<br>
- file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \<br>
- file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"<br>
-<br>
-PROVIDES += "libpostproc"<br>
-<br>
-EXTRA_OECONF += " \<br>
- --enable-postproc \<br>
-"<br>
-<br>
-PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*"<br>
diff --git a/meta/recipes-multimedia/libav/<a href="http://libav_9.16.bb" target="_blank">libav_9.16.bb</a> b/meta/recipes-multimedia/libav/<a href="http://libav_9.16.bb" target="_blank">libav_9.16.bb</a><br>
index 8ced2dc..79ff3f8 100644<br>
--- a/meta/recipes-multimedia/libav/<a href="http://libav_9.16.bb" target="_blank">libav_9.16.bb</a><br>
+++ b/meta/recipes-multimedia/libav/<a href="http://libav_9.16.bb" target="_blank">libav_9.16.bb</a><br>
@@ -1,16 +1,4 @@<br>
require libav.inc<br>
<br>
-LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \<br>
- file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \<br>
- file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \<br>
- file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"<br>
-<br>
-SRC_URI = "<a href="http://libav.org/releases/${BP}.tar.xz" target="_blank">http://libav.org/releases/${BP}.tar.xz</a>"<br>
-<br>
SRC_URI[md5sum] = "7b44b75cec24b8e7545e5029e76917e0"<br>
SRC_URI[sha256sum] = "ca846473b0b8ed8e3404c52e5e92df6d35cb5fa487eec498525de3ffda4367a0"<br>
-<br>
-DEFAULT_PREFERENCE = "-1"<br>
-<br>
-# unlike 0.8.11 we don't provide libpostproc<br>
-PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*"<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.1.3<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div></div>