diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-04-06 11:19:12 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-06 22:57:25 +0100 |
commit | 3d56864fd3ea190a2fa203bba37aa4125919e676 (patch) | |
tree | 596b6682f376ffdf4874ab629e9c11b5c580ccf1 /meta/recipes-multimedia | |
parent | 8cc10a90c42f9e6c43aeef429029e2af997bf892 (diff) | |
download | poky-3d56864fd3ea190a2fa203bba37aa4125919e676.tar.gz |
ffmpeg, gstreamer1.0-libav: add textrel INSANE_SKIPs
ffmpeg disables PIC on some platforms even when --enable-pic is
set, apparently for performance reasons. Add INSANE_SKIPS for the
relevant packages.
Fixes [YOCTO #9375].
(From OE-Core rev: 4438a1125bb15ed19c78833f4d8a5b108cd91d30)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb | 11 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb index 0296ada0aa..1dfbb9b04c 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb | |||
@@ -94,6 +94,17 @@ do_configure() { | |||
94 | 94 | ||
95 | PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util|resample)|swscale|swresample|postproc).*" | 95 | PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util|resample)|swscale|swresample|postproc).*" |
96 | 96 | ||
97 | # ffmpeg disables PIC on some platforms (e.g. x86-32) | ||
98 | INSANE_SKIP_${MLPREFIX}libavcodec = "textrel" | ||
99 | INSANE_SKIP_${MLPREFIX}libavdevice = "textrel" | ||
100 | INSANE_SKIP_${MLPREFIX}libavfilter = "textrel" | ||
101 | INSANE_SKIP_${MLPREFIX}libavformat = "textrel" | ||
102 | INSANE_SKIP_${MLPREFIX}libavutil = "textrel" | ||
103 | INSANE_SKIP_${MLPREFIX}libavresample = "textrel" | ||
104 | INSANE_SKIP_${MLPREFIX}libswscale = "textrel" | ||
105 | INSANE_SKIP_${MLPREFIX}libswresample = "textrel" | ||
106 | INSANE_SKIP_${MLPREFIX}libpostproc = "textrel" | ||
107 | |||
97 | python populate_packages_prepend() { | 108 | python populate_packages_prepend() { |
98 | av_libdir = d.expand('${libdir}') | 109 | av_libdir = d.expand('${libdir}') |
99 | av_pkgconfig = d.expand('${libdir}/pkgconfig') | 110 | av_pkgconfig = d.expand('${libdir}/pkgconfig') |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc index 598a349e02..363101e1a4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc | |||
@@ -41,3 +41,6 @@ FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" | |||
41 | # http://errors.yoctoproject.org/Errors/Details/20493/ | 41 | # http://errors.yoctoproject.org/Errors/Details/20493/ |
42 | ARM_INSTRUCTION_SET_armv4 = "arm" | 42 | ARM_INSTRUCTION_SET_armv4 = "arm" |
43 | ARM_INSTRUCTION_SET_armv5 = "arm" | 43 | ARM_INSTRUCTION_SET_armv5 = "arm" |
44 | |||
45 | # ffmpeg/libav disables PIC on some platforms (e.g. x86-32) | ||
46 | INSANE_SKIP_${PN} = "textrel" | ||