jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 22:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt5base: add rPi EGL glue code

Browse Source 
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: Floris Bos <bos@je-eigen-domein.nl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Floris Bos 2013-03-19 09:29:40 +00:00 committed by Peter Korsgaard
parent 53fbd8a7c5
commit 6cd7b60f8b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/qt5/qt5base/qt5base-mkspecs-files.patch
View File

@ -14,7 +14,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
@@ -0,0 +1,38 @@ @@ -0,0 +1,41 @@
+MAKEFILE_GENERATOR = UNIX +MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental gdb_dwarf_index +CONFIG += incremental gdb_dwarf_index
+QMAKE_INCREMENTAL_STYLE = sublib +QMAKE_INCREMENTAL_STYLE = sublib
@ -49,6 +49,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
+ +
+QMAKE_LIBS += -lrt -lpthread -ldl +QMAKE_LIBS += -lrt -lpthread -ldl
+ +
+# device specific glue code
+EGLFS_PLATFORM_HOOKS_SOURCES =
+
+# Sanity check +# Sanity check
+deviceSanityCheckCompiler() +deviceSanityCheckCompiler()
+ +

6
package/qt5/qt5base/qt5base.mk
View File

@ -75,6 +75,10 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs
QT5BASE_DEPENDENCIES += libgles libegl 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 else
QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs
endif endif
@ -125,6 +129,8 @@ define QT5BASE_CONFIGURE_CMDS
$(call QT5BASE_CONFIG_SET,CROSS_COMPILE,$(TARGET_CROSS)) $(call QT5BASE_CONFIG_SET,CROSS_COMPILE,$(TARGET_CROSS))
$(call QT5BASE_CONFIG_SET,COMPILER_CFLAGS,$(TARGET_CFLAGS)) $(call QT5BASE_CONFIG_SET,COMPILER_CFLAGS,$(TARGET_CFLAGS))
$(call QT5BASE_CONFIG_SET,COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS)) $(call QT5BASE_CONFIG_SET,COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS))
$(call QT5BASE_CONFIG_SET,EGLFS_PLATFORM_HOOKS_SOURCES, \
$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES))
(cd $(@D); \ (cd $(@D); \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \