From 951bb22c3822d422bb7dcf76758dc86021828a4c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Nov 2020 20:18:11 +0300
Subject: [PATCH] Update docs/docker to use FFmpeg 4.2 / OpenAL 1.20.1.

---
 Telegram/build/docker/centos_env/Dockerfile | 4 ++--
 docs/building-cmake.md                      | 2 ++
 docs/building-msvc.md                       | 4 ++--
 docs/building-xcode.md                      | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index dcf95e11b..cbeaab8f3 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -250,7 +250,7 @@ COPY --from=opus ${LibrariesPath}/opus-cache /
 COPY --from=libva ${LibrariesPath}/libva-cache /
 COPY --from=libvdpau ${LibrariesPath}/libvdpau-cache /
 
-RUN git clone -b release/3.4 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg
+RUN git clone -b release/4.2 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg
 
 WORKDIR ffmpeg
 RUN ./configure \
@@ -359,7 +359,7 @@ RUN make -j$(nproc)
 RUN make DESTDIR="$LibrariesPath/ffmpeg-cache" install
 
 FROM builder AS openal
-RUN git clone -b openal-soft-1.20.1 --depth=1 $GIT/kcat/openal-soft.git
+RUN git clone -b fix_mono --depth=1 $GIT/telegramdesktop/openal-soft.git
 
 WORKDIR openal-soft
 RUN cmake3 -B build . \
diff --git a/docs/building-cmake.md b/docs/building-cmake.md
index c8337db9a..6f3dccceb 100644
--- a/docs/building-cmake.md
+++ b/docs/building-cmake.md
@@ -1,5 +1,7 @@
 ## Build instructions for CMake under Ubuntu 14.04
 
+**NB** These are outdated.
+
 ### Prepare folder
 
 Choose an empty folder for the future build, for example **/home/user/TBuild**. It will be named ***BuildPath*** in the rest of this document.
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 57d5b856d..92042d06b 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -152,7 +152,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
     cd ffmpeg
-    git checkout release/3.4
+    git checkout release/4.2
 
     set CHERE_INVOKING=enabled_from_arguments
     set MSYS2_PATH_TYPE=inherit
@@ -172,7 +172,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cd ..
 
     configure ^
-        -prefix "%LibrariesPath%\Qt-Qt-5.15.1" ^
+        -prefix "%LibrariesPath%\Qt-5.15.1" ^
         -debug-and-release ^
         -force-debug-info ^
         -opensource ^
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index 949580ee8..d8c19f8c7 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -127,7 +127,7 @@ Go to ***BuildPath*** and run
 
     git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
     cd ffmpeg
-    git checkout release/3.4
+    git checkout release/4.2
     CFLAGS=`freetype-config --cflags`
     LDFLAGS=`freetype-config --libs`
     PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig
@@ -240,9 +240,9 @@ Go to ***BuildPath*** and run
     sudo make install
     cd ..
 
-    git clone git://repo.or.cz/openal-soft.git
+    git clone https://github.com/telegramdesktop/openal-soft.git
     cd openal-soft
-    git checkout v1.19
+    git checkout fix_mono
     cd build
     CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/macos -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12 ..
     make $MAKE_THREADS_CNT