libav-9
v4 cover libav-9
Changes since v3:
added LICENSE_FLAGS to libpostproc as requested by Ross.
The following changes since commit 0bcc01121e928d0be7a0550e500425852c63cf98:
arch-mips.inc: Add the MIPS ABIEXTENSION to toolchain name (2015-01-21 14:28:43 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/libav
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/libav
Martin Jansa (4):
gst-ffmpeg: add dependency on libpostproc
libav: drop unused FFMPEG_LIBS and move libpostproc only to 0.8.11
libav: drop older 0.8.* and use libav-9 by default
libpostproc: import from meta-oe
.../gstreamer/gst-ffmpeg_0.10.13.bb | 5 +-- meta/recipes-multimedia/libav/libav.inc | 13 +++--- .../0001-configure-enable-pic-for-AArch64.patch | 23 ----------- meta/recipes-multimedia/libav/libav_0.8.15.bb | 18 --------- meta/recipes-multimedia/libav/libav_9.16.bb | 9 ----- meta/recipes-multimedia/libav/libpostproc_git.bb | 46 ++++++++++++++++++++++ 6 files changed, 56 insertions(+), 58 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 create mode 100644 meta/recipes-multimedia/libav/libpostproc_git.bb
Signature · 1 line
2.2.1
PATCH v4 1/4 gst-ffmpeg: add dependency on libpostproc
* building with libav-9 fails with:
| checking for POSTPROC... configure: error: Package requirements (libpostproc libavcodec libavutil) were not met: | | No package 'libpostproc' found
--- meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb +1 -1
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" LICENSE_FLAGS = "commercial" HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "gstreamer gst-plugins-base zlib bzip2 yasm-native" +DEPENDS = "gstreamer gst-plugins-base zlib bzip2 yasm-native libpostproc" inherit autotools pkgconfig
Signature · 1 line
2.2.1
PATCH v4 2/4 libav: drop unused FFMPEG_LIBS and move libpostproc only to 0.8.11
In reply to Martin Jansa* standalone libpostproc recipe depends on libav, but current PACKAGES_DYNAMIC indicated that libav-9.13 also provides libpostproc
--- meta/recipes-multimedia/libav/libav.inc | 5 ----- meta/recipes-multimedia/libav/libav_0.8.15.bb | 2 ++ meta/recipes-multimedia/libav/libav_9.16.bb | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-multimedia/libav/libav.inc +0 -5
@@ -85,9 +85,6 @@ do_install_append() { install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/ } -FFMPEG_LIBS = "libavcodec libavdevice libavformat \ - libavutil libpostproc libswscale libavfilter" - PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets" RSUGGESTS_${PN} = "mplayer"
@@ -140,5 +137,3 @@ python populate_packages_prepend() { for pkg in pkgs: d.appendVar('INSANE_SKIP_%s' % pkg, ' textrel') } - -PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*"
meta/recipes-multimedia/libav/libav_0.8.15.bb +2 -0
@@ -16,3 +16,5 @@ PROVIDES += "libpostproc" EXTRA_OECONF += " \ --enable-postproc \ " + +PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*"
meta/recipes-multimedia/libav/libav_9.16.bb +3 -0
@@ -11,3 +11,6 @@ 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).*"
Signature · 1 line
2.2.1
PATCH v4 3/4 libav: drop older 0.8.* and use libav-9 by default
In reply to Martin Jansa--- .../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
meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb +1 -2
@@ -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"
meta/recipes-multimedia/libav/libav.inc +8 -0
@@ -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}"
meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch deleted +0 -23
@@ -1,23 +0,0 @@ -From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001 -From: Marcin Juszkiewicz <[email protected]> -Date: Thu, 10 Jan 2013 12:42:19 +0100 -Subject: [PATCH] configure: enable pic for AArch64 - -Signed-off-by: Marcin Juszkiewicz <[email protected]> - -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)
meta/recipes-multimedia/libav/libav_0.8.15.bb deleted +0 -20
@@ -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).*"
meta/recipes-multimedia/libav/libav_9.16.bb +0 -12
@@ -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).*"
Signature · 1 line
2.2.1
PATCH v4 4/4 libpostproc: import from meta-oe
In reply to Martin Jansa--- meta/recipes-multimedia/libav/libpostproc_git.bb | 46 ++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 meta/recipes-multimedia/libav/libpostproc_git.bb
meta/recipes-multimedia/libav/libpostproc_git.bb new file +46 -0
@@ -0,0 +1,46 @@ +SUMMARY = "FFmpeg derived postprocessing library" +HOMEPAGE = "http://git.videolan.org/?p=libpostproc.git;a=summary" +SECTION = "libs" +DEPENDS = "libav" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +# because it depends on libav which has commercial flag +LICENSE_FLAGS = "commercial" + +PV = "52.3.0+git${SRCPV}" + +SRCREV = "811db3b957dfde24aef2d0f82e297e5bf552d873" +SRC_URI = "git://github.com/lu-zero/postproc;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools lib_package pkgconfig + +FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" +BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" + +EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" +EXTRA_FFCONF ?= "" + +EXTRA_OECONF = " \ + --enable-shared \ + --enable-pthreads \ + --enable-gpl \ + --enable-postproc \ + \ + --cross-prefix=${TARGET_PREFIX} \ + --prefix=${prefix} \ + \ + --arch=${TARGET_ARCH} \ + --target-os="linux" \ + --enable-cross-compile \ + --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-ldflags="${TARGET_LDFLAGS}" \ + --sysroot="${STAGING_DIR_TARGET}" \ + ${EXTRA_FFCONF} \ +" + +do_configure() { + ${S}/configure ${EXTRA_OECONF} +}
Signature · 1 line
2.2.1