summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2022-07-01 20:20:15 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2022-07-11 22:12:41 +0200
commitc35ef4115ad93a4b940f1ae5fb3cc9ac1920eab3 (patch)
tree2398ffbb26f07e0f92c44a1a843bc3d3a841c1d8
parent02870132a53fed8620302984541a623cfa5d3149 (diff)
downloadmeta-freescale-c35ef4115ad93a4b940f1ae5fb3cc9ac1920eab3.tar.gz
Revert "imx-base.inc: upgrade to gstreamer 1.20.2"
This reverts commit 912829e1aa543326682f45656b6240db97864655. There is no downstream fork based on gstreamer 1.20.2. Currently in meta-freescale master it is still 1.18.5.imx with non forked gstreamer components carried in meta-freescale at 1.18.5 for compatibility. Prevents: | WARNING: preferred version 1.20.2.imx of gstreamer1.0 not available (for item gstreamer1.0) | WARNING: versions of gstreamer1.0 available: 1.18.5.imx 1.20.2 | ... Fixes build of imx-gst1.0-plugin | ERROR: imx-gst1.0-plugin-4.6.4-r0 do_compile: ExecutionError('... imx-gst1.0-plugin/4.6.4-r0/temp/run.do_compile.25172', 1, None, None) | | [1/37] aarch64-tdx-linux-gcc -mcpu=cortex-a72.cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot -Ilibs/libgstfsl-1.0.so.0.0.0.p -Ilibs -I../git/libs -I/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot/usr/include/gstreamer-1.0 -I/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot/usr/include/glib-2.0 -I/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot/usr/lib/glib-2.0/include -I/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot/usr/include/orc-0.4 -I/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot/usr/include/imx -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -O0 -U_FILE_OFFSET_BITS -DARM -D_GUNC_ -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0=/usr/src/debug/imx-gst1.0-plugin/4.6.4-r0 -fdebug-prefix-map=/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0=/usr/src/debug/imx-gst1.0-plugin/4.6.4-r0 -fdebug-prefix-map=/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot= -fdebug-prefix-map=/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot-native= -fPIC -pthread -DUSE_X11 -MD -MQ libs/libgstfsl-1.0.so.0.0.0.p/gstimxcommon.c.o -MF libs/libgstfsl-1.0.so.0.0.0.p/gstimxcommon.c.o.d -o libs/libgstfsl-1.0.so.0.0.0.p/gstimxcommon.c.o -c ../git/libs/gstimxcommon.c | FAILED: libs/libgstfsl-1.0.so.0.0.0.p/gstimxcommon.c.o | aarch64-tdx-linux-gcc -mcpu=cortex-a72.cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot -Ilibs/libgstfsl-1.0.so.0.0.0.p -Ilibs -I../git/libs -I/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot/usr/include/gstreamer-1.0 -I/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot/usr/include/glib-2.0 -I/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot/usr/lib/glib-2.0/include -I/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot/usr/include/orc-0.4 -I/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot/usr/include/imx -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -O0 -U_FILE_OFFSET_BITS -DARM -D_GUNC_ -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0=/usr/src/debug/imx-gst1.0-plugin/4.6.4-r0 -fdebug-prefix-map=/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0=/usr/src/debug/imx-gst1.0-plugin/4.6.4-r0 -fdebug-prefix-map=/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot= -fdebug-prefix-map=/workdir/oe/tmp/work/cortexa72-cortexa53-mx8-tdx-linux/imx-gst1.0-plugin/4.6.4-r0/recipe-sysroot-native= -fPIC -pthread -DUSE_X11 -MD -MQ libs/libgstfsl-1.0.so.0.0.0.p/gstimxcommon.c.o -MF libs/libgstfsl-1.0.so.0.0.0.p/gstimxcommon.c.o.d -o libs/libgstfsl-1.0.so.0.0.0.p/gstimxcommon.c.o -c ../git/libs/gstimxcommon.c | ../git/libs/gstimxcommon.c:21:10: fatal error: gstimxcommon.h: No such file or directory | 21 | #include "gstimxcommon.h" | | ^~~~~~~~~~~~~~~~ | compilation terminated. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--conf/machine/include/imx-base.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b7ea61c5..e24e14e1 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -412,13 +412,13 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm-nxp-bsp ?= "imx-gst1.0-plugin"
412MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" 412MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin"
413MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin" 413MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin"
414 414
415PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.20.2.imx" 415PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.18.5.imx"
416PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.20.2.imx" 416PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.18.5.imx"
417PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.20.2.imx" 417PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.18.5.imx"
418PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.20.2.imx" 418PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.18.5.imx"
419PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.20.2" 419PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.18.5"
420PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.20.2" 420PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.18.5"
421PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.20.2" 421PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.18.5"
422PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" 422PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1"
423 423
424# Determines if the SoC has support for Vivante kernel driver 424# Determines if the SoC has support for Vivante kernel driver