Commit 6cd7b60f authored by Floris Bos's avatar Floris Bos Committed by Peter Korsgaard
Browse files

qt5base: add rPi EGL glue code 



When the rpi-userland package is selected, assume we are targetting
the Raspberry Pi, and add the right platform glue code when building
the Qt5 EGLFS plugin.

Signed-off-by: default avatarFloris Bos <bos@je-eigen-domein.nl>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 53fbd8a7

package/qt5/qt5base/qt5base-mkspecs-files.patch

+4 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf 
===================================================================

--- /dev/null

+++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf

@@ -0,0 +1,38 @@

@@ -0,0 +1,41 @@

+MAKEFILE_GENERATOR      = UNIX

+CONFIG                  += incremental gdb_dwarf_index

+QMAKE_INCREMENTAL_STYLE = sublib
@@ -49,6 +49,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf 
+

+QMAKE_LIBS             += -lrt -lpthread -ldl

+

+# device specific glue code

+EGLFS_PLATFORM_HOOKS_SOURCES =

+

+# Sanity check

+deviceSanityCheckCompiler()

+

package/qt5/qt5base/qt5base.mk

+6 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ endif 
ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)

QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs

QT5BASE_DEPENDENCIES   += libgles libegl

ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)

QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \

	$(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp

endif

else

QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs

endif
@@ -125,6 +129,8 @@ define QT5BASE_CONFIGURE_CMDS 
	$(call QT5BASE_CONFIG_SET,CROSS_COMPILE,$(TARGET_CROSS))

	$(call QT5BASE_CONFIG_SET,COMPILER_CFLAGS,$(TARGET_CFLAGS))

	$(call QT5BASE_CONFIG_SET,COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS))

	$(call QT5BASE_CONFIG_SET,EGLFS_PLATFORM_HOOKS_SOURCES, \

		$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES))

	(cd $(@D); \

		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \

		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \