Bump ffmpeg to 7.0 and enable vulkan in vcpkg

streetpea · May 12, 2024 · b38443e · b38443e
1 parent a5647fc
commit b38443e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml
@@ -29,6 +29,7 @@ jobs:
             cc:p
             cmake:p
             curl:p
+            diffutils:p
             fast_float:p
             fftw:p
             hidapi:p
@@ -61,7 +62,7 @@ jobs:
       - name: Install python protobuf and zip
         run: |
           pip install protobuf
-          pacman -S zip git --noconfirm
+          pacman -S zip git make --noconfirm
 
       - name: Build libbplacebo
         run: |

diff --git a/scripts/build-ffmpeg-windows.sh b/scripts/build-ffmpeg-windows.sh
@@ -6,12 +6,10 @@ cd "./$1"
 shift
 ROOT="`pwd`"
 
-TAG=n6.1
+TAG=n7.0
 
 git clone https://git.ffmpeg.org/ffmpeg.git --depth 1 -b $TAG && cd ffmpeg || exit 1
-git apply ${SCRIPT_DIR}/flatpak/0001-lavc-vaapi_hevc-Fixup-invalid-references.patch || exit 1
-git apply ${SCRIPT_DIR}/flatpak/0001-lavc-vaapi_h264-Fixup-invalid-references.patch || exit 1
 git apply ${SCRIPT_DIR}/flatpak/0001-vulkan-ignore-frames-without-hw-context.patch || exit 1
-./configure --disable-all --enable-static --enable-avformat --enable-avcodec --enable-decoder=h264 --enable-decoder=hevc --enable-hwaccel=h264_vaapi --enable-hwaccel=hevc_vaapi --enable-hwaccel=h264_vulkan --enable-hwaccel=hevc_vulkan --prefix=/mingw64 "$@" || exit 1
+./configure --disable-all --enable-static --enable-avformat --enable-avcodec --enable-decoder=h264 --enable-decoder=hevc --enable-hwaccel=h264_vulkan --enable-hwaccel=hevc_vulkan --prefix=/usr/local "$@" || exit 1
 make -j4 || exit 1
-make install || exit 1
+make install || exit 1
diff --git a/scripts/build-ffmpeg.sh b/scripts/build-ffmpeg.sh
@@ -6,7 +6,7 @@ cd "./$1"
 shift
 ROOT="`pwd`"
 
-TAG=n6.1
+TAG=n7.0
 
 git clone https://git.ffmpeg.org/ffmpeg.git --depth 1 -b $TAG && cd ffmpeg || exit 1
 git apply ${SCRIPT_DIR}/flatpak/0001-lavc-vaapi_hevc-Fixup-invalid-references.patch || exit 1

diff --git a/scripts/ffmpeg-port/portfile.cmake b/scripts/ffmpeg-port/portfile.cmake
@@ -54,7 +54,7 @@ elseif(VCPKG_TARGET_IS_LINUX)
 elseif(VCPKG_TARGET_IS_UWP)
     string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-mediafoundation")
 elseif(VCPKG_TARGET_IS_WINDOWS)
-    string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-dxva2 --enable-mediafoundation")
+    string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-vulkan --enable-dxva2 --enable-mediafoundation")
 elseif(VCPKG_TARGET_IS_OSX)
     string(APPEND OPTIONS " --target-os=darwin --enable-appkit --enable-avfoundation --enable-coreimage --enable-audiotoolbox --enable-videotoolbox")
 elseif(VCPKG_TARGET_IS_IOS)

diff --git a/scripts/flatpak/chiaki4deck.yaml b/scripts/flatpak/chiaki4deck.yaml
@@ -112,8 +112,8 @@ modules:
       - --enable-hwaccel=hevc_vulkan
     sources:
       - type: archive
-        url: https://ffmpeg.org/releases/ffmpeg-6.1.tar.xz
-        sha256: 488c76e57dd9b3bee901f71d5c95eaf1db4a5a31fe46a28654e837144207c270
+        url: https://ffmpeg.org/releases/ffmpeg-7.0.tar.xz
+        sha256: 4426a94dd2c814945456600c8adfc402bee65ec14a70e8c531ec9a2cd651da7b
       - type: patch
         path: 0001-lavc-vaapi_hevc-Fixup-invalid-references.patch
       - type: patch