From 65db44ac2930983c554d72ef2f5c7df16886a9a6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 4 Oct 2012 00:27:42 -0300 Subject: libav: Update to 0.8.3 version Signed-off-by: Otavio Salvador Signed-off-by: Koen Kooi --- .../libav/libav-0.7.4/h264_qpel_mmx.patch | 57 ---------------------- meta-oe/recipes-multimedia/libav/libav.inc | 8 +-- meta-oe/recipes-multimedia/libav/libav_0.7.4.bb | 21 -------- meta-oe/recipes-multimedia/libav/libav_0.8.3.bb | 19 ++++++++ 4 files changed, 23 insertions(+), 82 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch delete mode 100644 meta-oe/recipes-multimedia/libav/libav_0.7.4.bb create mode 100644 meta-oe/recipes-multimedia/libav/libav_0.8.3.bb (limited to 'meta-oe/recipes-multimedia') 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 5656c47f48..0000000000 --- a/meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch +++ /dev/null @@ -1,57 +0,0 @@ -Backport http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=5f654897e325349dacf2546674e0510bb72ecb50;hp=250cebeb3b348c3da71f9972eb500d6005dc01f1 - -Fixes these errors on x86 - -libavcodec/x86/h264_qpel_mmx.c: Assembler messages: -libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1 - - -Signed-off-by: Khem Raj -Upstream-status: Backport -Index: b/libavcodec/x86/h264_qpel_mmx.c -=================================================================== ---- a/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700 -+++ b/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700 -@@ -398,7 +398,7 @@ - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ -@@ -446,7 +446,7 @@ - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ - : "memory"\ - );\ - tmp += 4;\ -@@ -823,7 +823,7 @@ - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ -@@ -878,7 +878,7 @@ - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc index 21b57b75c7..aa170c53fc 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" # faac faad2 lame schroedinger libgsm DEPENDS = "virtual/libsdl zlib libogg libvorbis libvpx libtheora ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'liba52', d)}" -INC_PR = "r5" +INC_PR = "r6" inherit autotools pkgconfig @@ -38,8 +38,8 @@ EXTRA_OECONF = " \ --cross-prefix=${TARGET_PREFIX} \ --prefix=${prefix} \ \ - --enable-ffserver \ - --enable-ffplay \ + --enable-avserver \ + --enable-avplay \ --enable-x11grab \ --enable-libtheora \ --enable-libvorbis \ @@ -82,7 +82,7 @@ FILES_${PN}-dev = "${includedir}/${PN}" FILES_${PN}-vhook = "${libdir}/vhook" FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug" -FILES_ffmpeg-x264-presets = "${datadir}/*.ffpreset" +FILES_ffmpeg-x264-presets = "${datadir}/*.avpreset" LEAD_SONAME = "libavcodec.so" diff --git a/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb b/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb deleted file mode 100644 index bf077c6b46..0000000000 --- a/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -require libav.inc - -LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \ - file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ -" - -# When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes -SRCREV = "d4653e882fee5a2876c3878bc23d26799e3380ad" - -PV = "0.7.4" -PR = "${INC_PR}.1" - -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.7 \ - file://h264_qpel_mmx.patch \ -" - -S = "${WORKDIR}/git" - - diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb new file mode 100644 index 0000000000..66a32c9b54 --- /dev/null +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb @@ -0,0 +1,19 @@ +require libav.inc + +LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \ + file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" + +PV = "0.8.3+git${SRCPV}" +PR = "${INC_PR}.0" + +# When bumping SRCREV make sure you bump PR here and in dependant +# recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION +# changes +SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b" +SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8" + +S = "${WORKDIR}/git" + + -- cgit 1.2.3-korg