From e513f51f58259af355254cfba6c865ac24485a8b Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Sun, 27 Aug 2023 16:30:05 +0200
Subject: [PATCH 01/11] make it legally binding

---
 qml/ui/configpopup/Credits.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qml/ui/configpopup/Credits.qml b/qml/ui/configpopup/Credits.qml
index f027a8109..265bbb814 100644
--- a/qml/ui/configpopup/Credits.qml
+++ b/qml/ui/configpopup/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

From 349ef98abffac9d6339af9756e3fc666b4a0894e Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Sun, 27 Aug 2023 16:35:43 +0200
Subject: [PATCH 02/11] credits

---
 LICENSE                            | 4 ++++
 qml/ui/configpopup/ConfigPopup.qml | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 53d1f3d01..a59201f91 100644
--- a/LICENSE
+++ b/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,
diff --git a/qml/ui/configpopup/ConfigPopup.qml b/qml/ui/configpopup/ConfigPopup.qml
index 42a74618b..94942b87a 100644
--- a/qml/ui/configpopup/ConfigPopup.qml
+++ b/qml/ui/configpopup/ConfigPopup.qml
@@ -648,7 +648,8 @@ Rectangle {
         AppDeveloperStatsPanel {
             id: appDeveloperStatsPanel
         }
-
+        
+        // This Credits 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.
         Credits {
             id: creditspanel
         }

From d4155ecf85ac0faee47e03f5ce69f685fe73add6 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Sat, 9 Sep 2023 20:35:06 +0200
Subject: [PATCH 03/11] remove custom qt and increase version

---
 .github/workflows/build_package_x86_jammy.yml |  2 +-
 before-install.sh                             |  4 ++++
 package.sh                                    | 11 ++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 before-install.sh

diff --git a/.github/workflows/build_package_x86_jammy.yml b/.github/workflows/build_package_x86_jammy.yml
index 28cc3504d..c5d6eb809 100644
--- a/.github/workflows/build_package_x86_jammy.yml
+++ b/.github/workflows/build_package_x86_jammy.yml
@@ -33,7 +33,7 @@ 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
 
         
         
diff --git a/before-install.sh b/before-install.sh
new file mode 100644
index 000000000..3b7d1a8ac
--- /dev/null
+++ b/before-install.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+#remove custom QT
+sudo apt remove -y openhd-qt-jammy
\ No newline at end of file
diff --git a/package.sh b/package.sh
index 466b711f5..8929bb3e9 100755
--- a/package.sh
+++ b/package.sh
@@ -85,11 +85,20 @@ 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
+
+if [[ "${DISTRO}" == "jammy" ]] && [[ "${OS}" == "ubuntu" ]] ; then
+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 \
+  --before-install before-install.sh \
+  ${PLATFORM_PACKAGES} || exit 1
+else
 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 \
   ${PLATFORM_PACKAGES} || exit 1
+fi
\ No newline at end of file

From bebc4b7b2c4ac181c66f125bd572f3d0e13ceab2 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Sat, 9 Sep 2023 21:00:05 +0200
Subject: [PATCH 04/11] remove custom qt linker

---
 .github/workflows/build_package_x86_jammy.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/build_package_x86_jammy.yml b/.github/workflows/build_package_x86_jammy.yml
index c5d6eb809..33c67a3ec 100644
--- a/.github/workflows/build_package_x86_jammy.yml
+++ b/.github/workflows/build_package_x86_jammy.yml
@@ -40,14 +40,6 @@ jobs:
 
     - 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

From 085cc09b0dd27e4cfe012bdc02e27dd06f85ec73 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Sat, 9 Sep 2023 21:18:15 +0200
Subject: [PATCH 05/11] Update package.sh

---
 package.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package.sh b/package.sh
index 8929bb3e9..08c5fcb1b 100755
--- a/package.sh
+++ b/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
@@ -101,4 +98,4 @@ fpm -a ${PACKAGE_ARCH} -s dir -t deb -n ${PACKAGE_NAME} -v ${VERSION} -C ${TMPDI
   -p qopenhd_VERSION_ARCH.deb \
   --after-install after-install.sh \
   ${PLATFORM_PACKAGES} || exit 1
-fi
\ No newline at end of file
+fi

From 6b73ef3707eadb0ae26ac0968801032a5cf2a05f Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Sat, 9 Sep 2023 21:21:54 +0200
Subject: [PATCH 06/11] Update before-install.sh

remove old QT version in x86
---
 before-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/before-install.sh b/before-install.sh
index 3b7d1a8ac..7288ecf67 100644
--- a/before-install.sh
+++ b/before-install.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 #remove custom QT
-sudo apt remove -y openhd-qt-jammy
\ No newline at end of file
+dpkg -r openhd-qt-jammy || true

From af58b8c01805eb64d0242b94ceae35c5c8efbb17 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Sat, 9 Sep 2023 21:36:14 +0200
Subject: [PATCH 07/11] works better without

---
 package.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/package.sh b/package.sh
index 08c5fcb1b..363abaa8d 100755
--- a/package.sh
+++ b/package.sh
@@ -87,15 +87,7 @@ VERSION="2.5-evo-$(date '+%Y%m%d%H%M')-${VER2}"
 rm ${PACKAGE_NAME}_${VERSION}_${PACKAGE_ARCH}.deb > /dev/null 2>&1
 ls -a
 
-if [[ "${DISTRO}" == "jammy" ]] && [[ "${OS}" == "ubuntu" ]] ; then
 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 \
-  --before-install before-install.sh \
   ${PLATFORM_PACKAGES} || exit 1
-else
-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 \
-  ${PLATFORM_PACKAGES} || exit 1
-fi

From eff119de333494b5afb4ddaa4e097ab2698f5726 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Tue, 12 Sep 2023 17:36:46 +0200
Subject: [PATCH 08/11] Update rock5_qopenhd.service

---
 systemd/rock5_qopenhd.service | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/systemd/rock5_qopenhd.service b/systemd/rock5_qopenhd.service
index 0101783fc..4f9f660b5 100644
--- a/systemd/rock5_qopenhd.service
+++ b/systemd/rock5_qopenhd.service
@@ -5,10 +5,13 @@ 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=1"
 Environment="QT_QPA_EGLFS_FORCE888=1"
-Environment="QT_QPA_EGLFS_KMS_CONFIG=/usr/local/share/qopenhd/rock_qt_eglfs_kms_config.json"
+Environment="QT_QPA_EGLFS_SWAPINTERVAL=0"
+Environment="QT_QPA_EGLFS_KMS_CONFIG=/usr/local/share/qopenhd/rock_qt_eglfs_kms>
+ExecStart=/usr/local/bin/QOpenHD -platform eglfs
+
 ExecStart=/usr/local/bin/QOpenHD -platform eglfs
 User=root
 Restart=always

From d41f457b8080b7c858c624c0eb1b2e746757ebb2 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Wed, 13 Sep 2023 01:09:32 +0200
Subject: [PATCH 09/11] finish rock5 low latency decode

---
 .github/workflows/build_package_x86_jammy.yml | 3 ---
 systemd/rock5_h264_decode.service             | 2 +-
 systemd/rock5_h265_decode.service             | 2 +-
 systemd/rock5_mjpeg_decode.service            | 2 +-
 systemd/rock5_qopenhd.service                 | 6 ++----
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_package_x86_jammy.yml b/.github/workflows/build_package_x86_jammy.yml
index 33c67a3ec..03d9adf54 100644
--- a/.github/workflows/build_package_x86_jammy.yml
+++ b/.github/workflows/build_package_x86_jammy.yml
@@ -35,9 +35,6 @@ jobs:
         sudo add-apt-repository universe
         sudo ./install_build_dep.sh ubuntu-x86
 
-        
-        
-
     - name: Build with make
       run: |
         sudo ./package.sh x86_64 ubuntu jammy
diff --git a/systemd/rock5_h264_decode.service b/systemd/rock5_h264_decode.service
index cb0d87f06..b4bb80f69 100644
--- a/systemd/rock5_h264_decode.service
+++ b/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
diff --git a/systemd/rock5_h265_decode.service b/systemd/rock5_h265_decode.service
index e8c0854d4..12d7b0227 100644
--- a/systemd/rock5_h265_decode.service
+++ b/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
diff --git a/systemd/rock5_mjpeg_decode.service b/systemd/rock5_mjpeg_decode.service
index 574a8c645..1f9bee4c5 100644
--- a/systemd/rock5_mjpeg_decode.service
+++ b/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
diff --git a/systemd/rock5_qopenhd.service b/systemd/rock5_qopenhd.service
index 4f9f660b5..ea8303487 100644
--- a/systemd/rock5_qopenhd.service
+++ b/systemd/rock5_qopenhd.service
@@ -6,12 +6,10 @@ After=multi-user.target
 Type=simple
 Environment="QT_QPA_EGLFS_KMS_ATOMIC=1"
 Environment="QT_LOGGING_RULES=qt.qpa.egl*=true"
-Environment="QT_QPA_EGLFS_KMS_PLANE_INDEX=1"
+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>
-ExecStart=/usr/local/bin/QOpenHD -platform eglfs
-
+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
 Restart=always

From 7993595f0f665805338ce436820e40725f477de3 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Wed, 20 Sep 2023 00:42:40 +0200
Subject: [PATCH 10/11] remove custom qt in build-test

---
 .github/workflows/ubuntu22_build_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ubuntu22_build_test.yml b/.github/workflows/ubuntu22_build_test.yml
index 53203d109..2eafcc0ec 100644
--- a/.github/workflows/ubuntu22_build_test.yml
+++ b/.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: |

From 96460f0b671809ca966ce6178b77093c3fefc74d Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Wed, 20 Sep 2023 01:01:42 +0200
Subject: [PATCH 11/11] add qml-module-qt-labs-platform

---
 install_build_dep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_build_dep.sh b/install_build_dep.sh
index c4fe9ece7..ba21e241e 100755
--- a/install_build_dep.sh
+++ b/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"