diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2018-05-03 16:17:51 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-11 07:49:37 +0100 |
commit | 4a291e3e14670234fc37ba1976eefd8141a800ba (patch) | |
tree | 12676a776d9bacd58e1455a0e78e3b3b418af46d | |
parent | 2f88de553e92ff8be6dd702b4441ada7987c734a (diff) | |
download | poky-4a291e3e14670234fc37ba1976eefd8141a800ba.tar.gz |
gst-plugins-ugly: upgrade 1.12.4 -> 1.14.0
* For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/
* Remove PACKAGECONFIG for lame, mpg123 since those have moved to -good.
* Merge inc/bb since there's only one version now.
(From OE-Core rev: ad928dd4493947c40d733c5e0543fea2f166231d)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb | 13 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc) | 17 |
2 files changed, 13 insertions, 17 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb deleted file mode 100644 index f8333519e9..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | require gstreamer1.0-plugins-ugly.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | ||
4 | file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" | ||
5 | |||
6 | SRC_URI = " \ | ||
7 | http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ | ||
8 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ | ||
9 | " | ||
10 | SRC_URI[md5sum] = "e2b836fb2747f6ae3a1a6f33a9d8c952" | ||
11 | SRC_URI[sha256sum] = "1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522" | ||
12 | |||
13 | S = "${WORKDIR}/gst-plugins-ugly-${PV}" | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb index 60aa968c95..c8f778bff3 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb | |||
@@ -1,15 +1,27 @@ | |||
1 | require gstreamer1.0-plugins.inc | 1 | require gstreamer1.0-plugins.inc |
2 | 2 | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | ||
4 | file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" | ||
5 | |||
3 | LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" | 6 | LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" |
4 | LICENSE_FLAGS = "commercial" | 7 | LICENSE_FLAGS = "commercial" |
5 | 8 | ||
9 | SRC_URI = " \ | ||
10 | http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ | ||
11 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ | ||
12 | " | ||
13 | SRC_URI[md5sum] = "bcb1f8d9339176aee2b5da2a9cb2df88" | ||
14 | SRC_URI[sha256sum] = "3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1" | ||
15 | |||
16 | S = "${WORKDIR}/gst-plugins-ugly-${PV}" | ||
17 | |||
6 | DEPENDS += "gstreamer1.0-plugins-base libid3tag" | 18 | DEPENDS += "gstreamer1.0-plugins-base libid3tag" |
7 | 19 | ||
8 | inherit gettext | 20 | inherit gettext |
9 | 21 | ||
10 | PACKAGECONFIG ??= " \ | 22 | PACKAGECONFIG ??= " \ |
11 | ${GSTREAMER_ORC} \ | 23 | ${GSTREAMER_ORC} \ |
12 | a52dec lame mpg123 mpeg2dec \ | 24 | a52dec mpeg2dec \ |
13 | " | 25 | " |
14 | 26 | ||
15 | PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52" | 27 | PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52" |
@@ -17,14 +29,11 @@ PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr" | |||
17 | PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr" | 29 | PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr" |
18 | PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio" | 30 | PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio" |
19 | PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread" | 31 | PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread" |
20 | PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame" | ||
21 | PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" | 32 | PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" |
22 | PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" | ||
23 | PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" | 33 | PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" |
24 | 34 | ||
25 | EXTRA_OECONF += " \ | 35 | EXTRA_OECONF += " \ |
26 | --disable-sidplay \ | 36 | --disable-sidplay \ |
27 | --disable-twolame \ | ||
28 | " | 37 | " |
29 | 38 | ||
30 | FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" | 39 | FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" |