aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-07-16 14:12:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:35:26 +0000
commitb142504d4e4e83d030c45e48ea333c387e8f5c88 (patch)
treef3396c2510592e3472f9c9729923d33c1a0f468f
parent1cf0245344ce272e7330cfe1b04a0ed7bd18e8f5 (diff)
downloadopenembedded-core-contrib-b142504d4e4e83d030c45e48ea333c387e8f5c88.tar.gz
libav: drop unused FFMPEG_LIBS and move libpostproc only to 0.8.11
* standalone libpostproc recipe depends on libav, but current PACKAGES_DYNAMIC indicated that libav-9.13 also provides libpostproc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/recipes-multimedia/libav/libav.inc5
-rw-r--r--meta/recipes-multimedia/libav/libav_0.8.15.bb2
-rw-r--r--meta/recipes-multimedia/libav/libav_9.16.bb3
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
index 5c327df386..8b470c1b8d 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -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).*"
diff --git a/meta/recipes-multimedia/libav/libav_0.8.15.bb b/meta/recipes-multimedia/libav/libav_0.8.15.bb
index 18dc49a12e..127a08815d 100644
--- a/meta/recipes-multimedia/libav/libav_0.8.15.bb
+++ b/meta/recipes-multimedia/libav/libav_0.8.15.bb
@@ -16,3 +16,5 @@ 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 d0468859a9..8ced2dca8a 100644
--- a/meta/recipes-multimedia/libav/libav_9.16.bb
+++ b/meta/recipes-multimedia/libav/libav_9.16.bb
@@ -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).*"