diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2016-01-18 17:00:27 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-24 09:40:23 +0000 |
commit | 981145ad8be8d58c3ed1efafcdceb6af0683ab19 (patch) | |
tree | e4369c1a5c714f357276e297104d732ed8687fe5 /meta/recipes-multimedia/gstreamer | |
parent | 9f1a9432fd9cdf12cdb0da53e4b7cec06aebe6f4 (diff) | |
download | poky-981145ad8be8d58c3ed1efafcdceb6af0683ab19.tar.gz |
gstreamer1.0: minor formatting improvements
(From OE-Core rev: 642fb180472d7f43fa5f73a4d5950e524d576513)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 29 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb | 4 |
3 files changed, 19 insertions, 16 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc index c10f66f668..a08e226bc5 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | |||
@@ -5,27 +5,30 @@ HOMEPAGE = "http://gstreamer.freedesktop.org/" | |||
5 | BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" | 5 | BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" |
6 | SECTION = "multimedia" | 6 | SECTION = "multimedia" |
7 | LICENSE = "LGPLv2+" | 7 | LICENSE = "LGPLv2+" |
8 | DEPENDS = "glib-2.0 libxml2 bison-native flex-native libcap" | 8 | |
9 | DEPENDS = "glib-2.0 libcap libxml2 bison-native flex-native" | ||
9 | 10 | ||
10 | inherit autotools pkgconfig gettext upstream-version-is-even | 11 | inherit autotools pkgconfig gettext upstream-version-is-even |
11 | 12 | ||
12 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" | ||
13 | PACKAGECONFIG[check] = "--enable-check,--disable-check" | 13 | PACKAGECONFIG[check] = "--enable-check,--disable-check" |
14 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" | ||
14 | PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" | 15 | PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" |
15 | PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," | 16 | PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," |
16 | 17 | ||
17 | EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \ | 18 | EXTRA_OECONF = " \ |
18 | --disable-dependency-tracking \ | 19 | --disable-dependency-tracking \ |
19 | --disable-examples \ | 20 | --disable-docbook \ |
20 | " | 21 | --disable-examples \ |
21 | 22 | --disable-gtk-doc \ | |
22 | RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" | 23 | " |
23 | RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" | ||
24 | 24 | ||
25 | CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" | 25 | CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" |
26 | 26 | ||
27 | FILES_${PN} += " ${libdir}/gstreamer-1.0/*.so" | 27 | PACKAGES += "${PN}-bash-completion" |
28 | FILES_${PN}-dev += " ${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" | 28 | |
29 | FILES_${PN}-bash-completion += " ${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" | 29 | FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" |
30 | FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" | ||
31 | FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" | ||
30 | 32 | ||
31 | PACKAGES += " ${PN}-bash-completion" | 33 | RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" |
34 | RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb index ba46c77b4d..3e9825c36b 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb | |||
@@ -7,8 +7,8 @@ SRC_URI = " \ | |||
7 | http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ | 7 | http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ |
8 | file://0001-Fix-crash-with-gst-inspect.patch \ | 8 | file://0001-Fix-crash-with-gst-inspect.patch \ |
9 | " | 9 | " |
10 | |||
10 | SRC_URI[md5sum] = "5e610b5a94c209487310739b39b6c464" | 11 | SRC_URI[md5sum] = "5e610b5a94c209487310739b39b6c464" |
11 | SRC_URI[sha256sum] = "5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2" | 12 | SRC_URI[sha256sum] = "5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2" |
12 | 13 | ||
13 | S = "${WORKDIR}/gstreamer-${PV}" | 14 | S = "${WORKDIR}/gstreamer-${PV}" |
14 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb index cb00d319a7..f7e2351bc8 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb | |||
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ | |||
6 | file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" | 6 | file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" |
7 | 7 | ||
8 | SRC_URI = "git://anongit.freedesktop.org/gstreamer/gstreamer;branch=master" | 8 | SRC_URI = "git://anongit.freedesktop.org/gstreamer/gstreamer;branch=master" |
9 | S = "${WORKDIR}/git" | ||
10 | 9 | ||
11 | SRCREV = "3b8181a8c550e74acaba4e8c55bdc649fa551dc9" | 10 | SRCREV = "3b8181a8c550e74acaba4e8c55bdc649fa551dc9" |
12 | 11 | ||
12 | S = "${WORKDIR}/git" | ||
13 | |||
13 | do_configure_prepend() { | 14 | do_configure_prepend() { |
14 | cd ${S} | 15 | cd ${S} |
15 | ./autogen.sh --noconfigure | 16 | ./autogen.sh --noconfigure |
16 | cd ${B} | 17 | cd ${B} |
17 | } | 18 | } |
18 | |||