From 42d7edcdc7d213725ca19cbae6154340e763fea5 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 6 Nov 2020 08:11:27 -0800 Subject: Various: Packages using libGL may need to be declared SOC_VARIANT_ARCH Issue: CR-1082769 libGL is either provided by mesa or libmali. Each of the modified recipes contains a direct library link to the provider of libGL. Due to this we need to specify precise dependencies and declare the package as the right architecture to break a potential install conflict. If we don't do this, the package will be generated as aarch64, but won't be installable as the dependency on libmali can't be satisfied unless the user has libmali, which is only available on zynqmpev and zyncmpeg. git cherry-pick 6c0b7e5 Signed-off-by: Mark Hatle --- meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend | 7 +++++++ meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend | 9 +++++++++ meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend | 9 +++++++++ .../gstreamer/gstreamer1.0-plugins-base_%.bbappend | 9 +++++++++ 4 files changed, 34 insertions(+) create mode 100644 meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend create mode 100644 meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend create mode 100644 meta-xilinx-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend index b2942a82..c3f12f63 100644 --- a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend @@ -1,2 +1,9 @@ PACKAGECONFIG_zynqmp += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ egl glesv2" + +# OpenGL comes from libmali on ev/eg +DEPENDS_append_zynqmpev = " libmali-xlnx" +DEPENDS_append_zynqmpeg = " libmali-xlnx" + +PACKAGE_ARCH_zynqmpev = "${SOC_VARIANT_ARCH}" +PACKAGE_ARCH_zynqmpeg = "${SOC_VARIANT_ARCH}" diff --git a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend new file mode 100644 index 00000000..febf1636 --- /dev/null +++ b/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -0,0 +1,9 @@ +# OpenGL comes from libmali on ev/eg, when egl is enabled +DEPENDS_MALI_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', 'libmali-xlnx', '', d)}" +PKG_ARCH_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}" + +DEPENDS_append_zynqmpev = " ${DEPENDS_MALI_XLNX}" +DEPENDS_append_zynqmpeg = " ${DEPENDS_MALI_XLNX}" + +PACKAGE_ARCH_zynqmpev = "${PKG_ARCH_XLNX}" +PACKAGE_ARCH_zynqmpeg = "${PKG_ARCH_XLNX}" diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend new file mode 100644 index 00000000..febf1636 --- /dev/null +++ b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend @@ -0,0 +1,9 @@ +# OpenGL comes from libmali on ev/eg, when egl is enabled +DEPENDS_MALI_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', 'libmali-xlnx', '', d)}" +PKG_ARCH_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}" + +DEPENDS_append_zynqmpev = " ${DEPENDS_MALI_XLNX}" +DEPENDS_append_zynqmpeg = " ${DEPENDS_MALI_XLNX}" + +PACKAGE_ARCH_zynqmpev = "${PKG_ARCH_XLNX}" +PACKAGE_ARCH_zynqmpeg = "${PKG_ARCH_XLNX}" diff --git a/meta-xilinx-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-xilinx-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend new file mode 100644 index 00000000..febf1636 --- /dev/null +++ b/meta-xilinx-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend @@ -0,0 +1,9 @@ +# OpenGL comes from libmali on ev/eg, when egl is enabled +DEPENDS_MALI_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', 'libmali-xlnx', '', d)}" +PKG_ARCH_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}" + +DEPENDS_append_zynqmpev = " ${DEPENDS_MALI_XLNX}" +DEPENDS_append_zynqmpeg = " ${DEPENDS_MALI_XLNX}" + +PACKAGE_ARCH_zynqmpev = "${PKG_ARCH_XLNX}" +PACKAGE_ARCH_zynqmpeg = "${PKG_ARCH_XLNX}" -- cgit v1.2.3-54-g00ecf