From 374e3238adff00cfcf3767729e499775380ece24 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 7 Sep 2021 16:45:02 +0300
Subject: [PATCH] Build FFmpeg with upstream yasm on macOS.

---
 Telegram/build/prepare/prepare.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index d7a25f885..36c96d07a 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -53,6 +53,7 @@ pathPrefixes = [
     'ThirdParty\\Ninja',
 ] if win else [
     'ThirdParty/gyp',
+    'ThirdParty/yasm',
     'ThirdParty/depot_tools',
 ]
 pathPrefix = ''
@@ -293,19 +294,13 @@ mac:
 
 stage('yasm', """
 mac:
-    git clone -b macos_padding https://github.com/desktop-app/yasm.git
+    git clone https://github.com/yasm/yasm.git
     cd yasm
+    git checkout 41762bea
     ./autogen.sh
     make $MAKE_THREADS_CNT
 """, 'ThirdParty')
 
-stage('macho_edit', """
-mac:
-    git clone https://github.com/desktop-app/macho_edit.git
-    cd macho_edit
-    xcodebuild build -configuration Release -project macho_edit.xcodeproj -target macho_edit
-""", 'ThirdParty')
-
 stage('lzma', """
 win:
     git clone https://github.com/desktop-app/lzma.git
@@ -461,16 +456,11 @@ mac:
     LDFLAGS=`freetype-config --libs`
     PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig
 
-depends:patches/macos_yasm_wrap.sh
 depends:yasm/yasm
-depends:macho_edit/build/Release/macho_edit
-    cp ../patches/macos_yasm_wrap.sh ./
-
     ./configure --prefix=$USED_PREFIX \
     --extra-cflags="$MIN_VER $UNGUARDED -DCONFIG_SAFE_BITSTREAM_READER=1" \
     --extra-cxxflags="$MIN_VER $UNGUARDED -DCONFIG_SAFE_BITSTREAM_READER=1" \
     --extra-ldflags="$MIN_VER" \
-    --x86asmexe=`pwd`/macos_yasm_wrap.sh \
     --enable-protocol=file \
     --enable-libopus \
     --disable-programs \