diff options
author | Shane Wang <shane.wang@intel.com> | 2011-12-23 00:25:19 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 12:14:21 +0000 |
commit | 9fd65874fe5b921f26affa02d8b8fdbf4959774f (patch) | |
tree | e797c4ebf693a13758f04a708feaebb86374983f /meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch | |
parent | c57aec1647c961c7fbe6a7d8394417b2e731dc1a (diff) | |
download | poky-9fd65874fe5b921f26affa02d8b8fdbf4959774f.tar.gz |
gst-ffmpeg: upgrade to 0.10.13
This patch is to upgrade gst-ffmpeg to 0.10.13.
Some license files are changed because the folder "ffmpeg" disappears, and those license files under "libav" are the same. LICENSE is different because the word "ffmpeg" is changed into "libav" under the libav folder.
Again, gst-ffmpeg tar ball contains library libav itself. So the configure needs to disable yasm for x86.
(From OE-Core rev: 5c86f5506a060e2005fcdad0b46ca650598a94af)
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch new file mode 100644 index 0000000000..81029ca6e1 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Disable yasm for libav when --disable-yasm | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
6 | |||
7 | diff -r f2f8f74c6e30 configure.ac | ||
8 | --- a/configure.ac Thu Dec 22 23:56:09 2011 +0800 | ||
9 | +++ b/configure.ac Thu Dec 22 23:57:37 2011 +0800 | ||
10 | @@ -325,6 +325,10 @@ | ||
11 | --enable-gpl" | ||
12 | fi | ||
13 | |||
14 | + if test "x$disable_yasm" != "xyes"; then | ||
15 | + embffmpeg_configure_args="$embffmpeg_configure_args --disable-yasm" | ||
16 | + fi | ||
17 | + | ||
18 | # if we are cross-compiling, tell ffmpeg so | ||
19 | target_os=`echo $host_os | sed 's/-gnu//'` | ||
20 | if test "x$cross_compiling" = xyes; then | ||