Merge remote-tracking branch 'origin/2.5-evo' into consti-dev

# Conflicts:
#	qml/ui/configpopup/ConfigPopup.qml

.github/workflows/build_package_x86_jammy.yml

@@ -33,21 +33,10 @@ jobs:
         sudo rm -rf /var/lib/apt/lists/*
         sudo apt upgrade -y
         sudo add-apt-repository universe
-        sudo ./install_build_dep.sh ubuntu-x86 custom
-
-        
-        
+        sudo ./install_build_dep.sh ubuntu-x86
 
     - name: Build with make
       run: |
-        sudo rm -f /etc/ld.so.conf.d/qt.conf
-        sudo touch /etc/ld.so.conf.d/qt.conf
-        sudo sh -c 'echo "/opt/Qt5.15.7/lib/" >/etc/ld.so.conf.d/qt.conf'
-        sudo ldconfig
-        export PATH="$PATH:/opt/Qt5.15.7/bin/"
-        sudo rm -f /usr/bin/qmake
-        sudo ln -s /opt/Qt5.15.7/bin/qmake /usr/bin/qmake
-        echo "QT successfully linked"   
         sudo ./package.sh x86_64 ubuntu jammy
     
     - name: Push

.github/workflows/ubuntu22_build_test.yml

@@ -30,7 +30,7 @@ jobs:
           sudo apt upgrade -y
           sudo apt remove libunwind-13-dev 
           sudo apt install -y libunwind-dev libgstreamer-plugins-base1.0-dev
-          sudo ./install_build_dep.sh ubuntu-x86 custom
+          sudo ./install_build_dep.sh ubuntu-x86
           qmake --version
       - name: Build with make
         run: |

LICENSE

@@ -232,6 +232,10 @@ terms of section 4, provided that you also meet all of these conditions:
     interfaces that do not display Appropriate Legal Notices, your
     work need not make them do so.
 
+    e) The "Credits" section of this App is subject to the following terms in addition to the GNU General Public License (GPL) version 3:
+      The content presented in the "Credits" section of this App is considered a copyrighted declaration. Unauthorized modifications, suppression, or removal of this content are strictly prohibited without explicit consent from the OpenHD development team.
+
+
   A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,

before-install.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+#remove custom QT
+dpkg -r openhd-qt-jammy || true

install_build_dep.sh

@@ -17,7 +17,7 @@ function install_pi_packages {
 PLATFORM_PACKAGES=""
 }
 function install_x86_packages {
-PLATFORM_PACKAGES=""
+PLATFORM_PACKAGES="qml-module-qt-labs-platform"
 }
 function install_rock_packages {
 PLATFORM_PACKAGES="qml-module-qt-labs-platform"

package.sh

@@ -54,9 +54,6 @@ fi
 if [[ "${DISTRO}" == "bullseye" ]] && [[ "${OS}" == "raspbian" ]] ; then
 #Raspberry
 PLATFORM_PACKAGES="-d openhd-userland -d libavcodec-dev -d libavformat-dev -d openhd-qt -d gst-plugins-good -d gst-openhd-plugins -d gstreamer1.0-gl"
-elif [[ "${DISTRO}" == "jammy" ]] && [[ "${OS}" == "ubuntu" ]] && [[ "${PACKAGE_ARCH}" == "x86_64" ]]; then
-#X86
-PLATFORM_PACKAGES="-d git -d qtgstreamer-plugins-qt5 -d gstreamer1.0-qt5 -d libgstreamer-plugins-base1.0-dev -d gstreamer1.0-plugins-good -d libavcodec-dev -d libavformat-dev -d openhd-qt-x86-jammy"
 else
 PLATFORM_PACKAGES="-d gstreamer1.0-gl -d qtgstreamer-plugins-qt5 -d gstreamer1.0-qt5 -d libqt5texttospeech5-dev -d qml-module-qt-labs-platform -d git -d libgstreamer-plugins-base1.0-dev -d gstreamer1.0-plugins-good -d libavcodec-dev -d libavformat-dev -d qml-module-qtquick-controls2 -d libqt5concurrent5 -d libqt5core5a -d libqt5dbus5 -d libqt5gui5 -d libqt5help5 -d libqt5location5 -d libqt5location5-plugins -d libqt5multimedia5 -d libqt5multimedia5-plugins -d libqt5multimediagsttools5 -d libqt5multimediawidgets5 -d libqt5network5 -d libqt5opengl5 -d libqt5opengl5-dev -d libqt5positioning5 -d libqt5positioning5-plugins -d libqt5positioningquick5 -d libqt5printsupport5 -d libqt5qml5 -d libqt5quick5 -d libqt5quickparticles5 -d libqt5quickshapes5 -d libqt5quicktest5 -d libqt5quickwidgets5 -d libqt5sensors5 -d libqt5sql5 -d libqt5sql5-sqlite -d libqt5svg5 -d libqt5test5 -d libqt5webchannel5 -d libqt5webkit5 -d libqt5widgets5 -d libqt5x11extras5 -d libqt5xml5 -d openshot-qt -d python3-pyqt5 -d python3-pyqt5.qtopengl -d python3-pyqt5.qtsvg -d python3-pyqt5.qtwebkit -d python3-pyqtgraph -d qml-module-qt-labs-settings -d qml-module-qtgraphicaleffects -d qml-module-qtlocation -d qml-module-qtpositioning -d qml-module-qtquick-controls -d qml-module-qtquick-dialogs -d qml-module-qtquick-extras -d qml-module-qtquick-layouts -d qml-module-qtquick-privatewidgets -d qml-module-qtquick-shapes -d qml-module-qtquick-window2 -d qml-module-qtquick2 -d qt5-gtk-platformtheme -d qt5-qmake -d qt5-qmake-bin -d qt5-qmltooling-plugins -d qtbase5-dev -d qtbase5-dev-tools -d qtchooser -d qtdeclarative5-dev -d qtdeclarative5-dev-tools -d qtpositioning5-dev -d qttranslations5-l10n"
 fi
@@ -85,10 +82,11 @@ elif [[ "${PACKAGE_ARCH}" = "arm64" ]]; then
 cp rock_qt_eglfs_kms_config.json /tmp/qopenhd/usr/local/share/qopenhd/ || exit 1
 fi
 
-VERSION="2.3-evo-$(date '+%Y%m%d%H%M')-${VER2}"
+VERSION="2.5-evo-$(date '+%Y%m%d%H%M')-${VER2}"
 
 rm ${PACKAGE_NAME}_${VERSION}_${PACKAGE_ARCH}.deb > /dev/null 2>&1
 ls -a
+
 fpm -a ${PACKAGE_ARCH} -s dir -t deb -n ${PACKAGE_NAME} -v ${VERSION} -C ${TMPDIR} \
   -p qopenhd_VERSION_ARCH.deb \
   --after-install after-install.sh \

qml/ui/configpopup/credits/Credits.qml

@@ -10,7 +10,7 @@ import OpenHD 1.0
 import "../../../ui" as Ui
 import "../../elements"
 
-// This document serves as a copyrighted statement. Any unauthorized editing, concealment, or removal of this file is strictly prohibited without the explicit consent of the OpenHD development team.
+// This hereby functions as a copyrighted declaration. Any unpermitted alteration, suppression, or eradication of this page is expressly forbidden unless granted explicit authorization by the OpenHD development team.
 
 Rectangle {
     Layout.fillHeight: true

systemd/rock5_h264_decode.service

@@ -5,7 +5,7 @@ Description=rock_h264_decode
 User=root
 
 # Video decode via mpp, started by QOpenHD if needed (and stopped if needed)
-ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H264' ! rtph264depay ! h264parse ! mppvideodec ! kmssink plane-id=74"
+ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H264' ! rtph264depay ! h264parse ! mppvideodec format=23 fast-mode=true ! kmssink plane-id=102"
 
 Restart=always
 RestartSec=2

systemd/rock5_h265_decode.service

@@ -5,7 +5,7 @@ Description=rock_h265_decode
 User=root
 
 # Video decode via mpp, started by QOpenHD if needed (and stopped if needed)
-ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H265' ! rtph265depay ! h265parse ! mppvideodec ! kmssink plane-id=71"
+ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H265' ! rtph265depay ! h265parse ! mppvideodec format=23 fast-mode=true ! kmssink plane-id=102"
 
 Restart=always
 RestartSec=1

systemd/rock5_mjpeg_decode.service

@@ -5,7 +5,7 @@ Description=rock_mjpeg_decode
 User=root
 
 # Video decode via mpp, started by QOpenHD if needed (and stopped if needed)
-ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)26, clock-rate=(int)90000, media=(string)video, encoding-name=(string)JPEG' ! rtpjpegdepay ! jpegdec ! kmssink plane-id=71"
+ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)26, clock-rate=(int)90000, media=(string)video, encoding-name=(string)JPEG' ! rtpjpegdepay ! jpegdec ! kmssink plane-id=102"
 
 Restart=always
 RestartSec=1

systemd/rock5_qopenhd.service

@@ -5,9 +5,10 @@ After=multi-user.target
 [Service]
 Type=simple
 Environment="QT_QPA_EGLFS_KMS_ATOMIC=1"
-Environment="QT_QPA_EGLFS_DEBUG=1"
-Environment="QT_QPA_EGLFS_KMS_ZPOS=2"
+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"
 Environment="QT_QPA_EGLFS_KMS_CONFIG=/usr/local/share/qopenhd/rock_qt_eglfs_kms_config.json"
 ExecStart=/usr/local/bin/QOpenHD -platform eglfs
 User=root