diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-16 14:12:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:36:29 +0000 |
commit | f63f4b52403c9cc0a6354b394e41951cb1591bf2 (patch) | |
tree | 135c686b8f6df3b59b9db558cc6f0921726ebace /meta | |
parent | 58d91fa32cf01a9d6b37a615638ccb2103aafc32 (diff) | |
download | poky-f63f4b52403c9cc0a6354b394e41951cb1591bf2.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
(From OE-Core rev: b142504d4e4e83d030c45e48ea333c387e8f5c88)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/libav/libav.inc | 5 | ||||
-rw-r--r-- | meta/recipes-multimedia/libav/libav_0.8.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/libav/libav_9.16.bb | 3 |
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() { | |||
85 | install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/ | 85 | install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/ |
86 | } | 86 | } |
87 | 87 | ||
88 | FFMPEG_LIBS = "libavcodec libavdevice libavformat \ | ||
89 | libavutil libpostproc libswscale libavfilter" | ||
90 | |||
91 | PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets" | 88 | PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets" |
92 | 89 | ||
93 | RSUGGESTS_${PN} = "mplayer" | 90 | RSUGGESTS_${PN} = "mplayer" |
@@ -140,5 +137,3 @@ python populate_packages_prepend() { | |||
140 | for pkg in pkgs: | 137 | for pkg in pkgs: |
141 | d.appendVar('INSANE_SKIP_%s' % pkg, ' textrel') | 138 | d.appendVar('INSANE_SKIP_%s' % pkg, ' textrel') |
142 | } | 139 | } |
143 | |||
144 | 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" | |||
16 | EXTRA_OECONF += " \ | 16 | EXTRA_OECONF += " \ |
17 | --enable-postproc \ | 17 | --enable-postproc \ |
18 | " | 18 | " |
19 | |||
20 | 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" | |||
11 | SRC_URI[sha256sum] = "ca846473b0b8ed8e3404c52e5e92df6d35cb5fa487eec498525de3ffda4367a0" | 11 | SRC_URI[sha256sum] = "ca846473b0b8ed8e3404c52e5e92df6d35cb5fa487eec498525de3ffda4367a0" |
12 | 12 | ||
13 | DEFAULT_PREFERENCE = "-1" | 13 | DEFAULT_PREFERENCE = "-1" |
14 | |||
15 | # unlike 0.8.11 we don't provide libpostproc | ||
16 | PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*" | ||