building rock stuff

OpenHD · Nov 17, 2023 · 26457c3 · 26457c3
1 parent 63ee873
commit 26457c3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 16 deletions.
diff --git a/.github/workflows/build_package_Rock5.yml b/.github/workflows/build_package_Rock5.yml
@@ -3,10 +3,9 @@ name: build_package_rock5_debian
 on:
   push:
    branches:
-      - "2.5-evo"
+      - "rapha"
       - "dev-release"
       - "release"
-      - "rapha"
    paths-ignore:
       - '**.md'
       - '**.asciidoc'

diff --git a/package.sh b/package.sh
@@ -10,7 +10,6 @@ DISTRO=$3
 BUILD_TYPE=$4
 
 
-PACKAGE_NAME=qopenhd
 TMPDIR=/tmp/qopenhd/
 
 rm -rf /tmp/qopenhd/*
@@ -55,22 +54,25 @@ 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"
 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"
+PLATFORM_PACKAGES="-d qml-module-qtcharts -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
 
 cp release/QOpenHD /tmp/qopenhd/usr/local/bin/ || exit 1
 
 # copying services
 if [[ "${PACKAGE_ARCH}" = "armhf" ]]; then
+PACKAGE_NAME=qopenhd
 cp systemd/rpi_qopenhd.service /tmp/qopenhd/etc/systemd/system/qopenhd.service || exit 1
 cp systemd/rpi_h264_decode.service /tmp/qopenhd/etc/systemd/system/h264_decode.service || exit 1
 elif [[ "${PACKAGE_ARCH}" = "arm64" ]]; then
-cp systemd/rock5_qopenhd.service /tmp/qopenhd/etc/systemd/system/qopenhd.service || exit 1
-cp systemd/rock5_h264_decode.service /tmp/qopenhd/etc/systemd/system/h264_decode.service || exit 1
-cp systemd/rock5_h265_decode.service /tmp/qopenhd/etc/systemd/system/h265_decode.service || exit 1
-cp systemd/rock5_mjpeg_decode.service /tmp/qopenhd/etc/systemd/system/mjpeg_decode.service || exit 1
+mkdir -p /tmp/qopenhd/etc/systemd/system/
+cp systemd/rock3_qopenhd.service /tmp/qopenhd/etc/systemd/system/qopenhd.service
+cp systemd/rock3_h264_decode.service /tmp/qopenhd/etc/systemd/system/h264_decode.service
+cp systemd/rock3_h265_decode.service /tmp/qopenhd/etc/systemd/system/h265_decode.service
+PACKAGE_NAME=qopenhd_rk3566
 else
-echo "X86 doesn't autostart the services"
+PACKAGE_NAME=qopenhd
+echo "X86 doesn't work with services"
 fi
 
 # The qt_eglfs_kms_config.json file makes sure that qopenhd runs at the res
@@ -82,12 +84,31 @@ elif [[ "${PACKAGE_ARCH}" = "arm64" ]]; then
 cp rock_qt_eglfs_kms_config.json /tmp/qopenhd/usr/local/share/qopenhd/ || exit 1
 fi
 
-VERSION="2.5.1-evo-alpha-$(date '+%Y%m%d%H%M')-${VER2}"
+VERSION="2.5.3-$(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 \
-  ${PLATFORM_PACKAGES} || exit 1
+if [[ "${PACKAGE_ARCH}" = "armhf" ]]; 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 \
+    ${PLATFORM_PACKAGES} || exit 1
+elif [[ "${PACKAGE_ARCH}" = "arm64" ]]; then
+    fpm -a ${PACKAGE_ARCH} -s dir -t deb -n qopenhd_rk3566 -v ${VERSION} -C ${TMPDIR} \
+    -p qopenhd_rk3566_VERSION_ARCH.deb \
+    --after-install after-install.sh \
+    ${PLATFORM_PACKAGES} || exit 1
+    #Rock5Package
+
+    rm /tmp/qopenhd/etc/systemd/system/qopenhd.service
+    rm /tmp/qopenhd/etc/systemd/system/h264_decode.service
+    rm /tmp/qopenhd/etc/systemd/system/h265_decode.service
+
+    cp systemd/rock5_qopenhd.service /tmp/qopenhd/etc/systemd/system/qopenhd.service
+    cp systemd/rock5_h264_decode.service /tmp/qopenhd/etc/systemd/system/h264_decode.service
+    cp systemd/rock5_h265_decode.service /tmp/qopenhd/etc/systemd/system/h265_decode.service
+
+    fpm -a ${PACKAGE_ARCH} -s dir -t deb -n qopenhd_rk3588 -v ${VERSION} -C ${TMPDIR} \
+    -p qopenhd_rk3588_VERSION_ARCH.deb \
+    --after-install after-install.sh \
+    ${PLATFORM_PACKAGES} || exit 1
+fi