diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2016-01-19 10:33:10 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:44 +0000 |
| commit | ee0281c6c0ed92ba3eb69f55a1550b3c60d7981a (patch) | |
| tree | 7109fb76e09afdf67951e8f0f78fd4cf06397e53 /meta/recipes-multimedia/gstreamer | |
| parent | e846ce64283a6da9dc9c7b4b31c9d8fd6e842066 (diff) | |
| download | openembedded-core-contrib-ee0281c6c0ed92ba3eb69f55a1550b3c60d7981a.tar.gz | |
gstreamer1.0-libav: update git recipe to 1.7.1
Move the ARM_INSTRUCTION_SET over-rides for armv4/armv5 out of the
1.6.3 recipe and into the common include, so that they also apply to
the git recipe.
The autogen.sh script takes care of cd'ing to the correct directory
before it does anything, so we don't need to cd on its behalf any more
in do_configure_prepend().
http://cgit.freedesktop.org/gstreamer/gst-libav/tree/autogen.sh?id=1.7.1
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
3 files changed, 22 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc index c3c7d5bc06..c90af66c3f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc @@ -30,3 +30,7 @@ EXTRA_OECONF = "${LIBAV_EXTRA_CONFIGURE_COMMON}" FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" + +# http://errors.yoctoproject.org/Errors/Details/20493/ +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb index 34399814d3..ba7ac7f3a7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb @@ -24,7 +24,3 @@ LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ --ranlib='${RANLIB}' \ ${GSTREAMER_1_0_DEBUG} \ --cross-prefix='${HOST_PREFIX}'" - -# http://errors.yoctoproject.org/Errors/Details/20493/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb index 32f4814f62..0937be27df 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb @@ -5,15 +5,29 @@ include gstreamer1.0-libav.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ - file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \ + file://gst-libs/ext/libav/LICENSE.md;md5=5c6d1ed56d15ca87ddec48d0c3a2051d \ file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-libav;branch=master" +# To build using the system libav/ffmpeg, append "libav" to PACKAGECONFIG +# and remove the ffmpeg sources from SRC_URI below. However, first note the +# warnings in gstreamer1.0-libav.inc +SRC_URI = " \ + git://anongit.freedesktop.org/gstreamer/gst-libav;name=base \ + git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \ + git://source.ffmpeg.org/ffmpeg;destsuffix=git/gst-libs/ext/libav;name=ffmpeg;branch=release/2.8 \ + file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ + file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ +" -SRCREV = "127202d6f65584891dabf92be031f0d170b0e7f1" +PV = "1.7.1+git${SRCPV}" + +SRCREV_base = "0993ec8fa5cf6b09e33741f268c938719a1534d5" +SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65" +SRCREV_ffmpeg = "644179e0d4155ae8f5ddd5c3f6bd003e2e13cf94" +SRCREV_FORMAT = "base" S = "${WORKDIR}/git" @@ -23,7 +37,5 @@ LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ --cross-prefix='${HOST_PREFIX}'" do_configure_prepend() { - cd ${S} - ./autogen.sh --noconfigure - cd ${B} + ${S}/autogen.sh --noconfigure } |