fix: remove mpv advanced control

dragonflylee · Dec 23, 2024 · ddecfc3 · ddecfc3
1 parent f6b083c
commit ddecfc3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -179,7 +179,7 @@ jobs:
       uses: flatpak/flatpak-github-actions/flatpak-builder@master
       if: ${{ matrix.arch == 'x86_64' || inputs.arm_flatpak || startsWith(github.ref, 'refs/tags/') }}
       with:
-        bundle: Switchfin-Linux.flatpak
+        bundle: Switchfin-Linux-${{ matrix.arch }}-${{ github.run_number }}.flatpak
         manifest-path: scripts/flatpak.yaml
         cache-key: flatpak-builder-${{ hashFiles('scripts/flatpak.yaml') }}
         upload-artifact: false
@@ -348,8 +348,8 @@ jobs:
           ${MINGW_PACKAGE_PREFIX}-cc \
           ${MINGW_PACKAGE_PREFIX}-ninja unzip
 
-        curl -sLO https://github.com/rainers/cv2pdb/releases/download/v0.52/cv2pdb-0.52.zip
-        unzip cv2pdb-0.52.zip cv2pdb64.exe -d /usr/bin
+        curl -sLO https://github.com/rainers/cv2pdb/releases/download/v0.53/cv2pdb-0.53.zip
+        unzip cv2pdb-0.53.zip cv2pdb64.exe -d /usr/bin
     - if: matrix.msystem == 'MINGW32'
       name: Config Editbin
       shell: powershell

diff --git a/.github/workflows/macos-dylib.yaml b/.github/workflows/macos-dylib.yaml
@@ -45,8 +45,8 @@ jobs:
     - name: Build bootstrap
       if: ${{ matrix.tag == 'Intel_Old' }}
       run: |
-        curl --retry 5 -sSL https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.tar.gz | tar zxf - -C ${{ runner.temp }}
-        cd ${{ runner.temp }}/boost_1_85_0
+        curl --retry 5 -sSL https://github.com/boostorg/boost/releases/download/boost-1.85.0/boost-1.85.0-b2-nodocs.tar.xz | tar Jxf - -C ${{ runner.temp }}
+        cd ${{ runner.temp }}/boost-1.85.0
         ./bootstrap.sh --with-libraries=filesystem --without-icu -prefix=$CMAKE_PREFIX_PATH
         ./b2 install target-os=darwin variant=release --with-filesystem \
           cxxflags="-arch ${{ matrix.arch }} -mmacosx-version-min=${{ matrix.target }}" \

diff --git a/app/src/view/mpv_core.cpp b/app/src/view/mpv_core.cpp
@@ -203,11 +203,9 @@ void MPVCore::init() {
     };
 #else
     mpv_opengl_init_params gl_init_params{get_proc_address, nullptr};
-    int advanced_control = MPVCore::HARDWARE_DEC ? 1 : 0;
     mpv_render_param params[] = {
         {MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
         {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
-        {MPV_RENDER_PARAM_ADVANCED_CONTROL, &advanced_control},
         {MPV_RENDER_PARAM_INVALID, nullptr},
     };
 #endif

diff --git a/debian/rules b/debian/rules
@@ -58,11 +58,11 @@ ffmpeg: libssh2 dav1d
 	patch -d /tmp/ffmpeg-7.1 -Nbp1 -i $(CURDIR)/scripts/mingw64/ffmpeg/avio.patch
 	mkdir -p build/ffmpeg && cd build/ffmpeg && \
 	/tmp/ffmpeg-7.1/configure --prefix=$(PREFIX) --enable-shared --disable-static --enable-rpath \
-		--disable-programs --disable-debug --disable-doc --disable-avdevice --disable-autodetect \
+		--disable-programs --disable-debug --disable-doc --disable-autodetect --enable-pic \
+		--disable-avdevice --enable-libv4l2 --enable-vaapi --enable-vdpau --disable-encoders \
 		--enable-mbedtls --enable-gpl --enable-version3 --enable-libssh2 --enable-asm --enable-opengl \
-		--enable-libass --enable-libdav1d --enable-libv4l2 --enable-vaapi --enable-vdpau \
 		--disable-protocols --enable-protocol=file,http,tcp,udp,hls,https,tls,ftp,libssh2,rtp,crypto,httpproxy \
-		--disable-filters --enable-filter=hflip,vflip,transpose
+		--disable-filters --enable-filter=hflip,vflip,transpose --enable-libass --enable-libdav1d
 	make -C build/ffmpeg -j$(shell nproc)
 	make -C build/ffmpeg install