add minor fix

Dockerfile.aarch64.bookworm

@@ -9,12 +9,13 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     /bin/sh -c /opt/scripts/install-base-deps.sh
 
 RUN git clone https://code.videolan.org/videolan/dav1d /opt/dav1d && cd /opt/dav1d && git checkout b546257
-RUN git clone -b SDL2 https://github.com/libsdl-org/SDL /opt/SDL2 && cd /opt/SDL2 && git checkout 9cc2f248f5437daaf090e3ef6afb4f6dc88068ac
+RUN git clone -b SDL2 https://github.com/libsdl-org/SDL /opt/SDL2 && cd /opt/SDL2 && git checkout dd01e096e9
 RUN git clone -b SDL2 https://github.com/libsdl-org/SDL_ttf /opt/SDL_ttf && cd /opt/SDL_ttf && git checkout 4a318f8dfaa1bb6f10e0c5e54052e25d3c7f3440
 RUN git clone -b jellyfin-mpp --depth=1 https://gitee.com/nyanmisaka/mpp.git /opt/rkmpp
 RUN git clone -b jellyfin-rga --depth=1 https://gitee.com/nyanmisaka/rga.git /opt/rkrga
 RUN git clone --depth=1 https://github.com/nyanmisaka/ffmpeg-rockchip.git /opt/ffmpeg
-RUN git clone https://git.byte-mate.ru/drholy/moonlight-qt.git /opt/moonlight-qt && cd /opt/moonlight-qt && git checkout master && git log -1 && git -c submodule.libs.update=none submodule update --init --recursive
+#RUN git clone https://git.byte-mate.ru/drholy/moonlight-qt.git /opt/moonlight-qt && cd /opt/moonlight-qt && git checkout master && git log -1 && git -c submodule.libs.update=none submodule update --init --recursive
+RUN git clone https://github.com/m33ts4k0z/moonlight-qt-rk /opt/moonlight-qt && cd /opt/moonlight-qt && git checkout master && git log -1 && git -c submodule.libs.update=none submodule update --init --recursive
 
 COPY scripts/build-deps-ffmpeg.sh /opt/scripts/
 RUN ["/bin/sh", "-c", "/opt/scripts/build-deps-ffmpeg.sh"]

debian/rules

@@ -11,7 +11,7 @@ endif
 	dh $@
 
 override_dh_auto_build:
-	dh_auto_build --max-parallel=1
+	dh_auto_build --max-parallel=8
 
 override_dh_auto_configure:
 	qmake6 PREFIX=/usr EXTRA_CONFIG moonlight-qt.pro

scripts/build-deps-ffmpeg.sh

@@ -32,7 +32,7 @@ export LIBS="$(pkg-config --libs-only-l freetype2 harfbuzz)"
 
 cd /opt/SDL_ttf
 ./autogen.sh
-./configure --enable-static --disable-shared --disable-freetype-builtin --disable-harfbuzz-builtin
+./configure --enable-static --enable-shared --disable-freetype-builtin --disable-harfbuzz-builtin
 make -j8
 sed -i 's/-lSDL2_ttf/-lSDL2_ttf -lfreetype/g' SDL2_ttf.pc
 cat SDL2_ttf.pc

scripts/build-package.sh

@@ -2,10 +2,18 @@
 set -e
 
 # Check out the source without the Windows/Mac prebuilts
-COMMIT="master"
+#COMMIT="master"
-echo "Checking out $COMMIT"
+#echo "Checking out $COMMIT"
 #git clone https://git.byte-mate.ru/drholy/moonlight-qt.git
 cd /opt/moonlight-qt
+
+# 1. Помечаем директорию как безопасную (исправляет проблемы прав в новых версиях Git)
+git config --global --add safe.directory /opt/moonlight-qt
+
+# 2. Жестко откатываем все изменения и удаляем мусор
+git reset --hard
+git clean -fd
+
 #git checkout $COMMIT
 #git log -1
 #git -c submodule.libs.update=none submodule update --init --recursive
@@ -17,15 +25,15 @@ VERSION=`cat app/version.txt`
 
 EXTRA_CONFIG="CONFIG+=gpuslow"
 
-# Jammy requires libqt6opengl6-dev to use Qt Quick Controls
+# # Jammy requires libqt6opengl6-dev to use Qt Quick Controls
-if [ "$DISTRO" == "jammy" ]; then
+# if [ "$DISTRO" == "jammy" ]; then
-    EXTRA_BUILD_DEPS="$EXTRA_BUILD_DEPS libqt6opengl6-dev,"
+#     EXTRA_BUILD_DEPS="$EXTRA_BUILD_DEPS libqt6opengl6-dev,"
-fi
+# fi
 
-# Trixie and later require qt6-svg-plugins to render SVGs in QML
+# # Trixie and later require qt6-svg-plugins to render SVGs in QML
-if [ "$DISTRO" != "bookworm" ] && [ "$DISTRO" != "jammy" ] && [ "$DISTRO" != "noble" ]; then
+# if [ "$DISTRO" != "bookworm" ] && [ "$DISTRO" != "jammy" ] && [ "$DISTRO" != "noble" ]; then
-    EXTRA_DEPS="$EXTRA_DEPS qt6-svg-plugins,"
+#     EXTRA_DEPS="$EXTRA_DEPS qt6-svg-plugins,"
-fi
+# fi
 
 # Create a build directory
 mkdir /opt/build
@@ -55,7 +63,7 @@ sed -i "s/EXTRA_CONFIG/$EXTRA_CONFIG/g" debian/rules
 cat debian/rules
 
 # Build the package
-export DEB_BUILD_OPTIONS="parallel=1"
+export DEB_BUILD_OPTIONS="parallel=8"
 export DEB_CFLAGS_APPEND="-O1"
 export DEB_CXXFLAGS_APPEND="-O1"
 # Указываем pkg-config искать библиотеки в папках, куда мы их ставили
@@ -64,13 +72,15 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/
 export LDFLAGS="-L/usr/local/lib -Wl,-rpath,/usr/local/lib $LDFLAGS"
 export LIBS="-lharfbuzz $LIBS"
 export CPPFLAGS="-I/usr/local/include $CPPFLAGS"
+export DEB_LDFLAGS_APPEND="-lharfbuzz -lgraphite2"
 ldconfig
 debuild -us -uc
 
 # Copy the output to the out directory
 cd /opt/build
-shopt -s extglob
+#shopt -s extglob
-cp -v -r !(moonlight-qt-$VERSION) /out
+find . -maxdepth 1 ! -name "moonlight-qt-$VERSION" ! -name "." -exec cp -rv {} /out/ \;
+#cp -v -r !(moonlight-qt-$VERSION) /out
 
 # Done!
 echo "Build successful!"