summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb24
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}"
30FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" 30FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
31FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" 31FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
32FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" 32FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
33
34# http://errors.yoctoproject.org/Errors/Details/20493/
35ARM_INSTRUCTION_SET_armv4 = "arm"
36ARM_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 \
24 --ranlib='${RANLIB}' \ 24 --ranlib='${RANLIB}' \
25 ${GSTREAMER_1_0_DEBUG} \ 25 ${GSTREAMER_1_0_DEBUG} \
26 --cross-prefix='${HOST_PREFIX}'" 26 --cross-prefix='${HOST_PREFIX}'"
27
28# http://errors.yoctoproject.org/Errors/Details/20493/
29ARM_INSTRUCTION_SET_armv4 = "arm"
30ARM_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
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
6 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ 6 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
7 file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ 7 file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
8 file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \ 8 file://gst-libs/ext/libav/LICENSE.md;md5=5c6d1ed56d15ca87ddec48d0c3a2051d \
9 file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ 11 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
12 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" 12 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
13 13
14SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-libav;branch=master" 14# To build using the system libav/ffmpeg, append "libav" to PACKAGECONFIG
15# and remove the ffmpeg sources from SRC_URI below. However, first note the
16# warnings in gstreamer1.0-libav.inc
17SRC_URI = " \
18 git://anongit.freedesktop.org/gstreamer/gst-libav;name=base \
19 git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
20 git://source.ffmpeg.org/ffmpeg;destsuffix=git/gst-libs/ext/libav;name=ffmpeg;branch=release/2.8 \
21 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
22 file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \
23"
15 24
16SRCREV = "127202d6f65584891dabf92be031f0d170b0e7f1" 25PV = "1.7.1+git${SRCPV}"
26
27SRCREV_base = "0993ec8fa5cf6b09e33741f268c938719a1534d5"
28SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65"
29SRCREV_ffmpeg = "644179e0d4155ae8f5ddd5c3f6bd003e2e13cf94"
30SRCREV_FORMAT = "base"
17 31
18S = "${WORKDIR}/git" 32S = "${WORKDIR}/git"
19 33
@@ -23,7 +37,5 @@ LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
23 --cross-prefix='${HOST_PREFIX}'" 37 --cross-prefix='${HOST_PREFIX}'"
24 38
25do_configure_prepend() { 39do_configure_prepend() {
26 cd ${S} 40 ${S}/autogen.sh --noconfigure
27 ./autogen.sh --noconfigure
28 cd ${B}
29} 41}