diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-10-04 00:27:42 -0300 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-10-05 11:27:00 +0200 |
commit | 65db44ac2930983c554d72ef2f5c7df16886a9a6 (patch) | |
tree | 07baef6960aabaedeee0310b643058fe19774a53 /meta-oe/recipes-multimedia | |
parent | 84441954d0f2f2de2b12192d53b27755d5609572 (diff) | |
download | meta-openembedded-65db44ac2930983c554d72ef2f5c7df16886a9a6.tar.gz |
libav: Update to 0.8.3 version
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r-- | meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch | 57 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/libav/libav.inc | 8 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/libav/libav_0.8.3.bb (renamed from meta-oe/recipes-multimedia/libav/libav_0.7.4.bb) | 18 |
3 files changed, 12 insertions, 71 deletions
diff --git a/meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch b/meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch deleted file mode 100644 index 5656c47f4..000000000 --- a/meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | Backport http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=5f654897e325349dacf2546674e0510bb72ecb50;hp=250cebeb3b348c3da71f9972eb500d6005dc01f1 | ||
2 | |||
3 | Fixes these errors on x86 | ||
4 | |||
5 | libavcodec/x86/h264_qpel_mmx.c: Assembler messages: | ||
6 | libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' | ||
7 | libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' | ||
8 | libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' | ||
9 | libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' | ||
10 | libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' | ||
11 | libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' | ||
12 | libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' | ||
13 | make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1 | ||
14 | |||
15 | |||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | Upstream-status: Backport | ||
18 | Index: b/libavcodec/x86/h264_qpel_mmx.c | ||
19 | =================================================================== | ||
20 | --- a/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700 | ||
21 | +++ b/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700 | ||
22 | @@ -398,7 +398,7 @@ | ||
23 | "2: \n\t"\ | ||
24 | \ | ||
25 | : "+a"(src), "+c"(dst)\ | ||
26 | - : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ | ||
27 | + : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ | ||
28 | : "memory"\ | ||
29 | );\ | ||
30 | src += 4-(h+5)*srcStride;\ | ||
31 | @@ -446,7 +446,7 @@ | ||
32 | QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ | ||
33 | "2: \n\t"\ | ||
34 | : "+a"(src)\ | ||
35 | - : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ | ||
36 | + : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ | ||
37 | : "memory"\ | ||
38 | );\ | ||
39 | tmp += 4;\ | ||
40 | @@ -823,7 +823,7 @@ | ||
41 | "2: \n\t"\ | ||
42 | \ | ||
43 | : "+a"(src), "+c"(dst)\ | ||
44 | - : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ | ||
45 | + : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ | ||
46 | : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ | ||
47 | "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ | ||
48 | "memory"\ | ||
49 | @@ -878,7 +878,7 @@ | ||
50 | QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) | ||
51 | "2: \n\t" | ||
52 | : "+a"(src) | ||
53 | - : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) | ||
54 | + : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) | ||
55 | : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", | ||
56 | "%xmm4", "%xmm5", "%xmm6", "%xmm7",) | ||
57 | "memory" | ||
diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc index 21b57b75c..aa170c53f 100644 --- a/meta-oe/recipes-multimedia/libav/libav.inc +++ b/meta-oe/recipes-multimedia/libav/libav.inc | |||
@@ -11,7 +11,7 @@ ARM_INSTRUCTION_SET = "arm" | |||
11 | # faac faad2 lame schroedinger libgsm | 11 | # faac faad2 lame schroedinger libgsm |
12 | DEPENDS = "virtual/libsdl zlib libogg libvorbis libvpx libtheora ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'liba52', d)}" | 12 | DEPENDS = "virtual/libsdl zlib libogg libvorbis libvpx libtheora ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'liba52', d)}" |
13 | 13 | ||
14 | INC_PR = "r5" | 14 | INC_PR = "r6" |
15 | 15 | ||
16 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig |
17 | 17 | ||
@@ -38,8 +38,8 @@ EXTRA_OECONF = " \ | |||
38 | --cross-prefix=${TARGET_PREFIX} \ | 38 | --cross-prefix=${TARGET_PREFIX} \ |
39 | --prefix=${prefix} \ | 39 | --prefix=${prefix} \ |
40 | \ | 40 | \ |
41 | --enable-ffserver \ | 41 | --enable-avserver \ |
42 | --enable-ffplay \ | 42 | --enable-avplay \ |
43 | --enable-x11grab \ | 43 | --enable-x11grab \ |
44 | --enable-libtheora \ | 44 | --enable-libtheora \ |
45 | --enable-libvorbis \ | 45 | --enable-libvorbis \ |
@@ -82,7 +82,7 @@ FILES_${PN}-dev = "${includedir}/${PN}" | |||
82 | FILES_${PN}-vhook = "${libdir}/vhook" | 82 | FILES_${PN}-vhook = "${libdir}/vhook" |
83 | FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug" | 83 | FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug" |
84 | 84 | ||
85 | FILES_ffmpeg-x264-presets = "${datadir}/*.ffpreset" | 85 | FILES_ffmpeg-x264-presets = "${datadir}/*.avpreset" |
86 | 86 | ||
87 | LEAD_SONAME = "libavcodec.so" | 87 | LEAD_SONAME = "libavcodec.so" |
88 | 88 | ||
diff --git a/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb index bf077c6b4..66a32c9b5 100644 --- a/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb | |||
@@ -3,18 +3,16 @@ require libav.inc | |||
3 | LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 3 | LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
4 | file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ | 4 | file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ |
5 | file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \ | 5 | file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \ |
6 | file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 6 | file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" |
7 | " | ||
8 | 7 | ||
9 | # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes | 8 | PV = "0.8.3+git${SRCPV}" |
10 | SRCREV = "d4653e882fee5a2876c3878bc23d26799e3380ad" | 9 | PR = "${INC_PR}.0" |
11 | 10 | ||
12 | PV = "0.7.4" | 11 | # When bumping SRCREV make sure you bump PR here and in dependant |
13 | PR = "${INC_PR}.1" | 12 | # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION |
14 | 13 | # changes | |
15 | SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.7 \ | 14 | SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b" |
16 | file://h264_qpel_mmx.patch \ | 15 | SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8" |
17 | " | ||
18 | 16 | ||
19 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
20 | 18 | ||