meta-xilinx: subtree update:874b9cee5e..569f52f275
Jaewon Lee (1):
xilinx-board.inc: Introducing inc file to add BOARD/BOARD_VARIANT
Madhurkiran Harikrishnan (2):
weston.ini: Do not set hard requirement for input devices
libmali-xlnx: Update the mali userspace libraries to 2020.2
Mark Hatle (2):
libmali-xlnx: Fix the package arch
Various: Packages using libGL may need to be declared SOC_VARIANT_ARCH
Raju Kumar Pothuraju (1):
versal-generic.conf:zynqmp-generic.conf: Add MACHINE_ESSENTIAL_EXTRA_RDEPENDS variable only for specific machines.
Sai Hari Chandana Kalluri (7):
Add meta-python2 in bblayers.conf
xrt_git.bb: Replace deprecated boost macros
perf: Fix compilation issues Fix perf variable definition and libtraceevent with binutils. The above errors are fixed by including the following patches to the kernel tree: 0001-libtraceevent-Fix-build-with-binutils-2.35.patch 0001-perf-bench-Share-some-global-variables-to-fix-build-.patch 0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch 0001-perf-tests-bp_account-Make-global-variable-static.patch
opencv_3.4.3: Remove support for opencv 3.4
Update commit id and branch for components for 2020.2 release
update XILINX_VER_MAIN to 2020.2
bootgen: Update commit id for 2020.2 release
Sandeep Gundlupet Raju (1):
kernel-module-dp: Add support for Xilinx DP drivers
Vishal Sagar (1):
kernel-module-hdmi: Update commit id and license md5sum for 2020.2
ch vamshi krishna (3):
updating xrt commit id
updating final XRT commit id for 2020.2
updating XRT/Zocl commit id for 2020.2
rbramand (1):
] CR-1076958 Put libxrt libs softlinks in the main package
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I4c6b12024c4d07388334e29177417e34fe6dea87
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
index b2942a8..c3f12f6 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
+++ b/meta-xilinx/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/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
index 8a1451e..5c45b2b 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
@@ -12,7 +12,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
REPO ?= "git://github.com/Xilinx/mali-userspace-binaries.git;protocol=https"
-BRANCH ?= "rel-v2020.1"
+BRANCH ?= "rel-v2020.2"
SRCREV ?= "da73805e3e011382c4d014ac10037cd193aaa9a0"
BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
@@ -30,7 +30,7 @@
COMPATIBLE_MACHINE_zynqmpeg = "zynqmpeg"
COMPATIBLE_MACHINE_zynqmpev = "zynqmpev"
-PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
+PACKAGE_ARCH = "${SOC_VARIANT_ARCH}"
S = "${WORKDIR}/git"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend
new file mode 100644
index 0000000..febf163
--- /dev/null
+++ b/meta-xilinx/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/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
new file mode 100644
index 0000000..febf163
--- /dev/null
+++ b/meta-xilinx/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/meta-xilinx-bsp/recipes-graphics/weston/files/weston.ini b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/weston.ini
index 783a9c6..2ff8179 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/weston.ini
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/weston.ini
@@ -2,3 +2,5 @@
idle-time=0
gbm-format=rgb565
+
+require-input=false