mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-25 15:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer1.0-libav: update git recipe to 1.7.1

Browse Source 
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

(From OE-Core rev: ee0281c6c0ed92ba3eb69f55a1550b3c60d7981a)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy
2016-01-19 10:33:10 -08:00
committed by Richard Purdie
parent 90cbdfb7a1
commit f0e500e8a0
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
View File

@@ -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"

4
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb
View File

@@ -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"

24
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
View File

@@ -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
}