From b92188e15fb1583746f340d2f98d068a7d7585f2 Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 12:14:55 +0100 Subject: [PATCH 01/14] fix: hyperion compilation problem on pi4 --- package/hyperion/Config.in | 3 ++- package/hyperion/hyperion.mk | 13 ++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package/hyperion/Config.in b/package/hyperion/Config.in index bc5289650a..5d246751c3 100644 --- a/package/hyperion/Config.in +++ b/package/hyperion/Config.in @@ -7,7 +7,8 @@ config BR2_PACKAGE_HYPERION depends on BR2_PACKAGE_QT5BASE depends on BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_PACKAGE_RPI_FIRMWARE - depends on BR2_PACKAGE_RPI_USERLAND + select BR2_PACKAGE_RPI_USERLAND if (BR2_PACKAGE_RECALBOX_TARGET_RPI0 || BR2_PACKAGE_RECALBOX_TARGET_RPI1 || BR2_PACKAGE_RECALBOX_TARGET_RPI2 || BR2_PACKAGE_RECALBOX_TARGET_RPI3) + select BR2_PACKAGE_RPI_USERLAND_TOOLS if BR2_PACKAGE_RECALBOX_TARGET_RPI4 depends on BR2_PACKAGE_PROTOBUF help Hyperion is an open source ambient light software. diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index 4010801640..a843759432 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -23,7 +23,18 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ --build "$(@D)/output/" "$(@D)/" HYPERION_DEPENDENCIES += rpi-firmware -HYPERION_DEPENDENCIES += libusb qt5base host-libusb rpi-firmware rpi-userland host-protobuf host-cmake +HYPERION_DEPENDENCIES += libusb qt5base host-libusb + +# rpi4 +ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) +HYPERION_DEPENDENCIES += rpi-userland-tools +endif +# rpi0, 1, 2 and 3 +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +HYPERION_DEPENDENCIES += rpi-userland +endif + +HYPERION_DEPENDENCIES += host-protobuf host-cmake define HYPERION_PROTOBUF_COMPILE mkdir -p "$(@D)/host-compile/" -- GitLab From 09109d4c00aa704b6c70ed6d5cf241c1141ea297 Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 14:08:41 +0100 Subject: [PATCH 02/14] fix: hyperion compilation problem on pi4 trailing spaces --- package/hyperion/hyperion.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index a843759432..b80382cb1c 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -25,14 +25,14 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ HYPERION_DEPENDENCIES += rpi-firmware HYPERION_DEPENDENCIES += libusb qt5base host-libusb -# rpi4 -ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) -HYPERION_DEPENDENCIES += rpi-userland-tools +# rpi4 +ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) +HYPERION_DEPENDENCIES += rpi-userland-tools endif -# rpi0, 1, 2 and 3 -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -HYPERION_DEPENDENCIES += rpi-userland -endif +# rpi0, 1, 2 and 3 +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +HYPERION_DEPENDENCIES += rpi-userland +endif HYPERION_DEPENDENCIES += host-protobuf host-cmake -- GitLab From 42364e943af3c29ecfc2e71fa0d4344f8ba9fbc5 Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 15:06:54 +0100 Subject: [PATCH 03/14] fix: hyperion compilation problem on pi4 trailing spaces --- package/hyperion/hyperion.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index b80382cb1c..5eca4969ce 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -25,10 +25,10 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ HYPERION_DEPENDENCIES += rpi-firmware HYPERION_DEPENDENCIES += libusb qt5base host-libusb -# rpi4 +# rpi4 ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) HYPERION_DEPENDENCIES += rpi-userland-tools -endif +endif # rpi0, 1, 2 and 3 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) HYPERION_DEPENDENCIES += rpi-userland -- GitLab From 280f8e55583019405b34e80df71184671175935a Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 15:12:47 +0100 Subject: [PATCH 04/14] fix: hyperion compilation problem on pi4 attributes order --- package/hyperion/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hyperion/Config.in b/package/hyperion/Config.in index 5d246751c3..c6ee7db07a 100644 --- a/package/hyperion/Config.in +++ b/package/hyperion/Config.in @@ -7,9 +7,9 @@ config BR2_PACKAGE_HYPERION depends on BR2_PACKAGE_QT5BASE depends on BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_PACKAGE_RPI_FIRMWARE + depends on BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_RPI_USERLAND if (BR2_PACKAGE_RECALBOX_TARGET_RPI0 || BR2_PACKAGE_RECALBOX_TARGET_RPI1 || BR2_PACKAGE_RECALBOX_TARGET_RPI2 || BR2_PACKAGE_RECALBOX_TARGET_RPI3) select BR2_PACKAGE_RPI_USERLAND_TOOLS if BR2_PACKAGE_RECALBOX_TARGET_RPI4 - depends on BR2_PACKAGE_PROTOBUF help Hyperion is an open source ambient light software. https://github.com/hyperion-project/hyperion -- GitLab From 3da6e96b6824450d6da657c61b469849e6ebc648 Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 12:14:55 +0100 Subject: [PATCH 05/14] fix: hyperion compilation problem on pi4 --- package/hyperion/Config.in | 2 ++ package/hyperion/hyperion.mk | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/hyperion/Config.in b/package/hyperion/Config.in index c6ee7db07a..aeadd09e03 100644 --- a/package/hyperion/Config.in +++ b/package/hyperion/Config.in @@ -7,6 +7,8 @@ config BR2_PACKAGE_HYPERION depends on BR2_PACKAGE_QT5BASE depends on BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_PACKAGE_RPI_FIRMWARE + select BR2_PACKAGE_RPI_USERLAND if (BR2_PACKAGE_RECALBOX_TARGET_RPI0 || BR2_PACKAGE_RECALBOX_TARGET_RPI1 || BR2_PACKAGE_RECALBOX_TARGET_RPI2 || BR2_PACKAGE_RECALBOX_TARGET_RPI3) + select BR2_PACKAGE_RPI_USERLAND_TOOLS if BR2_PACKAGE_RECALBOX_TARGET_RPI4 depends on BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_RPI_USERLAND if (BR2_PACKAGE_RECALBOX_TARGET_RPI0 || BR2_PACKAGE_RECALBOX_TARGET_RPI1 || BR2_PACKAGE_RECALBOX_TARGET_RPI2 || BR2_PACKAGE_RECALBOX_TARGET_RPI3) select BR2_PACKAGE_RPI_USERLAND_TOOLS if BR2_PACKAGE_RECALBOX_TARGET_RPI4 diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index 5eca4969ce..a843759432 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -25,14 +25,14 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ HYPERION_DEPENDENCIES += rpi-firmware HYPERION_DEPENDENCIES += libusb qt5base host-libusb -# rpi4 -ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) -HYPERION_DEPENDENCIES += rpi-userland-tools -endif -# rpi0, 1, 2 and 3 -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -HYPERION_DEPENDENCIES += rpi-userland -endif +# rpi4 +ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) +HYPERION_DEPENDENCIES += rpi-userland-tools +endif +# rpi0, 1, 2 and 3 +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +HYPERION_DEPENDENCIES += rpi-userland +endif HYPERION_DEPENDENCIES += host-protobuf host-cmake -- GitLab From 8ffa2d49ebed0b3ee1b3744eec7681005da02d1e Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 14:08:41 +0100 Subject: [PATCH 06/14] fix: hyperion compilation problem on pi4 trailing spaces --- package/hyperion/hyperion.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index a843759432..b80382cb1c 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -25,14 +25,14 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ HYPERION_DEPENDENCIES += rpi-firmware HYPERION_DEPENDENCIES += libusb qt5base host-libusb -# rpi4 -ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) -HYPERION_DEPENDENCIES += rpi-userland-tools +# rpi4 +ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) +HYPERION_DEPENDENCIES += rpi-userland-tools endif -# rpi0, 1, 2 and 3 -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -HYPERION_DEPENDENCIES += rpi-userland -endif +# rpi0, 1, 2 and 3 +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +HYPERION_DEPENDENCIES += rpi-userland +endif HYPERION_DEPENDENCIES += host-protobuf host-cmake -- GitLab From 6eb1f219bbc68cd3fbeb93d24b1740e8fdc1a971 Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 15:06:54 +0100 Subject: [PATCH 07/14] fix: hyperion compilation problem on pi4 trailing spaces --- package/hyperion/hyperion.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index b80382cb1c..5eca4969ce 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -25,10 +25,10 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ HYPERION_DEPENDENCIES += rpi-firmware HYPERION_DEPENDENCIES += libusb qt5base host-libusb -# rpi4 +# rpi4 ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) HYPERION_DEPENDENCIES += rpi-userland-tools -endif +endif # rpi0, 1, 2 and 3 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) HYPERION_DEPENDENCIES += rpi-userland -- GitLab From 603e33259488a073ec2237cb2eb83ad9f3b6ea32 Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 15:12:47 +0100 Subject: [PATCH 08/14] fix: hyperion compilation problem on pi4 attributes order --- package/hyperion/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/hyperion/Config.in b/package/hyperion/Config.in index aeadd09e03..c6ee7db07a 100644 --- a/package/hyperion/Config.in +++ b/package/hyperion/Config.in @@ -7,8 +7,6 @@ config BR2_PACKAGE_HYPERION depends on BR2_PACKAGE_QT5BASE depends on BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_PACKAGE_RPI_FIRMWARE - select BR2_PACKAGE_RPI_USERLAND if (BR2_PACKAGE_RECALBOX_TARGET_RPI0 || BR2_PACKAGE_RECALBOX_TARGET_RPI1 || BR2_PACKAGE_RECALBOX_TARGET_RPI2 || BR2_PACKAGE_RECALBOX_TARGET_RPI3) - select BR2_PACKAGE_RPI_USERLAND_TOOLS if BR2_PACKAGE_RECALBOX_TARGET_RPI4 depends on BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_RPI_USERLAND if (BR2_PACKAGE_RECALBOX_TARGET_RPI0 || BR2_PACKAGE_RECALBOX_TARGET_RPI1 || BR2_PACKAGE_RECALBOX_TARGET_RPI2 || BR2_PACKAGE_RECALBOX_TARGET_RPI3) select BR2_PACKAGE_RPI_USERLAND_TOOLS if BR2_PACKAGE_RECALBOX_TARGET_RPI4 -- GitLab From 4b74e3d96c1a6dee3b75b44930418333f1b58219 Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 17:15:01 +0100 Subject: [PATCH 09/14] fix: hyperion compilation problem on pi4 fix Config.in --- package/hyperion/Config.in | 3 +-- package/hyperion/hyperion.mk | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/hyperion/Config.in b/package/hyperion/Config.in index c6ee7db07a..ac3060ff43 100644 --- a/package/hyperion/Config.in +++ b/package/hyperion/Config.in @@ -8,8 +8,7 @@ config BR2_PACKAGE_HYPERION depends on BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_PACKAGE_RPI_FIRMWARE depends on BR2_PACKAGE_PROTOBUF - select BR2_PACKAGE_RPI_USERLAND if (BR2_PACKAGE_RECALBOX_TARGET_RPI0 || BR2_PACKAGE_RECALBOX_TARGET_RPI1 || BR2_PACKAGE_RECALBOX_TARGET_RPI2 || BR2_PACKAGE_RECALBOX_TARGET_RPI3) - select BR2_PACKAGE_RPI_USERLAND_TOOLS if BR2_PACKAGE_RECALBOX_TARGET_RPI4 + depends on BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_RPI_USERLAND_TOOLS help Hyperion is an open source ambient light software. https://github.com/hyperion-project/hyperion diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index 5eca4969ce..11ef9c357f 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -22,8 +22,7 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ -DENABLE_QT5=ON \ --build "$(@D)/output/" "$(@D)/" -HYPERION_DEPENDENCIES += rpi-firmware -HYPERION_DEPENDENCIES += libusb qt5base host-libusb +HYPERION_DEPENDENCIES += libusb qt5base host-libusb rpi-firmware host-protobuf host-cmake # rpi4 ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) @@ -34,8 +33,6 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) HYPERION_DEPENDENCIES += rpi-userland endif -HYPERION_DEPENDENCIES += host-protobuf host-cmake - define HYPERION_PROTOBUF_COMPILE mkdir -p "$(@D)/host-compile/" cd "$(@D)/host-compile/" && $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/cmake "$(@D)/" \ -- GitLab From 21d6259ed09b17fb682d67a306ffdf95ae5a591a Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 12:14:55 +0100 Subject: [PATCH 10/14] fix: hyperion compilation problem on pi4 --- package/hyperion/Config.in | 2 ++ package/hyperion/hyperion.mk | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package/hyperion/Config.in b/package/hyperion/Config.in index ac3060ff43..3d96978ef5 100644 --- a/package/hyperion/Config.in +++ b/package/hyperion/Config.in @@ -7,6 +7,8 @@ config BR2_PACKAGE_HYPERION depends on BR2_PACKAGE_QT5BASE depends on BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_PACKAGE_RPI_FIRMWARE + select BR2_PACKAGE_RPI_USERLAND if (BR2_PACKAGE_RECALBOX_TARGET_RPI0 || BR2_PACKAGE_RECALBOX_TARGET_RPI1 || BR2_PACKAGE_RECALBOX_TARGET_RPI2 || BR2_PACKAGE_RECALBOX_TARGET_RPI3) + select BR2_PACKAGE_RPI_USERLAND_TOOLS if BR2_PACKAGE_RECALBOX_TARGET_RPI4 depends on BR2_PACKAGE_PROTOBUF depends on BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_RPI_USERLAND_TOOLS help diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index 11ef9c357f..a843759432 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -22,16 +22,19 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ -DENABLE_QT5=ON \ --build "$(@D)/output/" "$(@D)/" -HYPERION_DEPENDENCIES += libusb qt5base host-libusb rpi-firmware host-protobuf host-cmake - -# rpi4 -ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) -HYPERION_DEPENDENCIES += rpi-userland-tools -endif -# rpi0, 1, 2 and 3 -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -HYPERION_DEPENDENCIES += rpi-userland -endif +HYPERION_DEPENDENCIES += rpi-firmware +HYPERION_DEPENDENCIES += libusb qt5base host-libusb + +# rpi4 +ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) +HYPERION_DEPENDENCIES += rpi-userland-tools +endif +# rpi0, 1, 2 and 3 +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +HYPERION_DEPENDENCIES += rpi-userland +endif + +HYPERION_DEPENDENCIES += host-protobuf host-cmake define HYPERION_PROTOBUF_COMPILE mkdir -p "$(@D)/host-compile/" -- GitLab From 747be7211d62f5af08094a0aaff85e6d329fa861 Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 14:08:41 +0100 Subject: [PATCH 11/14] fix: hyperion compilation problem on pi4 trailing spaces --- package/hyperion/hyperion.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index a843759432..b80382cb1c 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -25,14 +25,14 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ HYPERION_DEPENDENCIES += rpi-firmware HYPERION_DEPENDENCIES += libusb qt5base host-libusb -# rpi4 -ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) -HYPERION_DEPENDENCIES += rpi-userland-tools +# rpi4 +ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) +HYPERION_DEPENDENCIES += rpi-userland-tools endif -# rpi0, 1, 2 and 3 -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -HYPERION_DEPENDENCIES += rpi-userland -endif +# rpi0, 1, 2 and 3 +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +HYPERION_DEPENDENCIES += rpi-userland +endif HYPERION_DEPENDENCIES += host-protobuf host-cmake -- GitLab From 230ce95eac118f69f5afc24639a587713ab4a5dc Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 15:06:54 +0100 Subject: [PATCH 12/14] fix: hyperion compilation problem on pi4 trailing spaces --- package/hyperion/hyperion.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index b80382cb1c..5eca4969ce 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -25,10 +25,10 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ HYPERION_DEPENDENCIES += rpi-firmware HYPERION_DEPENDENCIES += libusb qt5base host-libusb -# rpi4 +# rpi4 ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) HYPERION_DEPENDENCIES += rpi-userland-tools -endif +endif # rpi0, 1, 2 and 3 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) HYPERION_DEPENDENCIES += rpi-userland -- GitLab From fdf18189b99d565a768e56545a714b2b5e196f5b Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 15:12:47 +0100 Subject: [PATCH 13/14] fix: hyperion compilation problem on pi4 attributes order --- package/hyperion/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/hyperion/Config.in b/package/hyperion/Config.in index 3d96978ef5..c6ee7db07a 100644 --- a/package/hyperion/Config.in +++ b/package/hyperion/Config.in @@ -7,10 +7,9 @@ config BR2_PACKAGE_HYPERION depends on BR2_PACKAGE_QT5BASE depends on BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_PACKAGE_RPI_FIRMWARE + depends on BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_RPI_USERLAND if (BR2_PACKAGE_RECALBOX_TARGET_RPI0 || BR2_PACKAGE_RECALBOX_TARGET_RPI1 || BR2_PACKAGE_RECALBOX_TARGET_RPI2 || BR2_PACKAGE_RECALBOX_TARGET_RPI3) select BR2_PACKAGE_RPI_USERLAND_TOOLS if BR2_PACKAGE_RECALBOX_TARGET_RPI4 - depends on BR2_PACKAGE_PROTOBUF - depends on BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_RPI_USERLAND_TOOLS help Hyperion is an open source ambient light software. https://github.com/hyperion-project/hyperion -- GitLab From a647eea07c7529801dcc03f9adeb30f33516d131 Mon Sep 17 00:00:00 2001 From: Yann MORERE Date: Tue, 3 Nov 2020 12:14:55 +0100 Subject: [PATCH 14/14] fix: hyperion compilation problem on pi4 --- package/hyperion/Config.in | 3 +-- package/hyperion/hyperion.mk | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/hyperion/Config.in b/package/hyperion/Config.in index c6ee7db07a..ac3060ff43 100644 --- a/package/hyperion/Config.in +++ b/package/hyperion/Config.in @@ -8,8 +8,7 @@ config BR2_PACKAGE_HYPERION depends on BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_PACKAGE_RPI_FIRMWARE depends on BR2_PACKAGE_PROTOBUF - select BR2_PACKAGE_RPI_USERLAND if (BR2_PACKAGE_RECALBOX_TARGET_RPI0 || BR2_PACKAGE_RECALBOX_TARGET_RPI1 || BR2_PACKAGE_RECALBOX_TARGET_RPI2 || BR2_PACKAGE_RECALBOX_TARGET_RPI3) - select BR2_PACKAGE_RPI_USERLAND_TOOLS if BR2_PACKAGE_RECALBOX_TARGET_RPI4 + depends on BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_RPI_USERLAND_TOOLS help Hyperion is an open source ambient light software. https://github.com/hyperion-project/hyperion diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk index 5eca4969ce..11ef9c357f 100644 --- a/package/hyperion/hyperion.mk +++ b/package/hyperion/hyperion.mk @@ -22,8 +22,7 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \ -DENABLE_QT5=ON \ --build "$(@D)/output/" "$(@D)/" -HYPERION_DEPENDENCIES += rpi-firmware -HYPERION_DEPENDENCIES += libusb qt5base host-libusb +HYPERION_DEPENDENCIES += libusb qt5base host-libusb rpi-firmware host-protobuf host-cmake # rpi4 ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y) @@ -34,8 +33,6 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) HYPERION_DEPENDENCIES += rpi-userland endif -HYPERION_DEPENDENCIES += host-protobuf host-cmake - define HYPERION_PROTOBUF_COMPILE mkdir -p "$(@D)/host-compile/" cd "$(@D)/host-compile/" && $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/cmake "$(@D)/" \ -- GitLab