diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-06-09 00:05:02 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-11 23:55:44 +0100 |
| commit | 186df51c49987b44bfcf21d133ad9fe80f0790bb (patch) | |
| tree | c1f4da70109654aa49bf8030d0ec47d8ebc051d6 | |
| parent | 8f266d053bf6692b8878da1ceab94cec293b16ad (diff) | |
| download | openembedded-core-contrib-186df51c49987b44bfcf21d133ad9fe80f0790bb.tar.gz | |
gstreamer1.0-libav: fix build for i586 with gcc
Backport a patch from debian to fix the build for i586 with gcc, the
patch is similar to libav's
workaround-to-build-libav-for-i586-with-gcc.patch.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch new file mode 100644 index 0000000000..ccadea4d5c --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch @@ -0,0 +1,26 @@ +Description: Workaround to build libav for i586 with gcc 4.9.2 by avoiding memset +Author: Bernhard Übelacker <bernhardu@vr-web.de> + +--- +Bug-Debian: https://bugs.debian.org/783082 +Last-Update: 2015-04-28 + +Upstream-Status: Backport [debian] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +--- gst-libav-1.4.5.orig/gst-libs/ext/libav/libavcodec/h264_cabac.c ++++ gst-libav-1.4.5/gst-libs/ext/libav/libavcodec/h264_cabac.c +@@ -2020,7 +2020,11 @@ decode_intra_mb: + // In deblocking, the quantizer is 0 + h->cur_pic.qscale_table[mb_xy] = 0; + // All coeffs are present +- memset(h->non_zero_count[mb_xy], 16, 48); ++ /*memset(h->non_zero_count[mb_xy], 16, 48);*/ ++ /* avoiding this memset because it leads at least with gcc4.9.2 to error: 'asm' operand has impossible constraints */ ++ for (size_t i = 0; i < 48; i++) { ++ ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16; ++ } + h->cur_pic.mb_type[mb_xy] = mb_type; + h->last_qscale_diff = 0; + return 0; diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb index 11b1cfb08d..97fc7ec3f8 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = " \ http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ + file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ " SRC_URI[md5sum] = "f4922a46adbcbe7bd01331ff5dc7979d" SRC_URI[sha256sum] = "605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc" |