diff --git a/.github/workflows/build_package_Rock5.yml b/.github/workflows/build_package_Rock5.yml index 2c083d313..d091f3755 100644 --- a/.github/workflows/build_package_Rock5.yml +++ b/.github/workflows/build_package_Rock5.yml @@ -6,6 +6,7 @@ on: - "2.5-evo" - "dev-release" - "release" + - "experiments" paths-ignore: - '**.md' - '**.asciidoc' diff --git a/app/main.cpp b/app/main.cpp index 78e54a93f..da8c24138 100755 --- a/app/main.cpp +++ b/app/main.cpp @@ -205,13 +205,24 @@ int main(int argc, char *argv[]) { QSettings settings; qDebug()<<"Storing settings at ["< #include +#include #include #include @@ -303,6 +304,14 @@ bool QOpenHD::is_platform_rpi() #endif } +bool QOpenHD::is_platform_rock() +{ +#ifdef IS_PLATFORM_ROCK + return true; +#else + return false; +#endif +} void QOpenHD::keep_screen_on(bool on) { diff --git a/app/util/qopenhd.h b/app/util/qopenhd.h index 635f10804..85d3297ea 100644 --- a/app/util/qopenhd.h +++ b/app/util/qopenhd.h @@ -62,6 +62,7 @@ class QOpenHD : public QObject Q_INVOKABLE bool is_valid_ip(QString ip); Q_INVOKABLE bool is_platform_rpi(); + Q_INVOKABLE bool is_platform_rock(); // // Tries to mimic android toast as much as possible // diff --git a/app/videostreaming/avcodec/avcodec_video.pri b/app/videostreaming/avcodec/avcodec_video.pri index a29142325..ef46819a7 100644 --- a/app/videostreaming/avcodec/avcodec_video.pri +++ b/app/videostreaming/avcodec/avcodec_video.pri @@ -33,5 +33,12 @@ packagesExist(mmal) { DEFINES += IS_PLATFORM_RPI } +exists(/usr/local/share/openhd/platform/rock/) { + message(This is a Rock) + DEFINES += IS_PLATFORM_ROCK +} else { + message(This is not a Rock) +} + # can be used in c++, also set to be exposed in qml DEFINES += QOPENHD_ENABLE_VIDEO_VIA_AVCODEC diff --git a/build_chroot.sh b/build_chroot.sh index 481fc4fda..46bce5313 100644 --- a/build_chroot.sh +++ b/build_chroot.sh @@ -2,9 +2,11 @@ #This file is the install instruction for the CHROOT build #We're using cloudsmith-cli to upload the file in CHROOT +echo "____________build like a rockSTAR___________" sudo apt install -y python3-pip git sudo pip3 install --upgrade cloudsmith-cli bash install_build_dep.sh rock5 +mkdir -p /usr/local/share/openhd/platform/rock/ sudo ./package.sh arm64 debian bullseye-rock5 || exit 1 mkdir -p /opt/out/ cp -v *.dep /opt/out/ diff --git a/install_build_dep.sh b/install_build_dep.sh index 61cd0b315..f97c5ad52 100755 --- a/install_build_dep.sh +++ b/install_build_dep.sh @@ -23,6 +23,7 @@ PLATFORM_PACKAGES="qml-module-qt-labs-platform" # Add OpenHD Repository platform-specific packages apt install -y curl curl -1sLf 'https://dl.cloudsmith.io/public/openhd/release/setup.deb.sh'| sudo -E bash + curl -1sLf 'https://dl.cloudsmith.io/public/openhd/dev-release/setup.deb.sh'| sudo -E bash apt update # Main function diff --git a/systemd/rock3_qopenhd.service b/systemd/rock3_qopenhd.service index d8c02bd16..ab1b5d71f 100644 --- a/systemd/rock3_qopenhd.service +++ b/systemd/rock3_qopenhd.service @@ -5,7 +5,7 @@ After=multi-user.target [Service] Type=simple Environment="QT_QPA_EGLFS_KMS_ATOMIC=1" -Environment="QT_LOGGING_RULES=qt.qpa.egl*=true" +Environment="FONTCONFIG_PATH=/etc/fonts" Environment="QT_QPA_EGLFS_KMS_PLANE_INDEX=1" Environment="QT_QPA_EGLFS_FORCE888=1" Environment="QT_QPA_EGLFS_SWAPINTERVAL=0" diff --git a/systemd/rock5_qopenhd.service b/systemd/rock5_qopenhd.service index ea8303487..24341fd12 100644 --- a/systemd/rock5_qopenhd.service +++ b/systemd/rock5_qopenhd.service @@ -4,8 +4,8 @@ After=multi-user.target [Service] Type=simple +Environment="FONTCONFIG_PATH=/etc/fonts" Environment="QT_QPA_EGLFS_KMS_ATOMIC=1" -Environment="QT_LOGGING_RULES=qt.qpa.egl*=true" Environment="QT_QPA_EGLFS_KMS_PLANE_INDEX=5" Environment="QT_QPA_EGLFS_FORCE888=1" Environment="QT_QPA_EGLFS_SWAPINTERVAL=0"