From 6ae10cd22239b0ae2a7387004f6b57a6683ed744 Mon Sep 17 00:00:00 2001 From: vladimir-dergachyov-grse Date: Sun, 26 Jan 2025 23:41:35 +0500 Subject: [PATCH 1/3] Add deb package build for Ubuntu24.04 and flatpak package build for any linux system --- .gitignore | 4 + deb/build-package.sh | 103 ++++++++++++++++++ .../DEBIAN/control | 25 +++++ .../DEBIAN/postinst | 5 + .../share/applications/OnvifPlayer.desktop | 9 ++ .../usr/share/icons/onvif-player.png | Bin 0 -> 2318 bytes flatpak/build-package.sh | 80 ++++++++++++++ flatpak/org.onvif.Player.yaml | 48 ++++++++ flatpak/share/org.onvif.Player.desktop | 8 ++ flatpak/share/org.onvif.Player.png | Bin 0 -> 1878 bytes player/CMakeLists.txt | 3 +- 11 files changed, 284 insertions(+), 1 deletion(-) create mode 100755 deb/build-package.sh create mode 100644 deb/onvif-player_ubuntu24.04-amd64/DEBIAN/control create mode 100644 deb/onvif-player_ubuntu24.04-amd64/DEBIAN/postinst create mode 100644 deb/onvif-player_ubuntu24.04-amd64/usr/share/applications/OnvifPlayer.desktop create mode 100644 deb/onvif-player_ubuntu24.04-amd64/usr/share/icons/onvif-player.png create mode 100755 flatpak/build-package.sh create mode 100644 flatpak/org.onvif.Player.yaml create mode 100644 flatpak/share/org.onvif.Player.desktop create mode 100644 flatpak/share/org.onvif.Player.png diff --git a/.gitignore b/.gitignore index f5bcbf1..27306d1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,7 @@ setup/input/ setup/output/ **/validation_results.txt **/openssl_onvif_log.txt + +player/build/ +deb/build/ +flatpak/build/ \ No newline at end of file diff --git a/deb/build-package.sh b/deb/build-package.sh new file mode 100755 index 0000000..ba836a7 --- /dev/null +++ b/deb/build-package.sh @@ -0,0 +1,103 @@ +#!/bin/bash + +# Exit on error +set -e + +# Function to check Ubuntu version +check_ubuntu_version() { + if [[ $(lsb_release -rs) != "24.04" || $(lsb_release -is) != "Ubuntu" ]]; then + echo "Error: This script is only for Ubuntu 24.04." + exit 1 + fi +} + +# Check the system is Ubuntu 24.04 +check_ubuntu_version + +# Install required packages +sudo apt update -y && sudo apt install -y libssl-dev cmake build-essential qtbase5-dev qt5-qmake libqt5multimedia5-plugins qtmultimedia5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav gstreamer1.0-tools gstreamer1.0-x gstreamer1.0-alsa gstreamer1.0-gl gstreamer1.0-gtk3 gstreamer1.0-qt5 gstreamer1.0-pulseaudio + +# Parse arguments +if [[ $# -ne 4 ]]; then + echo "Usage: $0 " + exit 1 +fi + +BUILD_TYPE=$1 +SIGNING_TYPE=$2 +FFMPEG_PATH=$3 +VERSION=$4 + +TEMPLATE_PACKAGE_NAME=onvif-player_ubuntu24.04-amd64 +PACKAGE_NAME=onvif-player-${VERSION}_ubuntu24.04-amd64 + +# Validate BUILD_TYPE +if [[ $BUILD_TYPE != "Release" && $BUILD_TYPE != "Debug" ]]; then + echo "Error: BUILD_TYPE must be 'Release' or 'Debug'." + exit 1 +fi + +# Validate SIGNING_TYPE +if [[ $SIGNING_TYPE != "threaded-signing" && $SIGNING_TYPE != "unthreaded-signing" ]]; then + echo "Error: SIGNING_TYPE must be 'threaded-signing' or 'unthreaded-signing'." + exit 1 +fi + +# Validate FFMPEG_PATH +if [[ ! -d $FFMPEG_PATH ]]; then + echo "Error: FFMPEG_PATH does not exist or is not a directory." + exit 1 +fi + +# Step 6: Remove and recreate 'build' directory +rm -rf build +mkdir build + +# Prepare build folder +cp -r $TEMPLATE_PACKAGE_NAME build/$PACKAGE_NAME +ln -s -r ../player build/player + +cd build + +# Prepare postinst file +chmod 775 $PACKAGE_NAME/DEBIAN/postinst + +# Replace $VERSION in control file +sed -i "s/\$VERSION/$VERSION/g" $PACKAGE_NAME/DEBIAN/control + +# Replace $VERSION in desktop file +mkdir -p $PACKAGE_NAME/usr/share/applications +sed -i "s/\$VERSION/$VERSION/g" $PACKAGE_NAME/usr/share/applications/OnvifPlayer.desktop + +cd player + +# Create build folder +mkdir -p build +cd build + +# Run cmake +cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPLUGIN_NAME=$SIGNING_TYPE -DFFMPEG_PATH=$FFMPEG_PATH .. + +# Build the project +cmake --build . -j $(nproc) + +cd ../.. + +# Copy ONVIFPlayer binary +mkdir -p $PACKAGE_NAME/usr/local/bin +cp player/build/bin/${BUILD_TYPE}/ONVIFPlayer $PACKAGE_NAME/usr/local/bin/onvif-player +chmod 775 $PACKAGE_NAME/usr/local/bin/onvif-player + +# Copy FFmpeg shared libraries +mkdir -p $PACKAGE_NAME/usr/local/lib +cp -r $FFMPEG_PATH/lib $PACKAGE_NAME/usr/local/lib/onvif-player +rm -rf $PACKAGE_NAME/usr/local/lib/onvif-player/libavdevice.* +rm -rf $PACKAGE_NAME/usr/local/lib/onvif-player/libavfilter.* +rm -rf $PACKAGE_NAME/usr/local/lib/onvif-player/libpostproc.* +rm -rf $PACKAGE_NAME/usr/local/lib/onvif-player/pkgconfig + +# Step 20: Build Debian package +dpkg-deb --build $PACKAGE_NAME + +echo "Debian package built successfully: $PACKAGE_NAME" + diff --git a/deb/onvif-player_ubuntu24.04-amd64/DEBIAN/control b/deb/onvif-player_ubuntu24.04-amd64/DEBIAN/control new file mode 100644 index 0000000..054ef5c --- /dev/null +++ b/deb/onvif-player_ubuntu24.04-amd64/DEBIAN/control @@ -0,0 +1,25 @@ +Package: onvif-player +Version: $VERSION +Maintainer: Vladimir Dergachyov +Architecture: amd64 +Description: Onvif Player $VERSION +Depends: libssl3t64, + libqt5core5t64, + libqt5gui5t64, + libqt5network5t64, + libqt5widgets5t64, + libqt5multimedia5-plugins, + libgstreamer1.0-0, + gstreamer1.0-plugins-base, + gstreamer1.0-plugins-good, + gstreamer1.0-plugins-bad, + gstreamer1.0-plugins-ugly, + gstreamer1.0-libav, + gstreamer1.0-tools, + gstreamer1.0-x, + gstreamer1.0-alsa, + gstreamer1.0-gl, + gstreamer1.0-gtk3, + gstreamer1.0-qt5, + gstreamer1.0-pulseaudio + diff --git a/deb/onvif-player_ubuntu24.04-amd64/DEBIAN/postinst b/deb/onvif-player_ubuntu24.04-amd64/DEBIAN/postinst new file mode 100644 index 0000000..f446552 --- /dev/null +++ b/deb/onvif-player_ubuntu24.04-amd64/DEBIAN/postinst @@ -0,0 +1,5 @@ +#!/bin/bash + +echo "/usr/local/lib/onvif-player" > /etc/ld.so.conf.d/onvif-player.conf +ldconfig + diff --git a/deb/onvif-player_ubuntu24.04-amd64/usr/share/applications/OnvifPlayer.desktop b/deb/onvif-player_ubuntu24.04-amd64/usr/share/applications/OnvifPlayer.desktop new file mode 100644 index 0000000..c360164 --- /dev/null +++ b/deb/onvif-player_ubuntu24.04-amd64/usr/share/applications/OnvifPlayer.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Onvif Player +Comment=Onvif Player $VERSION +Exec=/usr/local/bin/onvif-player +Icon=/usr/share/icons/onvif-player.png +Terminal=false +Type=Application +Categories=AudioVideo; + diff --git a/deb/onvif-player_ubuntu24.04-amd64/usr/share/icons/onvif-player.png b/deb/onvif-player_ubuntu24.04-amd64/usr/share/icons/onvif-player.png new file mode 100644 index 0000000000000000000000000000000000000000..138a5414f34b70c9a426c602f9c442ae31ad8e98 GIT binary patch literal 2318 zcmZ{mX*3jU8^`YjC!^kos28}g5G@YzjCfQX;H6>e< zdYYHUpolC(y_D%8q$b<&&hvhF&v`#Q=RVi{Kj(j4zw!`Jx(V@9GRdq9y?33;;Iy7I^`HEBwK4{s5p#0XPs<(Q(d{-+%@< zqHVzL-><5>p@8p*M%jB2`D*{)vg->s2S9l7jE$8$jy>QVo>zEYK81CgBB~ZNEoGgp z_P#Rf@<8qzHdaH!oA5a-F#O(OIlau7HgaJh<_%Z)<-O^rPr{`qhTcv%;O;j$FG?0U z=80wiJHqoi&&iKx^VG_DsS1zONbKJUyy%|Wytue$+Itt*HD*{O7L#Qx#X*fR|IQ`LWWLe0=aCC$uvMhTU0v zHQ=6twq5p^PlE09NUN@Tjh4>LxN9z#&$F_++qe+z(W4vIT8VnX-L4hEt})xZ+%Mma z5yCsWr#UoA-Ge#z8N!irs>fEt?qtC=*OFeqJ3W?iep4bBx-|tpSi~Q8q5X2dZ1k98 zCs;&vs8?V1C_IFo2*=dd=*Yxc+6v2;o*!a)?p){oufOYSJ@kZpIpBliO;PqTOT7|&rAwU#5U7CNgEtZMwt%~bw5(skf zjTDV*m^9rP8u!btkLarQ7xswJ0M5mYKojcCKt47qiov@}*TAl>)DK!LlI*XE1f~SczTjdl87m1drvj%xjw} zoXYbtzhrRax<+5ZowYqu&-$wdO?&3D2FB8^?jM_8nfq-;`iN7eCx9h>=6EmnJGV zk#rZGtr1dwkl(QqU2s(>N|`PO9K!?}eTr`+(h%uT*L3SNOK5PUdSB=Y%71i=)eUYY zb;kPFzkM#mg0M^^$>f(}Z016jI+>RrLj9~wRt7p?zie)$VOOqhE#i)@=ZF25rNX2Z zs=9W!vo35M8c+mU^D+=c=W;iQwiBE{S;A_KaCsHN_$XFo1acKs(f4{u)MGMh;>$oD zTa5apJ3ixd-EiJtE6Yw(#W?>z?pBiP~J?b>u5!MEL)IX zVQ1L#>ZqaqKA7IYVScQ^a+wz;P5XmugbE@`RemM;NLeq)L~(`I)MlH#uubvG^A3^Iu=o`)d^ zkrQ7jJF7eKn&kEb~0RtmSJ4LUDTlLNJ5h08yO;12j~}!APthO3R3ee zs=2C8tw@P;7{YOz_C$8|MT(QmM(4ZXRz{1%b0lWpO;)cS@}XV^>Idy)cLruY(D>={ zcwBy;p3sT{_;qYj*dI;PXL?tV+{PT}OId=mKBG5Tx^uX=I!Xxl0!(FnW$yIX*2Al& z@;hLXOKOqX5CReqc)rz+ zD*5~)C3WUB-!?&P%Sk+jAS$8DiXwnk!l0|0?MaP$Jwi2@P|=!y*WRPtFXfkw^PD!a znc84dC2d?5p7K{<_N$EgM&grWq{X&o5k_p;Z@&H<6~`;39_8eZCN_F&fV>Z|Jo@YY zkbjf_3?WJT=}X5r9~^OABC~IcVmMK}eSs-2&$aL5M56p9?R2X@p~9F9n`?>U0`^jp z8qNpJZ0%mDl7so9&BN5~@zzqrX94mHRnMZx&}S28q%lWBP@gZ6%*ih59Sp-7xG-H;^#j5z`wA}_F!bV|pkM8R zphsGq)UIM#{sC|#))pHZbSX9%6&MrD7hr%eFw#Nj>lh&2^-WOv#weu8aRdT|K(x;` zY5X4$5gCLJN%&`=uUndbhyeKi5@PWY!Nk~05mEolP#Y0wJ_F9!p0#PQ_D}l{+4&r0 literal 0 HcmV?d00001 diff --git a/flatpak/build-package.sh b/flatpak/build-package.sh new file mode 100755 index 0000000..bfac227 --- /dev/null +++ b/flatpak/build-package.sh @@ -0,0 +1,80 @@ +#!/bin/bash + +# Exit immediately if a command exits with a non-zero status +set -e + +# Validate arguments +if [ "$#" -ne 4 ]; then + echo "Usage: $0 " + exit 1 +fi + +BUILD_TYPE=$1 +SIGNING_TYPE=$2 +FFMPEG_PATH=$3 +VERSION=$4 + +# Check if the first argument is Release or Debug +if [[ "$BUILD_TYPE" != "Release" && "$BUILD_TYPE" != "Debug" ]]; then + echo "Error: First argument must be 'Release' or 'Debug'." + exit 1 +fi + +# Check if the second argument is threaded-signing or unthreaded-signing +if [[ "$SIGNING_TYPE" != "threaded-signing" && "$SIGNING_TYPE" != "unthreaded-signing" ]]; then + echo "Error: Second argument must be 'threaded-signing' or 'unthreaded-signing'." + exit 1 +fi + +# Check if the third argument is a valid directory +if [ ! -d "$FFMPEG_PATH" ]; then + echo "Error: Third argument must be a valid directory." + exit 1 +fi + +# Check if flatpak is installed and executable +if ! command -v flatpak &> /dev/null; then + echo "Error: 'flatpak' is not installed or not in PATH. Please install it and try again." + exit 1 +fi + +# Check if flatpak-builder is installed and executable +if ! command -v flatpak-builder &> /dev/null; then + echo "Error: 'flatpak-builder' is not installed or not in PATH. Please install it and try again." + exit 1 +fi + +# Remove 'build' directory if it exists and create a new one +rm -rf build +mkdir build + +# Copy necessary files to the build directory +cp org.onvif.Player.yaml build/ + +# Create a symlink to the player folder in the build directory +ln -s -r "../player" build/player + +# Create a symlink to the ffmpeg folder in the build directory +ln -s "$FFMPEG_PATH" build/ffmpeg + +# Create a symlink to the share folder in the build directory +ln -s -r "./share" build/share + +# Change to the build directory +cd build + +# Replace placeholders in 'org.onvif.Player.yaml' +sed -i "s|\$BUILD_TYPE|$BUILD_TYPE|g" org.onvif.Player.yaml +sed -i "s|\$SIGNING_TYPE|$SIGNING_TYPE|g" org.onvif.Player.yaml + +# Add the Flathub repository if it doesn't exist +flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo + +# Build the Flatpak package +flatpak-builder --force-clean --install-deps-from=flathub --repo=repo builddir org.onvif.Player.yaml + +# Create the Flatpak bundle +flatpak build-bundle repo onvif-player-$VERSION-x86_64.flatpak org.onvif.Player + +echo "Build completed successfully. Output file: onvif-player-$VERSION-x86_64.flatpak" + diff --git a/flatpak/org.onvif.Player.yaml b/flatpak/org.onvif.Player.yaml new file mode 100644 index 0000000..3831870 --- /dev/null +++ b/flatpak/org.onvif.Player.yaml @@ -0,0 +1,48 @@ +app-id: org.onvif.Player +runtime: org.kde.Platform +runtime-version: 5.15-24.08 +sdk: org.kde.Sdk +command: onvif-player +finish-args: + - --socket=pulseaudio + - --device=all + - --filesystem=host + - --socket=x11 + - --socket=fallback-x11 +cleanup-commands: + - find /app/ffmpeg -mindepth 1 -maxdepth 1 ! -name 'lib' -exec rm -rf {} \; + - rm -rf /app/ffmpeg/lib/libavdevice.* + - rm -rf /app/ffmpeg/lib/libavfilter.* + - rm -rf /app/ffmpeg/lib/libpostproc.* + - rm -rf /app/ffmpeg/lib/pkgconfig +modules: + - name: ffmpeg + buildsystem: simple + build-commands: + - mkdir -p /app/ffmpeg + - cp -r ./* /app/ffmpeg + sources: + - type: dir + path: ffmpeg + - name: onvif-player + buildsystem: simple + builddir: true + build-commands: + - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPLUGIN_NAME=$SIGNING_TYPE -DFFMPEG_PATH=/app/ffmpeg . + - cmake --build . -j $(nproc) + - mkdir -p /app/bin + - mv bin/$BUILD_TYPE/ONVIFPlayer /app/bin/onvif-player + sources: + - type: dir + path: player + - name: share + buildsystem: simple + builddir: true + build-commands: + - mkdir -p /app/share/applications + - cp org.onvif.Player.desktop /app/share/applications/ + - mkdir -p /app/share/icons/hicolor/32x32/apps + - cp org.onvif.Player.png /app/share/icons/hicolor/32x32/apps/ + sources: + - type: dir + path: share diff --git a/flatpak/share/org.onvif.Player.desktop b/flatpak/share/org.onvif.Player.desktop new file mode 100644 index 0000000..e078eb2 --- /dev/null +++ b/flatpak/share/org.onvif.Player.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Onvif Player +Comment=Onvif Player 3.0-alpha +Exec=onvif-player +Icon=org.onvif.Player +Terminal=false +Type=Application +Categories=AudioVideo; diff --git a/flatpak/share/org.onvif.Player.png b/flatpak/share/org.onvif.Player.png new file mode 100644 index 0000000000000000000000000000000000000000..c6fe1e1bbb8818abd17ffa694ce96ecc5fa9e169 GIT binary patch literal 1878 zcmZ`)dpOgJ8~<(`lU&a)b4g0Z=vYmxa0o-}$a245mRVuuHge8fqU1~*3gs3ml;Ma@ z6GyYJ)>AE(WjNI4OlU5JQm#Av)<3`J`TcR8_j%vX^M2mv^Spn3o=?6f-c?0OR|xy$FdtQd*5<) zQ&wz+D69E=lTShPvF+_mtzVybs(yWbS+LKNJToS3 z4r|kRJ+mmBdrw)r_{6SD=k9mmV{S*DG^lf)sB?(&MNJ#3P{jF```{A+_1+V8?>EJ4_Hm!=zW!%~OL zO}RMU>Ya1xj^w$t)Xj+rtA{zr@O2B*8T1`du=tgQRlo4@QB1j+S83<~?)(gX+pn2) zx@{#1m;Ck-j!t8Su9L<%Nn_BTWkn&Vw_t_1V<%moBRSz)w{B1j<>%GMKAv6BQ=N)S%y2JELbWe72Q06ThWQ$X zuv~&{BRczGEgILEZ~W-yUG(^J#OZKb>ZFIJq#FrOG^|Qm@_$%Q35bxKjp*C>Pdj{e z$-XmRQ5_rC{U$gqLSIoIdmvXGtL%E^!B}f-!i|rkDjdkfiS}A`r{6Z#lCtD8_N?1_ zLULW%o3N9GF(|W^&*h|^`QK0a`ZHTRJFmER(Dyzo)Mrwrnz>n=X|iSN<{w>K`@kdF zTo9R)dCegvlI;7z-^W7Jr6hNl+e3BD5-}Eb_NwyJQVbpJmk**f0_DnH^X$#;^!q*J zn?;vgT@Z3>q}7})RrbmkPMR|8f`h_is2;>0@<%=0>}qQo#w9P*{i;n}f6Zg+s5FSP z>)y_oaW*j}psxnJ*o4z^AJQm!YGmqtE*ZK1boo#|s;<(mRY7;x@<}So>ZcOxs>?zT zI|kevxz=cNui7!;0Uw4C*Ls(nN~NYzLu*V<(kG!1mX3mM7_es+MIGvhFRF(5tOPn^ z6;W-1raUjd73rtOhC*@<z8KqjN%<0BzjenfQCk{ZL*UQY6s_HE{fa4?F zQ1uwDQwQBJ0sCdQt{ea(;{W^s*?p7jSf%WSgw0KBmPB!-q_=q%n;jt01AZ9VQy(QN zFYUcf-qp>>?S>EH;!7JAA~lRBSkvhoh#F`JBC941!QM#h(!Ai%wgDy`9Js^~*eUx| zw?+1SvLhl}Pfa0Pr$3~#cOt}m3TF_?N+E;&;9!BNK>u^ubXoI#|F0nf!VzUJr{SM4 z?0}I=oQ1>w#Y-F75_|&t^^0<7NKQ9z=>)-I84pyLr;&BA!r69f`CtQa?p;;uKGBh$ zjsC-{HD3lZOp1DShcCnl#BMOM?XoFBPShw#abLCok8c%IN}z-%A6s}O+q{u;^(O=) zqLE82Q}4QhXXaNzGjVa|&uV-eU@w5FbbsYMe+RX8y`Pl=VM6>PO;>T+Z#gTH!No4` z_;UkW$7mh31uM4g^lXgIY^`2mu@$qYPJUbQ0}Kz8&&4O&^PM*}#EZ}9$6e*m%N5JP zs_v$c0^(BNOBt{B5@~N1lKzHH=0M`siqt`sXow(32dwvie=kC1wLnw?AHA3OtkG(nY zv$3+6F-ma>Oo=*^Lb4$ylVkuKMIXhW(B`P4mcHiJHs;4|EUkY)qixXWE-?e~e*#KE uRLt35{$0RjX~+T%F!|qylo$$$nsSDc`0tw9CbX+e1K?cn&TUx2#s318t!tYA literal 0 HcmV?d00001 diff --git a/player/CMakeLists.txt b/player/CMakeLists.txt index 50821d1..a9ea8d3 100644 --- a/player/CMakeLists.txt +++ b/player/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT LINUX) message( FATAL_ERROR "Only for linux build" ) endif() -project(ONVIFPlayer VERSION 2.0.0 LANGUAGES CXX) +project(ONVIFPlayer VERSION 3.0.0 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -73,3 +73,4 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) add_subdirectory(src) + From 6dd3c0442279c174f437cb4eca99fb6b9688efc4 Mon Sep 17 00:00:00 2001 From: vladimir-dergachyov-grse Date: Sun, 26 Jan 2025 23:57:38 +0500 Subject: [PATCH 2/3] Fix .desktop in flatpak build --- flatpak/build-package.sh | 7 ++++--- flatpak/share/org.onvif.Player.desktop | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flatpak/build-package.sh b/flatpak/build-package.sh index bfac227..316a1d0 100755 --- a/flatpak/build-package.sh +++ b/flatpak/build-package.sh @@ -57,13 +57,14 @@ ln -s -r "../player" build/player # Create a symlink to the ffmpeg folder in the build directory ln -s "$FFMPEG_PATH" build/ffmpeg -# Create a symlink to the share folder in the build directory -ln -s -r "./share" build/share +# Prepare share folder +cp -r ./share build/share # Change to the build directory cd build -# Replace placeholders in 'org.onvif.Player.yaml' +# Replace placeholders +sed -i "s|\$VERSION|$VERSION|g" share/org.onvif.Player.desktop sed -i "s|\$BUILD_TYPE|$BUILD_TYPE|g" org.onvif.Player.yaml sed -i "s|\$SIGNING_TYPE|$SIGNING_TYPE|g" org.onvif.Player.yaml diff --git a/flatpak/share/org.onvif.Player.desktop b/flatpak/share/org.onvif.Player.desktop index e078eb2..c6d9d82 100644 --- a/flatpak/share/org.onvif.Player.desktop +++ b/flatpak/share/org.onvif.Player.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=Onvif Player -Comment=Onvif Player 3.0-alpha +Comment=Onvif Player $VERSION Exec=onvif-player Icon=org.onvif.Player Terminal=false From 96ef50e96ea7f98cdaaff9a47379ab9b321b6f14 Mon Sep 17 00:00:00 2001 From: vladimir-dergachyov-grse Date: Mon, 27 Jan 2025 00:20:44 +0500 Subject: [PATCH 3/3] Fix flatpak-bulder exec args --- flatpak/build-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/build-package.sh b/flatpak/build-package.sh index 316a1d0..1883af2 100755 --- a/flatpak/build-package.sh +++ b/flatpak/build-package.sh @@ -72,7 +72,7 @@ sed -i "s|\$SIGNING_TYPE|$SIGNING_TYPE|g" org.onvif.Player.yaml flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo # Build the Flatpak package -flatpak-builder --force-clean --install-deps-from=flathub --repo=repo builddir org.onvif.Player.yaml +flatpak-builder --force-clean --user --install-deps-from=flathub --repo=repo builddir org.onvif.Player.yaml # Create the Flatpak bundle flatpak build-bundle repo onvif-player-$VERSION-x86_64.flatpak org.onvif.Player