[OE-core] [PATCHv2 3/4] libav: drop older 0.8.11 and use libav-9 by default

Thu Dec 18 16:29:55 UTC 2014

Hi Martin,

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.

Ross

On 10 December 2014 at 14:17, Martin Jansa <martin.jansa at gmail.com> wrote:
>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  .../gstreamer/gst-ffmpeg_0.10.13.bb                |  3 +--
>  meta/recipes-multimedia/libav/libav.inc            |  8 ++++++++
>  .../0001-configure-enable-pic-for-AArch64.patch    | 23
> ----------------------
>  meta/recipes-multimedia/libav/libav_0.8.15.bb      | 20
> -------------------
>  meta/recipes-multimedia/libav/libav_9.16.bb        | 12 -----------
>  5 files changed, 9 insertions(+), 57 deletions(-)
>  delete mode 100644
> meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch
>  delete mode 100644 meta/recipes-multimedia/libav/libav_0.8.15.bb
>
> 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 7304fff..219feaa 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 \
>
> file://0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch \
>             file://0001-avcodec-smc-fix-off-by-1-error.patch \
>
> file://0002-avcodec-mjpegdec-check-bits-per-pixel-for-changes-si.patch \
> -           ${@bb.utils.contains('PACKAGECONFIG', 'libav9',
> 'file://libav-9.patch', '', d)} \
> +           file://libav-9.patch \
>  "
>
>  SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"
> @@ -84,7 +84,6 @@ EXTRA_OECONF = "${FFMPEG_EXTRA_CONFIGURE_COMMON}"
>  PACKAGECONFIG ??= "external-libav"
>  PACKAGECONFIG[external-libav] = "--with-system-ffmpeg,,libav"
>  PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
> -PACKAGECONFIG[libav9] = ",,,"
>
>  FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
>  FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
> diff --git a/meta/recipes-multimedia/libav/libav.inc
> b/meta/recipes-multimedia/libav/libav.inc
> index 8b470c1..21c29fc 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 d9b22b9..0000000
> ---
> 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 at 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 at 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 127a088..0000000
> --- 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 8ced2dc..79ff3f8 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).*"
> --
> 2.1.3
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20141218/912ba3ba/attachment-0002.html>