From 2d995826ad4f12b0fab8248edc6ee79c994bcdc7 Mon Sep 17 00:00:00 2001
From: Vasyl Gello <vasek.gello@gmail.com>
Date: Wed, 15 Nov 2023 16:03:40 +0200
Subject: [PATCH] Globally drop yasm - libvpx should not need it

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
---
 .github/workflows/bridge.yml        |  3 +--
 .github/workflows/ci.yml            |  3 +--
 .github/workflows/flutter-build.yml | 40 ++++++++++-------------------
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/bridge.yml b/.github/workflows/bridge.yml
index 5b9367221..d8cd17f58 100644
--- a/.github/workflows/bridge.yml
+++ b/.github/workflows/bridge.yml
@@ -44,8 +44,7 @@ jobs:
             nasm \
             ninja-build \
             pkg-config \
-            wget \
-            yasm
+            wget
 
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 080a0b743..9ac826a3c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -114,8 +114,7 @@ jobs:
                libxdo-dev \
                libxfixes-dev \
                nasm \
-               wget \
-               yasm
+               wget
             ;;
           # arm-unknown-linux-*) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
           # aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml
index 19cdd3a31..90e5cf962 100644
--- a/.github/workflows/flutter-build.yml
+++ b/.github/workflows/flutter-build.yml
@@ -348,7 +348,7 @@ jobs:
 
       - name: Install build runtime
         run: |
-          brew install llvm create-dmg nasm yasm cmake gcc wget ninja pkg-config
+          brew install llvm create-dmg nasm cmake gcc wget ninja pkg-config
 
       - name: Install flutter
         uses: subosito/flutter-action@v2
@@ -459,7 +459,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install nasm yasm
+          brew install nasm
       - name: Checkout source code
         uses: actions/checkout@v3
       - name: Install flutter
@@ -592,8 +592,7 @@ jobs:
                openjdk-11-jdk-headless \
                pkg-config \
                tree \
-               wget \
-               yasm
+               wget
 
       - name: Checkout source code
         uses: actions/checkout@v3
@@ -782,7 +781,7 @@ jobs:
           sudo rm -rf /usr/local/lib/android
           sudo rm -rf /usr/share/dotnet
           sudo apt-get update -y
-          sudo apt-get install -y nasm qemu-user-static yasm
+          sudo apt-get install -y nasm qemu-user-static
 
       - name: Checkout source code
         uses: actions/checkout@v3
@@ -880,8 +879,7 @@ jobs:
                ninja-build \
                pkg-config \
                tree \
-               wget \
-               yasm
+               wget
             # we have libopus compiled by us.
             apt-get remove -y libopus-dev || true
             # output devs
@@ -985,7 +983,6 @@ jobs:
                unzip \
                xz-utils \
                wget \
-               yasm \
                zip
 
       #- name: Maximize build space
@@ -1097,8 +1094,7 @@ jobs:
                ninja-build \
                pkg-config \
                tree \
-               wget \
-               yasm
+               wget
             # we have libopus compiled by us.
             apt-get remove -y libopus-dev || true
             # output devs
@@ -1180,7 +1176,6 @@ jobs:
                pkg-config \
                unzip \
                xz-utils \
-               yasm \
                zip
 
       #- name: Maximize build space
@@ -1277,8 +1272,7 @@ jobs:
                rpm \
                unzip \
                wget \
-               xz-utils \
-               yasm
+               xz-utils
           run: |
             # disable git safe.directory
             git config --global --add safe.directory "*"
@@ -1390,8 +1384,7 @@ jobs:
                libarchive-tools \
                libgtk-3-dev \
                nasm \
-               wget \
-               yasm
+               wget
           mkdir -p ./target/release/
 
       - name: Restore the rustdesk lib file
@@ -1447,8 +1440,7 @@ jobs:
                rpm \
                unzip \
                wget \
-               xz-utils \
-               yasm
+               xz-utils
           run: |
             # disable git safe.directory
             git config --global --add safe.directory "*"
@@ -1592,7 +1584,6 @@ jobs:
       #       gcc
       #       curl
       #       wget
-      #       yasm
       #       nasm
       #       zip
       #       make
@@ -1676,8 +1667,7 @@ jobs:
                libarchive-tools \
                libgtk-3-dev \
                nasm \
-               wget \
-               yasm
+               wget
           mkdir -p ./target/release/
 
       - name: Restore the rustdesk lib file
@@ -1719,8 +1709,7 @@ jobs:
                rpm \
                unzip \
                wget \
-               xz-utils \
-               yasm
+               xz-utils
           run: |
             # disable git safe.directory
             git config --global --add safe.directory "*"
@@ -1806,7 +1795,6 @@ jobs:
             gcc
             curl
             wget
-            yasm
             nasm
             zip
             make
@@ -1923,8 +1911,7 @@ jobs:
   #             g++ \
   #             libgtk-3-dev \
   #             nasm \
-  #             wget \
-  #             yasm
+  #             wget
   #           # flatpak deps
   #           flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
   #           flatpak --user install -y flathub org.freedesktop.Platform/${{ matrix.job.arch }}/23.08
@@ -2001,8 +1988,7 @@ jobs:
                g++ \
                libgtk-3-dev \
                nasm \
-               wget \
-               yasm
+               wget
             # flatpak deps
             flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
             flatpak --user install -y flathub org.freedesktop.Platform/${{ matrix.job.arch }}/23.08