From 1b17339161866ed86221e5acd6349efab9c8554c Mon Sep 17 00:00:00 2001 From: digitalLumberjack Date: Sat, 10 Jul 2021 13:23:42 +0200 Subject: [PATCH] wip(hyperion-ng): STUCK PLEASE HELP ME DAVID --- Config.in | 1 + package/hyperion-ng/Config.in | 11 ++++++++ package/hyperion-ng/hyperion-ng.mk | 40 ++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 package/hyperion-ng/Config.in create mode 100644 package/hyperion-ng/hyperion-ng.mk diff --git a/Config.in b/Config.in index 388d5c26ce..bb62031013 100644 --- a/Config.in +++ b/Config.in @@ -244,6 +244,7 @@ menu "Utils" source "$BR2_EXTERNAL_RECALBOX_PATH/package/fbv-recalbox/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/hhpc/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/hyperion/Config.in" + source "$BR2_EXTERNAL_RECALBOX_PATH/package/hyperion-ng/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/jstest2/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/kernelfirmwares/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/rtl88x2bu/Config.in" diff --git a/package/hyperion-ng/Config.in b/package/hyperion-ng/Config.in new file mode 100644 index 0000000000..d0f2224b76 --- /dev/null +++ b/package/hyperion-ng/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HYPERION_NG + bool "hyperion-ng" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_QT5SERIALPORT + help + Hyperion is an open source ambient light software. + https://github.com/hyperion-project/hyperion + +comment "Hyperion-ng needs BR2_INSTALL_LIBSTDCPP BR2_PACKAGE_QT5SERIALPORT" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_QT5SERIALPORT diff --git a/package/hyperion-ng/hyperion-ng.mk b/package/hyperion-ng/hyperion-ng.mk new file mode 100644 index 0000000000..2de6e3851c --- /dev/null +++ b/package/hyperion-ng/hyperion-ng.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# Hyperion-ng +# +################################################################################ + +HYPERION_NG_SITE = git://github.com/hyperion-project/hyperion.ng.git +HYPERION_NG_VERSION = 6d004240ded5399b5d747a8e9bef7f1888a452c9 +HYPERION_NG_LICENSE = MIT +HYPERION_NG_SITE_METHOD = git +HYPERION_NG_GIT_SUBMODULES = YES + +# I was adding dependencies one by one, python totally blocked me +HYPERION_NG_DEPENDENCIES += python3 qt5serialport + +# Real conf for hyperion +HYPERION_NG_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release -DENABLE_QT=OFF + +# ------------------------- +# Below is tests for python3 +# Just in case +#HYPERION_NG_CONF_OPTS += -DPython_ADDITIONAL_VERSIONS=3.9 +# The variables that cmake do not find can be overloaded in the command +# This line is taken in account (i don't know yet if it's the host, the staging or the target we should use) +HYPERION_NG_CONF_OPTS += -DPython3_INCLUDE_DIR="$(HOST_DIR)/arm-buildroot-linux-gnueabihf/sysroot/usr/include/python3.9/" + +# Those line is taken in account if you add the policy CMAKE_POLICY( SET CMP0074 NEW ) +# But it changes nothing +# see https://cmake.org/cmake/help/latest/command/find_package.html#search-procedure +HYPERION_NG_CONF_OPTS += -DPython3_ROOT_DIR="$(PYTHON3_PATH)" +HYPERION_NG_CONF_OPTS += -DPython3_ROOT="$(PYTHON3_PATH)" +HYPERION_NG_CONF_OPTS += -DCMAKE_PREFIX_PATH="$(STAGING_DIR)" + +# The library i cannot fix +HYPERION_NG_CONF_OPTS += -DPython3_LIBRARY="$(HOST_DIR)/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/python3.9/config-3.9-arm-linux-gnueabihf/libpython3.9.a" + +# And i tried to force the PYTHON_EXECUTABLE +HYPERION_NG_CONF_OPTS += -DPYTHON_EXECUTABLE="$(HOST_DIR)/usr/bin/python3" +HYPERION_NG_CONF_OPTS += -DPYTHON3_EXECUTABLE="$(HOST_DIR)/usr/bin/python3" +$(eval $(cmake-package)) -- GitLab