summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2011-12-23 00:25:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:21 +0000
commit9fd65874fe5b921f26affa02d8b8fdbf4959774f (patch)
treee797c4ebf693a13758f04a708feaebb86374983f /meta
parentc57aec1647c961c7fbe6a7d8394417b2e731dc1a (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch20
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/lower-rank.diff (renamed from meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff)0
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb (renamed from meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb)19
3 files changed, 32 insertions, 7 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 @@
1Disable yasm for libav when --disable-yasm
2
3Upstream-Status: Inappropriate [configuration]
4
5Signed-off-by: Shane Wang <shane.wang@intel.com>
6
7diff -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
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/lower-rank.diff
index 5f08afe59a..5f08afe59a 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/lower-rank.diff
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
index c3512e1aed..a1b7cbbe53 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
5 file://ext/libpostproc/gstpostproc.c;beginline=1;endline=18;md5=5896e445e41681324381f5869ee33d38 \ 5 file://ext/libpostproc/gstpostproc.c;beginline=1;endline=18;md5=5896e445e41681324381f5869ee33d38 \
6 file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ 6 file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
7 file://ext/ffmpeg/gstffmpeg.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9 \ 7 file://ext/ffmpeg/gstffmpeg.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9 \
8 file://gst-libs/ext/ffmpeg/LICENSE;md5=524b5ee4bdbbf755ebbb76727ba80b0d \ 8 file://gst-libs/ext/libav/LICENSE;md5=abc3b8cb02856aa7823bbbd162d16232 \
9 file://gst-libs/ext/ffmpeg/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://gst-libs/ext/ffmpeg/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://gst-libs/ext/ffmpeg/COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \ 11 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
12 file://gst-libs/ext/ffmpeg/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" 12 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
13HOMEPAGE = "http://www.gstreamer.net/" 13HOMEPAGE = "http://www.gstreamer.net/"
14DEPENDS = "gstreamer gst-plugins-base zlib" 14DEPENDS = "gstreamer gst-plugins-base zlib"
15 15
@@ -17,15 +17,20 @@ inherit autotools pkgconfig
17 17
18SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ 18SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
19 file://lower-rank.diff \ 19 file://lower-rank.diff \
20 file://configure-fix.patch \
20" 21"
21 22
22SRC_URI[md5sum] = "0d23197ba7ac06ea34fa66d38469ebe5" 23SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"
23SRC_URI[sha256sum] = "ff36a138e5af4ed8dcc459d6d6521fe66ed31ec29ba9a924dc3675c6749a692e" 24SRC_URI[sha256sum] = "76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62"
24 25
25PR = "r0" 26PR = "r0"
26 27
27EXTRA_OECONF = "--with-ffmpeg-extra-configure=\"--target-os=linux\" " 28EXTRA_OECONF = "--with-ffmpeg-extra-configure=\"--target-os=linux\" "
28 29
30# yasm not found, use --disable-yasm for a crippled build for libav
31EXTRA_OECONF_append_x86-64 = " --disable-yasm "
32EXTRA_OECONF_append_x86 = " --disable-yasm "
33
29FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" 34FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
30FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" 35FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
31FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" 36FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"