Adjust build scripts to add patch

streetpea · Dec 18, 2024 · e46fb9e · e46fb9e
1 parent 45c63e9
commit e46fb9e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -144,6 +144,7 @@ jobs:
           git clone --recursive https://github.com/haasn/libplacebo.git
           cd libplacebo
           git checkout --recurse-submodules ${{ env.libplacebo_tag }}
+          git apply --ignore-whitespace --verbose ../scripts/flatpak/0002-Vulkan-use-16bit-for-p010.patch
           meson setup `
           --prefix "${{ github.workspace }}\${{ env.dep_folder }}" `
           --native-file ../meson.ini `

diff --git a/.github/workflows/build-weekly.yaml b/.github/workflows/build-weekly.yaml
@@ -131,6 +131,7 @@ jobs:
           git clone --recursive https://github.com/haasn/libplacebo.git
           cd libplacebo
           git checkout --recurse-submodules ${{ env.libplacebo_tag }}
+          git apply --ignore-whitespace --verbose ../scripts/flatpak/0002-Vulkan-use-16bit-for-p010.patch
           meson setup `
           --prefix "${{ github.workspace }}\${{ env.dep_folder }}" `
           --native-file ../meson.ini `

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -110,6 +110,7 @@ jobs:
           git clone --recursive https://github.com/haasn/libplacebo.git
           cd libplacebo
           git checkout --recurse-submodules ${{ env.libplacebo_tag }}
+          git apply --ignore-whitespace --verbose ../scripts/flatpak/0002-Vulkan-use-16bit-for-p010.patch
           meson setup `
           --prefix "${{ github.workspace }}\${{ env.dep_folder }}" `
           --native-file ../meson.ini `

diff --git a/gui/src/qmlbackend.cpp b/gui/src/qmlbackend.cpp
@@ -671,20 +671,6 @@ void QmlBackend::createSession(const StreamSessionConnectInfo &connect_info)
         }
 #endif
     }
-#if defined(Q_OS_WIN)
-    if(session_info.hw_decoder == "vulkan" && session_info.video_profile.codec == CHIAKI_CODEC_H265_HDR && window->amdCard())
-    {
-        qCInfo(chiakiGui) << "Using amd card with vulkan hw decoding and hdr not supported on Windows, falling back to d3d11va...";
-        session_info.hw_decoder = "d3d11va";
-    }
-#endif
-#if defined(Q_OS_LINUX)
-    if(session_info.hw_decoder == "vulkan" && session_info.video_profile.codec == CHIAKI_CODEC_H265_HDR && window->amdCard())
-    {
-        qCInfo(chiakiGui) << "Using amd card with vulkan hw decoding and hdr not supported with latest Linux driver, falling back to vaapi...";
-        session_info.hw_decoder = "vaapi";
-    }
-#endif
     if (session_info.hw_decoder == "vulkan") {
         session_info.hw_device_ctx = window->vulkanHwDeviceCtx();
         if (!session_info.hw_device_ctx)

diff --git a/scripts/build-libplacebo.sh b/scripts/build-libplacebo.sh
@@ -12,7 +12,8 @@ git clone --recursive https://github.com/haasn/libplacebo.git || exit 1
 fi
 cd libplacebo || exit 1
 git checkout $TAG || exit 1
-git apply ${SCRIPT_DIR}/flatpak/0001-Vulkan-Don-t-try-to-reuse-old-swapchain.patch || exit 1
+git apply "${SCRIPT_DIR}/flatpak/0001-Vulkan-Don-t-try-to-reuse-old-swapchain.patch" || exit 1
+git apply "${SCRIPT_DIR}/flatpak/0002-Vulkan-use-16bit-for-p010.patch" | exit 1
 DIR=./build || exit 1
 meson setup --prefix /usr -Dxxhash=disabled $DIR || exit 1
 ninja -C$DIR || exit 1

diff --git a/scripts/flatpak/chiaki4deck-devel.yaml b/scripts/flatpak/chiaki4deck-devel.yaml
@@ -53,6 +53,8 @@ modules:
         tag: v7.349.0
       - type: patch
         path: 0001-Vulkan-Don-t-try-to-reuse-old-swapchain.patch
+      - type: patch
+        path: 0002-Vulkan-use-16bit-for-p010.patch
 
   - name: ffmpeg
     cleanup:

diff --git a/scripts/flatpak/chiaki4deck.yaml b/scripts/flatpak/chiaki4deck.yaml
@@ -56,6 +56,8 @@ modules:
         tag: v7.349.0
       - type: patch
         path: 0001-Vulkan-Don-t-try-to-reuse-old-swapchain.patch
+      - type: patch
+        path: 0002-Vulkan-use-16bit-for-p010.patch
 
   - name: ffmpeg
     cleanup: