From 833ed5c609547edee5e25381e3007f26f7ddcac7 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 31 May 2023 14:08:25 -0700 Subject: gstreamer1.0-plugins-base: Move i.MX overrides to overrides section Signed-off-by: Tom Hochstein --- .../gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb index 0ef9daea..ebd143ef 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb @@ -17,7 +17,6 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ file://0003-viv-fb-Make-sure-config.h-is-included.patch \ file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ - file://0001-Fix-types-to-match-callback-functions.patch \ " SRC_URI[sha256sum] = "96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204" @@ -85,14 +84,6 @@ EXTRA_OEMESON += " \ ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \ " -# Remove this meta package when moving to gstreamer 1.22+, this is for making -# gst packagegroups from master work with gstreamer 1.20.3.imx -PACKAGES += "${PN}-videoconvertscale" - -ALLOW_EMPTY:${PN}-videoconvertscale = "1" - -RDEPENDS:${PN}-videoconvertscale = "${PN}-videoconvert ${PN}-videoscale" - FILES:${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h" FILES:${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" @@ -121,6 +112,7 @@ SRC_URI:remove = " \ file://0003-viv-fb-Make-sure-config.h-is-included.patch \ file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch" SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " +SRC_URI += "file://0001-Fix-types-to-match-callback-functions.patch" SRC_URI += "file://0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch" GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" SRCBRANCH = "MM_04.07.02_2210_L5.15.y" @@ -150,6 +142,12 @@ EXTRA_OEMESON += "-Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}"" # gcompat will address it during runtime LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" +# Remove this meta package when moving to gstreamer 1.22+, this is for making +# gst packagegroups from master work with gstreamer 1.20.3.imx +PACKAGES += "${PN}-videoconvertscale" +ALLOW_EMPTY:${PN}-videoconvertscale = "1" +RDEPENDS:${PN}-videoconvertscale = "${PN}-videoconvert ${PN}-videoscale" + COMPATIBLE_MACHINE = "(imx-nxp-bsp)" ########### End of i.MX overrides ######### -- cgit v1.2.3-54-g00ecf