Sfoglia il codice sorgente

qt5.15.2 buildroot 2021.8.x

Reinhard Russinger 2 anni fa
parent
commit
71320888c6

+ 1 - 1
Make-bb-kernel_noRT.sh

@@ -23,7 +23,7 @@ cd ..
 rm -rf buildroot
 git clone https://gogs.reru.org/PUBLIC_REPOS/buildroot.git ./buildroot
 cd buildroot
-git checkout 2021.08.1
+git checkout 2021.08.3
 git checkout -b gfawrk
 for i in ../GfA/patches/*.patch
 do

+ 0 - 45
patches/0111-qtwebenine-use-only-3-Cpu-s.__patch

@@ -1,45 +0,0 @@
-From 5901d178ea1c75ffbd8f2f477d80490fe200401a Mon Sep 17 00:00:00 2001
-From: Reinhard Russinger <reinhard@russinger.at>
-Date: Sat, 17 Apr 2021 08:57:10 +0000
-Subject: [PATCH] qtwebenine use only 3 Cpu's
-
----
- package/qt5/qt5webengine/qt5webengine.mk | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
-index 64c9c96..786c1b3 100644
---- a/package/qt5/qt5webengine/qt5webengine.mk
-+++ b/package/qt5/qt5webengine/qt5webengine.mk
-@@ -29,6 +29,15 @@ endif
- 
- QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss
- 
-+ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y)
-+	QT5WEBENGINE_DEPENDENCIES += host-freetype
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y)
-+	QT5WEBENGINE_DEPENDENCIES += host-libjpeg
-+endif
-+ 
-+
- QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg
- 
- ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y)
-@@ -51,7 +60,11 @@ define QT5WEBENGINE_PYTHON2_SYMLINK
- endef
- QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
- 
--QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
-+##QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
-+QT5WEBENGINE_ENV += NINJAFLAGS="-j3"
-+
-+##P_JOBS=$(shell echo $(PARALLEL_JOBS)/2) | bc)
-+##QT5WEBENGINE_ENV += NINJAFLAGS="-j$(P_JOBS)"
- 
- define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
- 	sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config
--- 
-2.7.4
-

+ 0 - 45
patches/0111-qtwebenine-use-only-3-Cpu-s.patch

@@ -1,45 +0,0 @@
-From 5901d178ea1c75ffbd8f2f477d80490fe200401a Mon Sep 17 00:00:00 2001
-From: Reinhard Russinger <reinhard@russinger.at>
-Date: Sat, 17 Apr 2021 08:57:10 +0000
-Subject: [PATCH] qtwebenine use only 3 Cpu's
-
----
- package/qt5/qt5webengine/qt5webengine.mk | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
-index 64c9c96..786c1b3 100644
---- a/package/qt5/qt5webengine/qt5webengine.mk
-+++ b/package/qt5/qt5webengine/qt5webengine.mk
-@@ -29,6 +29,15 @@ endif
- 
- QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss
- 
-+ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y)
-+	QT5WEBENGINE_DEPENDENCIES += host-freetype
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y)
-+	QT5WEBENGINE_DEPENDENCIES += host-libjpeg
-+endif
-+ 
-+
- QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg
- 
- ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y)
-@@ -51,7 +60,11 @@ define QT5WEBENGINE_PYTHON2_SYMLINK
- endef
- QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
- 
--QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
-+##QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
-+QT5WEBENGINE_ENV += NINJAFLAGS="-j3"
-+
-+##P_JOBS=$(shell echo $(PARALLEL_JOBS)/2) | bc)
-+##QT5WEBENGINE_ENV += NINJAFLAGS="-j$(P_JOBS)"
- 
- define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
- 	sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config
--- 
-2.7.4
-

+ 0 - 17
patches/0115-qt5webengine-revert-parallel-build-to-all-cpu.__patch

@@ -1,17 +0,0 @@
-diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
-index 786c1b3c9a..fca0d7104f 100644
---- a/package/qt5/qt5webengine/qt5webengine.mk
-+++ b/package/qt5/qt5webengine/qt5webengine.mk
-@@ -60,11 +60,7 @@ define QT5WEBENGINE_PYTHON2_SYMLINK
- endef
- QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
- 
--##QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
--QT5WEBENGINE_ENV += NINJAFLAGS="-j3"
--
--##P_JOBS=$(shell echo $(PARALLEL_JOBS)/2) | bc)
--##QT5WEBENGINE_ENV += NINJAFLAGS="-j$(P_JOBS)"
-+QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
- 
- define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
- 	sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config

+ 0 - 17
patches/0115-qt5webengine-revert-parallel-build-to-all-cpu.patch

@@ -1,17 +0,0 @@
-diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
-index 786c1b3c9a..fca0d7104f 100644
---- a/package/qt5/qt5webengine/qt5webengine.mk
-+++ b/package/qt5/qt5webengine/qt5webengine.mk
-@@ -60,11 +60,7 @@ define QT5WEBENGINE_PYTHON2_SYMLINK
- endef
- QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
- 
--##QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
--QT5WEBENGINE_ENV += NINJAFLAGS="-j3"
--
--##P_JOBS=$(shell echo $(PARALLEL_JOBS)/2) | bc)
--##QT5WEBENGINE_ENV += NINJAFLAGS="-j$(P_JOBS)"
-+QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
- 
- define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
- 	sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config