Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recipes-graphics: merge NXP's .bbappend files with ours 

https://jira.digi.com/browse/DEL-6104

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2018-08-10 17:56:50 +02:00
parent d522e4ae21
commit 62c4e2f6a4
3 changed files with 17 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-digi-dey/recipes-graphics/gtk+/gtk+3_%.bbappend
View File

@ -1,5 +1,3 @@
DEPENDS_append_imxgpu2d = " virtual/egl"
SRC_URI_remove = "file://0004-configure.ac-Fix-wayland-protocols-path.patch"
PACKAGECONFIG_remove_imxgpu2d = " \
${@bb.utils.contains("DISTRO_FEATURES", "wayland", "x11", "", d)} \
"
EXTRA_OECONF_remove = "WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"

10
meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc
View File

@ -43,7 +43,6 @@ PROVIDES += " \
virtual/libopenvg \
virtual/opencl-headers \
virtual/opencl-icd \
virtual/wayland-egl \
${EXTRA_PROVIDES} \
"
@ -51,7 +50,9 @@ RPROVIDES_${PN}_imxgpu3d += "imx-gpu-viv"
PE = "1"
inherit fsl-eula-unpack
inherit fsl-eula-unpack distro_features_check
REQUIRED_DISTRO_FEATURES_mx8 = "wayland"
SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
@ -74,7 +75,6 @@ PACKAGES_2 = ""
PACKAGES_2_mx8 = "libgbm-imx libgbm-imx-dev"
PACKAGES_3 = "libwayland-viv-imx libwayland-viv-imx-dev \
libgc-wayland-protocol-imx libgc-wayland-protocol-imx-dev \
libwayland-egl-imx-dev \
imx-gpu-viv-tools \
imx-gpu-viv-demos \
libvulkan-imx libvulkan-imx-dev \
@ -172,7 +172,6 @@ do_install () {
install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc
#install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
#install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
if [ "${USE_X11}" = "yes" ]; then
@ -299,7 +298,6 @@ INSANE_SKIP_libegl-imx += "dev-so"
FILES_libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
FILES_libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
#RDEPENDS_libegl-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libgc-wayland-protocol-imx libwayland-viv-imx libgc-wayland-protocol-imx', '', d)}"
RDEPENDS_libegl-imx-dev += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libwayland-egl-imx-dev', '', d)}"
FILES_libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
FILES_libgal-imx-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL"
@ -371,8 +369,6 @@ INSANE_SKIP_libgc-wayland-protocol-imx += "dev-so"
FILES_libgc-wayland-protocol-imx = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}"
FILES_libgc-wayland-protocol-imx-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc"
FILES_libwayland-egl-imx-dev = "${libdir}/pkgconfig/wayland-egl.pc"
FILES_imx-gpu-viv-tools = "${bindir}/gmem_info"
FILES_imx-gpu-viv-demos = "/opt"

37
meta-digi-dey/recipes-graphics/mesa/mesa_%.bbappend
View File

@ -1,44 +1,29 @@
# Copyright (C) 2018 Digi International
PACKAGECONFIG_remove_imxgpu2d = "egl gles gbm"
PROVIDES_remove_imxgpu = "virtual/egl"
PROVIDES_remove_imxgpu3d = "virtual/libgl virtual/libgles1 virtual/libgles2"
PROVIDES_remove_imxgpu2d = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl gbm"
PROVIDES_remove_imxgpu3d = "virtual/libgl"
# FIXME: mesa should support 'x11-no-tls' option
python () {
overrides = d.getVar("OVERRIDES", True).split(":")
if "imxgpu2d" not in overrides:
return
x11flag = d.getVarFlag("PACKAGECONFIG", "x11", False)
d.setVarFlag("PACKAGECONFIG", "x11", x11flag.replace("--enable-glx-tls", "--enable-glx"))
}
# Enable Etnaviv support
PACKAGECONFIG_append_use-mainline-bsp = " gallium"
GALLIUMDRIVERS_append_use-mainline-bsp = ",etnaviv,imx"
PACKAGECONFIG_remove_imxgpu = "egl gbm"
PACKAGECONFIG_remove_imxgpu3d = "gles"
BACKEND = \
"${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \
'fb', d), d)}"
# FIXME: Dirty hack to allow use of Vivante GPU libGL binary
do_install_append_imxgpu3d () {
rm -f ${D}${libdir}/libGL.* \
${D}${includedir}/GL/gl.h \
${D}${includedir}/GL/glext.h \
${D}${includedir}/GL/glx.h \
rm -f ${D}${includedir}/GL/glx.h \
${D}${includedir}/GL/glxext.h
if [ "${BACKEND}" = "x11" ]; then
rm -f ${D}${libdir}/pkgconfig/gl.pc
fi
}
do_install_append_imxgpu2d () {
rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
do_install_append_imxgpu () {
rm -f ${D}${includedir}/KHR
}
do_install_append_imxgpu2d () {
do_install_append () {
if [ "${BACKEND}" = "wayland" ]; then
rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
rm -f ${D}${libdir}/libwayland-egl*
fi
}