Minor fixes

roleoroleo · Mar 21, 2024 · b45d1ef · b45d1ef
1 parent 0a5c32b
commit b45d1ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/rRTSPServer/rRTSPServer.patch b/src/rRTSPServer/rRTSPServer.patch
@@ -1,6 +1,6 @@
-diff -Naur live.old/config.linux-cross live/config.linux-cross
---- live.old/config.linux-cross	1970-01-01 01:00:00.000000000 +0100
-+++ live/config.linux-cross	2021-09-20 15:10:19.404636105 +0200
+diff -Naur live.ori/config.linux-cross live/config.linux-cross
+--- live.ori/config.linux-cross	1970-01-01 01:00:00.000000000 +0100
++++ live/config.linux-cross	2021-02-18 10:39:28.103846011 +0100
 @@ -0,0 +1,17 @@
 +COMPILE_OPTS =		$(INCLUDES) -I. -O0 -ffunction-sections -fdata-sections -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNO_OPENSSL=1 -DRTP_PAYLOAD_MAX_SIZE=1352
 +C =			c
@@ -19,9 +19,9 @@ diff -Naur live.old/config.linux-cross live/config.linux-cross
 +LIBS_FOR_CONSOLE_APPLICATION =
 +LIBS_FOR_GUI_APPLICATION =
 +EXE =
-diff -Naur live.old/liveMedia/H264or5VideoStreamFramer.cpp live/liveMedia/H264or5VideoStreamFramer.cpp
---- live.old/liveMedia/H264or5VideoStreamFramer.cpp	2020-05-15 07:28:35.000000000 +0200
-+++ live/liveMedia/H264or5VideoStreamFramer.cpp	2021-09-20 15:11:00.460628257 +0200
+diff -Naur live.ori/liveMedia/H264or5VideoStreamFramer.cpp live/liveMedia/H264or5VideoStreamFramer.cpp
+--- live.ori/liveMedia/H264or5VideoStreamFramer.cpp	2021-01-29 16:48:41.000000000 +0100
++++ live/liveMedia/H264or5VideoStreamFramer.cpp	2021-02-18 10:48:26.500721004 +0100
 @@ -21,6 +21,7 @@
  #include "H264or5VideoStreamFramer.hh"
  #include "MPEGVideoStreamParser.hh"

diff --git a/src/static/static/yi-hack/script/system.sh b/src/static/static/yi-hack/script/system.sh
@@ -89,6 +89,7 @@ mount -o remount,noatime /backup/tools/ethdhcp.sh
 
 # Remove core files, if any
 rm -f $YI_HACK_PREFIX/bin/core
+rm -f $YI_HACK_PREFIX/script/core
 rm -f $YI_HACK_PREFIX/www/core
 rm -f $YI_HACK_PREFIX/www/cgi-bin/core
 rm -f $YI_HACK_PREFIX/core
@@ -195,7 +196,6 @@ if [[ $(get_config DISABLE_CLOUD) == "no" ]] ; then
         fi
         cd /home/app
         set_tz_offset -c osd -o off
-        sleep 2
         LD_LIBRARY_PATH="/tmp/sd/yi-hack/lib:/lib:/usr/lib:/home/lib:/home/qigan/lib:/home/app/locallib:/tmp/sd:/tmp/sd/gdb" ./rmm &
         sleep 6
         dd if=/tmp/audio_fifo of=/dev/null bs=1 count=8192
@@ -236,7 +236,6 @@ else
         fi
         cd /home/app
         set_tz_offset -c osd -o off
-        sleep 2
         LD_LIBRARY_PATH="/tmp/sd/yi-hack/lib:/lib:/usr/lib:/home/lib:/home/qigan/lib:/home/app/locallib:/tmp/sd:/tmp/sd/gdb" ./rmm &
         sleep 6
         dd if=/tmp/audio_fifo of=/dev/null bs=1 count=8192

diff --git a/src/static/static/yi-hack/script/thumb.sh b/src/static/static/yi-hack/script/thumb.sh
@@ -103,7 +103,7 @@ checkFiles ()
 				logAdd "[ERROR] checkFiles: create jpg FAILED - [${file}]. Using fallback.jpg."
 				rm -f $BASE_NAME.h26x
 				rm -f $BASE_NAME.jpg
-				cp /tmp/sd/yi-hack/etc/fallback.jpg $BASE_NAME.jpg
+				cp $YI_HACK_PREFIX/etc/fallback.jpg $BASE_NAME.jpg
 			fi
 			rm -f $BASE_NAME.h26x
 			logAdd "[INFO] checkFiles: createThumb SUCCEEDED - [${file}]."