Commit c9ecdd2b authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Thomas Petazzoni
Browse files

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: default avatarJérôme Pouiller <jezz@sysmic.org>
Tested-by: default avatarGary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent f0964c8d

package/freescale-imx/gpu-viv-bin-mx6q/egl.pc

+1 −1
Original line number Diff line number Diff line
@@ -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}/

package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc

+1 −1
Original line number Diff line number Diff line
@@ -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}/

package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk

+10 −4
Original line number Diff line number Diff line
@@ -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

package/freescale-imx/gpu-viv-bin-mx6q/vg.pc

+1 −1
Original line number Diff line number Diff line
@@ -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}/