gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB

To compile with Vivante header and use framebuffer, it is necessary to
pass option -DEGL_API_FB. This option is declared in pkg-config file of
Vivante library. But many packages (especialy qt5 components) does not
consider these flags.

So instead of patching every packages that use EGL, it is more
convenient to patch Vivante headers.

This commit add #define EGL_API_FB on top of eglvivante.h when
necessary.

[Thomas: fix syntax error.]

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Jérôme Pouiller 2015-04-30 17:12:17 +02:00 committed by Thomas Petazzoni
parent f0964c8dc4
commit c9ecdd2b96
4 changed files with 13 additions and 7 deletions

View File

@ -7,4 +7,4 @@ Name: egl
Description: Freescale gpu-viv-bin-mx6q implementation of EGL
Version: 1.0
Libs: -L${libdir} -lGAL -lEGL
Cflags: -I${includedir}/ -DEGL_API_FB=1
Cflags: -I${includedir}/

View File

@ -7,4 +7,4 @@ Name: glesv2
Description: Freescale gpu-viv-bin-mx6q implementation of OpenGL ESv2
Version: 2.0
Libs: -L${libdir} -lGAL -lEGL -lGLESv2
Cflags: -I${includedir}/ -DEGL_API_FB=1
Cflags: -I${includedir}/

View File

@ -46,16 +46,22 @@ define GPU_VIV_BIN_MX6Q_BUILD_CMDS
ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so.1.2.0
endef
ifeq ($(GPU_VIV_BIN_MX6Q_LIB_TARGET),fb)
define GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS
$(SED) '/#define EGLAPIENTRY/ a \
#if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\
#define EGL_API_FB \n\
#endif' $(STAGING_DIR)/usr/include/EGL/eglvivante.h
endef
endif
define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
cp -r $(@D)/usr/* $(STAGING_DIR)/usr
$(GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS)
for lib in egl glesv2 vg; do \
$(INSTALL) -m 0644 -D \
package/freescale-imx/gpu-viv-bin-mx6q/$${lib}.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
if [ "$(GPU_VIV_BIN_MX6Q_LIB_TARGET)" != "fb" ]; then \
$(SED) "s/-DEGL_API_FB=1//" \
$(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
fi; \
done
endef

View File

@ -7,4 +7,4 @@ Name: vg
Description: Freescale gpu-viv-bin-mx6q implementation of OpenVG
Version: 1.1
Libs: -L${libdir} -lGAL -lEGL -lOpenVG
Cflags: -I${includedir}/ -DEGL_API_FB=1
Cflags: -I${includedir}/