diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2016-01-18 17:32:02 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-24 09:40:23 +0000 |
commit | 69bcd338d6cb295e0dffaafac005190b6a184ce7 (patch) | |
tree | 55fcee8c5ee7a01bb40a3039bf7770580354538c | |
parent | 1d6e61a85688a06edaa54a1c7f81da22896a47ba (diff) | |
download | poky-69bcd338d6cb295e0dffaafac005190b6a184ce7.tar.gz |
gstreamer1.0-libav: minor formatting improvements + update HOMEPAGE
(From OE-Core rev: a38b5c3ae8cce8870aa7276feaeefdd52dbcda8c)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 13 insertions, 11 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc index 3948b401c5..c3c7d5bc06 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc | |||
@@ -1,8 +1,10 @@ | |||
1 | SUMMARY = "Libav-based GStreamer 1.x plugin" | 1 | SUMMARY = "Libav-based GStreamer 1.x plugin" |
2 | HOMEPAGE = "http://gstreamer.freedesktop.org/" | ||
2 | SECTION = "multimedia" | 3 | SECTION = "multimedia" |
4 | |||
3 | LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )" | 5 | LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )" |
4 | LICENSE_FLAGS = "commercial" | 6 | LICENSE_FLAGS = "commercial" |
5 | HOMEPAGE = "http://www.gstreamer.net/" | 7 | |
6 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz" | 8 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz" |
7 | 9 | ||
8 | inherit autotools pkgconfig upstream-version-is-even | 10 | inherit autotools pkgconfig upstream-version-is-even |
@@ -10,12 +12,12 @@ inherit autotools pkgconfig upstream-version-is-even | |||
10 | # CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time, | 12 | # CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time, |
11 | # compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the | 13 | # compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the |
12 | # libav copy included in the gst-libav package. | 14 | # libav copy included in the gst-libav package. |
13 | PACKAGECONFIG ??= " orc yasm " | 15 | PACKAGECONFIG ??= "orc yasm" |
14 | PACKAGECONFIG[libav] = "--with-system-libav,,libav" | ||
15 | PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl," | ||
16 | PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native" | ||
17 | PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" | ||
18 | 16 | ||
17 | PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl," | ||
18 | PACKAGECONFIG[libav] = "--with-system-libav,,libav" | ||
19 | PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" | ||
20 | PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native" | ||
19 | 21 | ||
20 | GSTREAMER_1_0_DEBUG ?= "--disable-debug" | 22 | GSTREAMER_1_0_DEBUG ?= "--disable-debug" |
21 | 23 | ||
@@ -28,4 +30,3 @@ EXTRA_OECONF = "${LIBAV_EXTRA_CONFIGURE_COMMON}" | |||
28 | FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" | 30 | FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" |
29 | FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" | 31 | FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" |
30 | FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" | 32 | FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" |
31 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.2.bb index 1091b841a7..77e0655dac 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.2.bb | |||
@@ -13,17 +13,18 @@ SRC_URI = " \ | |||
13 | file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ | 13 | file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ |
14 | file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ | 14 | file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ |
15 | " | 15 | " |
16 | |||
16 | SRC_URI[md5sum] = "09644a38827d233f53edeac815dd0ec0" | 17 | SRC_URI[md5sum] = "09644a38827d233f53edeac815dd0ec0" |
17 | SRC_URI[sha256sum] = "2597acc00171006d49f0d300440a87df51b113d557466e532153abc740db3469" | 18 | SRC_URI[sha256sum] = "2597acc00171006d49f0d300440a87df51b113d557466e532153abc740db3469" |
18 | 19 | ||
20 | S = "${WORKDIR}/gst-libav-${PV}" | ||
21 | |||
19 | LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ | 22 | LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ |
20 | --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ | 23 | --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ |
21 | --ranlib='${RANLIB}' \ | 24 | --ranlib='${RANLIB}' \ |
22 | ${GSTREAMER_1_0_DEBUG} \ | 25 | ${GSTREAMER_1_0_DEBUG} \ |
23 | --cross-prefix='${HOST_PREFIX}'" | 26 | --cross-prefix='${HOST_PREFIX}'" |
24 | 27 | ||
25 | S = "${WORKDIR}/gst-libav-${PV}" | ||
26 | |||
27 | # http://errors.yoctoproject.org/Errors/Details/20493/ | 28 | # http://errors.yoctoproject.org/Errors/Details/20493/ |
28 | ARM_INSTRUCTION_SET_armv4 = "arm" | 29 | ARM_INSTRUCTION_SET_armv4 = "arm" |
29 | ARM_INSTRUCTION_SET_armv5 = "arm" | 30 | 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 bf1b87e6de..32f4814f62 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb | |||
@@ -12,10 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
12 | file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" | 12 | file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" |
13 | 13 | ||
14 | SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-libav;branch=master" | 14 | SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-libav;branch=master" |
15 | S = "${WORKDIR}/git" | ||
16 | 15 | ||
17 | SRCREV = "127202d6f65584891dabf92be031f0d170b0e7f1" | 16 | SRCREV = "127202d6f65584891dabf92be031f0d170b0e7f1" |
18 | 17 | ||
18 | S = "${WORKDIR}/git" | ||
19 | |||
19 | LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ | 20 | LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ |
20 | --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ | 21 | --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ |
21 | ${GSTREAMER_1_0_DEBUG} \ | 22 | ${GSTREAMER_1_0_DEBUG} \ |
@@ -26,4 +27,3 @@ do_configure_prepend() { | |||
26 | ./autogen.sh --noconfigure | 27 | ./autogen.sh --noconfigure |
27 | cd ${B} | 28 | cd ${B} |
28 | } | 29 | } |
29 | |||