diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2016-01-18 17:29:51 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-24 09:40:23 +0000 |
commit | 1d6e61a85688a06edaa54a1c7f81da22896a47ba (patch) | |
tree | deb19f5c87310751bb85a9d754e1f0740cb2b0f3 | |
parent | c45ce26ee1deb87fcc528db2ee2e03fa505e2ade (diff) | |
download | poky-1d6e61a85688a06edaa54a1c7f81da22896a47ba.tar.gz |
gstreamer1.0-plugins-ugly: minor formatting improvements
(From OE-Core rev: fb839d7c244b53e555d02cad747617aacf63d1a3)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 10 insertions, 14 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc index eb49e2220e..869022a2d2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc | |||
@@ -7,26 +7,24 @@ DEPENDS += "gstreamer1.0-plugins-base libid3tag" | |||
7 | 7 | ||
8 | inherit gettext | 8 | inherit gettext |
9 | 9 | ||
10 | |||
11 | PACKAGECONFIG ??= " \ | 10 | PACKAGECONFIG ??= " \ |
12 | orc a52dec lame mad mpeg2dec \ | 11 | a52dec lame mad mpeg2dec orc \ |
13 | " | 12 | " |
14 | 13 | ||
15 | PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52" | 14 | PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52" |
15 | PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr" | ||
16 | PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr" | ||
16 | PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio" | 17 | PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio" |
17 | PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread" | 18 | PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread" |
18 | PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame" | 19 | PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame" |
19 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" | 20 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" |
20 | PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" | 21 | PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" |
21 | PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" | 22 | PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" |
22 | PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr" | ||
23 | PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr" | ||
24 | |||
25 | 23 | ||
26 | EXTRA_OECONF += " \ | 24 | EXTRA_OECONF += " \ |
27 | --disable-sidplay \ | 25 | --disable-sidplay \ |
28 | --disable-twolame \ | 26 | --disable-twolame \ |
29 | " | 27 | " |
30 | 28 | ||
31 | FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" | ||
32 | FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" | 29 | FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" |
30 | FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.6.2.bb index 67b72fa7f9..d935f6dfbd 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.6.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.6.2.bb | |||
@@ -1,10 +1,9 @@ | |||
1 | include gstreamer1.0-plugins-ugly.inc | 1 | include gstreamer1.0-plugins-ugly.inc |
2 | 2 | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ |
4 | file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 " | 4 | file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" |
5 | 5 | ||
6 | SRC_URI[md5sum] = "0f0e30336e3155443cd5bfec5c215d56" | 6 | SRC_URI[md5sum] = "0f0e30336e3155443cd5bfec5c215d56" |
7 | SRC_URI[sha256sum] = "e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845" | 7 | SRC_URI[sha256sum] = "e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845" |
8 | 8 | ||
9 | S = "${WORKDIR}/gst-plugins-ugly-${PV}" | 9 | S = "${WORKDIR}/gst-plugins-ugly-${PV}" |
10 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb index dcf5ffc3c1..e06b5ea285 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb | |||
@@ -3,15 +3,14 @@ DEFAULT_PREFERENCE = "-1" | |||
3 | include gstreamer1.0-plugins-ugly.inc | 3 | include gstreamer1.0-plugins-ugly.inc |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ |
6 | file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 " | 6 | file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" |
7 | |||
8 | S = "${WORKDIR}/git" | ||
9 | 7 | ||
10 | SRCREV = "06b8ac10cee85c5c304ca320997aa8f44295a66f" | 8 | SRCREV = "06b8ac10cee85c5c304ca320997aa8f44295a66f" |
11 | 9 | ||
10 | S = "${WORKDIR}/git" | ||
11 | |||
12 | do_configure_prepend() { | 12 | do_configure_prepend() { |
13 | cd ${S} | 13 | cd ${S} |
14 | ./autogen.sh --noconfigure | 14 | ./autogen.sh --noconfigure |
15 | cd ${B} | 15 | cd ${B} |
16 | } | 16 | } |
17 | |||