From 6158053c9eee4703a80b6c120b0bf45e4665f85b Mon Sep 17 00:00:00 2001 From: Cristinel Panfir Date: Fri, 20 Dec 2019 18:17:02 +0200 Subject: [PATCH] gstreamer1.0-plugins-good: Upgrade to 1.16 Add FILESEXTRAPATHS to use patches from poky Signed-off-by: Cristinel Panfir --- ...gstreamer1.0-plugins-good_1.16.%.bbappend} | 0 ... => gstreamer1.0-plugins-good_1.16.imx.bb} | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.14.%.bbappend => gstreamer1.0-plugins-good_1.16.%.bbappend} (100%) rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.14.imx.bb => gstreamer1.0-plugins-good_1.16.imx.bb} (72%) diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend similarity index 100% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.%.bbappend rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb similarity index 72% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb index 5781094b..1b3faee9 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb @@ -5,13 +5,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" +FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:" +FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:" + GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" +SRCBRANCH = "MM_04.05.01_1909_L4.19.35" SRC_URI = " \ ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ " -SRCREV = "a31aabb7581d3f491cd31889d44479bb0f34990b" +SRCREV = "3bcc85705695ee629ac3fb687411bb196d231918" DEFAULT_PREFERENCE = "-1" @@ -49,7 +53,16 @@ PACKAGECONFIG[v4l2] = "--enable-gst_v4l2 --enable-v4l2-probe,--disable-gst PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" PACKAGECONFIG[x11] = "--enable-x,--disable-x,${X11DEPENDS}" +PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2" +PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" +PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame" +PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" +# qt5 support is disabled, because it is not present in OE core, and requires more work than +# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). +# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig +# in a gstreamer1.0-plugins-good bbappend). EXTRA_OECONF += " \ --enable-bz2 \ --enable-oss \ @@ -64,6 +77,8 @@ EXTRA_OECONF += " \ --disable-osx_video \ --disable-shout2 \ --disable-waveform \ + --disable-qt \ + --disable-twolame \ " FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" -- 2.40.1