59ef95fdae
Remove upstream committed patches (qt5base): - 0001-Force_egl_visual_ID_33.patch (see [1], [2]) - 0003-xcb-egl-fixes.patch (see [3]) - 0005-forkd-disable-eventfd-for-uclibc.patch (see [4], [5]) - 0009-fix-eglfs-for-sunxi-mali.patch (see [6]) - 0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch (see [7]) Remove MX6_WORKAROUND from qt5base.mk since we do not need to tweak EGL visual ID to 33. Remove upstream committed patch (qt5webchannel): - 0001-Fix-builds-without-qml-module.patch (see [8], [9]) Fix Qt5Enginio to 1.6.0 version (see [10]) [1] https://bugreports.qt.io/browse/QTBUG-44290 [2] https://codereview.qt-project.org/#/c/108849/ [3] https://codereview.qt-project.org/#/c/115438/ [4] https://bugreports.qt.io/browse/QTBUG-47337 [5] https://codereview.qt-project.org/#/c/121988/ [6] https://codereview.qt-project.org/#/c/125837/ [7] https://codereview.qt-project.org/#/c/126725/ [8] https://bugreports.qt.io/browse/QTBUG-47360 [9] https://codereview.qt-project.org/#/c/122086/ [10] https://bugreports.qt.io/browse/QTBUG-50111 Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
23 lines
824 B
Makefile
23 lines
824 B
Makefile
QT5_VERSION_MAJOR = 5.6
|
|
QT5_VERSION = $(QT5_VERSION_MAJOR).0
|
|
QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
|
|
include $(sort $(wildcard package/qt5/*/*.mk))
|
|
|
|
define QT5_LA_PRL_FILES_FIXUP
|
|
for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.la"); do \
|
|
$(SED) "s:$(BASE_DIR):@BASE_DIR@:g" \
|
|
-e "s:$(STAGING_DIR):@STAGING_DIR@:g" \
|
|
-e "s:\(['= ]\)/usr:\\1@STAGING_DIR@/usr:g" \
|
|
-e "s:@STAGING_DIR@:$(STAGING_DIR):g" \
|
|
-e "s:@BASE_DIR@:$(BASE_DIR):g" \
|
|
$$i ; \
|
|
$(SED) "/^dependency_libs=/s%-L/usr/lib %%g" $$i ; \
|
|
done
|
|
for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.prl"); do \
|
|
$(SED) "s%-L/usr/lib%%" $$i; \
|
|
done
|
|
endef
|
|
|
|
# Variable for other Qt applications to use
|
|
QT5_QMAKE = $(HOST_DIR)/usr/bin/qmake -spec devices/linux-buildroot-g++
|