Version 2.4.1: Fix build for Linux.

- Move by PageUp and PageDown in channel comments.
- Several layout bugfixes.
- Several crashfixes.

.github/workflows/issue_closer.yml

@@ -14,6 +14,22 @@ jobs:
           echo $tag
           echo ::set-env name=LATEST_TAG::$tag
 
+      - name: Get the latest macOS version.
+        shell: python
+        run: |
+          import subprocess;
+          from xml.dom import minidom;
+
+          url = "https://osx.telegram.org/updates/versions.xml";
+          subprocess.check_call("wget %s" % url, shell=True);
+
+          xmldoc = minidom.parse('versions.xml');
+          itemlist = xmldoc.getElementsByTagName('enclosure');
+          ver = itemlist[0].attributes['sparkle:shortVersionString'].value;
+          print(ver);
+
+          subprocess.check_call("echo ::set-env name=%s::%s" % ("LATEST_MACOS", ver), shell=True);
+
       - name: Check a version from an issue.
         uses: actions/github-script@0.4.0
         with:
@@ -75,10 +91,20 @@ jobs:
             let issueNum = firstNum(issueVer);
             let latestNum = firstNum(latestVer);
 
-            if (issueNum <= latestNum && issueNum < 5) {
+            let macos_ver = process.env.LATEST_MACOS;
+            console.log("Telegram for MacOS version from website: " + macos_ver);
+
+            if (issueNum <= latestNum && issueNum < macos_ver) {
               console.log("Seems the version of this issue is fine!");
               return;
             }
+            if (issueNum > macos_ver) {
+              let message = `Seems like it's neither the Telegram Desktop\
+              nor the Telegram for macOS version.
+              `;
+              console.log(message);
+              return;
+            }
 
             let message = `
             Sorry, but according to the version you specify in this issue, \
@@ -87,7 +113,7 @@ jobs:
             You can report your issue to [the group](https://t.me/macswift) \
             or to [the repository of Telegram for macOS](https://github.com/overtake/TelegramSwift).
 
-            If I made a mistake and closed your issue wrongly, please reopen it. Thanks!
+            **If I made a mistake and closed your issue wrongly, please reopen it. Thanks!**
             `;
 
             let params = {

.github/workflows/linux.yml

@@ -5,6 +5,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
+      - '!docs/building-cmake.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -24,6 +25,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
+      - '!docs/building-cmake.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -52,6 +54,7 @@ jobs:
         defines:
           - ""
           - "DESKTOP_APP_DISABLE_DBUS_INTEGRATION"
+          - "TDESKTOP_DISABLE_GTK_INTEGRATION"
 
     env:
       GIT: "https://github.com"
@@ -94,6 +97,7 @@ jobs:
           autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
           libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev \
           libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev \
+          libxcb-screensaver0-dev libjpeg-dev ninja-build \
           libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libatspi2.0-dev \
           libxcb-render-util0-dev libxcb-util0-dev libxcb-xkb-dev libxrender-dev \
           libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev libegl1-mesa-dev \
@@ -131,14 +135,6 @@ jobs:
           cd Libraries
           echo ::set-env name=LibrariesPath::`pwd`
 
-      - name: Range-v3.
-        run: |
-          echo "Find necessary branch from doc."
-          cloneRange=$(grep -A 1 "range-v3" $REPO_NAME/$DOC_PATH | sed -n 1p)
-          cd $LibrariesPath
-          echo $cloneRange
-          eval $cloneRange
-
       - name: Patches.
         run: |
           echo "Find necessary commit from doc."
@@ -163,7 +159,7 @@ jobs:
 
       - name: Opus cache.
         id: cache-opus
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/opus
           key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }}
@@ -208,7 +204,7 @@ jobs:
 
       - name: FFmpeg cache.
         id: cache-ffmpeg
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/ffmpeg-cache
           key: ${{ runner.OS }}-ffmpeg-${{ env.CACHE_KEY }}
@@ -226,7 +222,7 @@ jobs:
           --disable-network \
           --disable-autodetect \
           --disable-everything \
-          --disable-neon \
+          --disable-alsa \
           --disable-iconv \
           --enable-libopus \
           --enable-vaapi \
@@ -341,19 +337,6 @@ jobs:
 
           sudo cp -R ffmpeg-cache/. /
 
-      - name: PortAudio.
-        run: |
-          cd $LibrariesPath
-
-          git clone https://git.assembla.com/portaudio.git
-          cd portaudio
-          git checkout 396fe4b669
-          ./configure
-          make -j$(nproc)
-          sudo make install
-          cd ..
-          rm -rf portaudio
-
       - name: OpenAL Soft.
         run: |
           cd $LibrariesPath
@@ -374,7 +357,7 @@ jobs:
 
       - name: OpenSSL cache.
         id: cache-openssl
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/openssl-cache
           key: ${{ runner.OS }}-${{ env.OPENSSL_VER }}-${{ env.CACHE_KEY }}
@@ -387,46 +370,53 @@ jobs:
           git clone -b OpenSSL_${OPENSSL_VER}-stable --depth=1 \
             $GIT/openssl/openssl $opensslDir
           cd $opensslDir
-          ./config --prefix="$OPENSSL_PREFIX"
+          ./config --prefix="$OPENSSL_PREFIX" no-tests
           make -j$(nproc)
           sudo make DESTDIR="$LibrariesPath/openssl-cache" install_sw
           cd ..
-          rm -rf $opensslDir
+          # rm -rf $opensslDir # Keep this folder for WebRTC.
       - name: OpenSSL install.
         run: |
           cd $LibrariesPath
           sudo cp -R openssl-cache/. /
 
+      - name: Libwayland.
+        run: |
+          cd $LibrariesPath
+
+          git clone -b 1.18.0 https://gitlab.freedesktop.org/wayland/wayland
+          cd wayland
+          ./autogen.sh \
+          --enable-static \
+          --disable-documentation \
+          --disable-dtd-validation
+          make -j$(nproc)
+          sudo make install
+          cd ..
+          rm -rf wayland
+
       - name: Libxkbcommon.
         run: |
           cd $LibrariesPath
 
           git clone -b xkbcommon-0.8.4 --depth=1 $GIT/xkbcommon/libxkbcommon.git
           cd libxkbcommon
-          ./autogen.sh
+          ./autogen.sh \
+          --disable-docs \
+          --disable-wayland \
+          --with-xkb-config-root=/usr/share/X11/xkb \
+          --with-x-locale-root=/usr/share/X11/locale
           make -j$(nproc)
           sudo make install
           cd ..
           rm -rf libxkbcommon
 
-      - name: Libwayland.
-        run: |
-          cd $LibrariesPath
-
-          git clone -b 1.16 https://gitlab.freedesktop.org/wayland/wayland
-          cd wayland
-          ./autogen.sh --enable-static --disable-documentation  --disable-dtd-validation
-          make -j$(nproc)
-          sudo make install
-          cd ..
-          rm -rf wayland
-
       - name: Qt 5.12.8 cache.
         id: cache-qt
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/qt-cache
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8.diff') }}
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_12_8/*') }}
       - name: Qt 5.12.8 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
@@ -437,12 +427,11 @@ jobs:
           perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg
           git submodule update qtbase qtwayland qtimageformats qtsvg
           cd qtbase
-          git apply ../../patches/qtbase_${QT}.diff
-          cd src/plugins/platforminputcontexts
-          git clone $GIT/desktop-app/fcitx.git
-          git clone $GIT/desktop-app/hime.git
-          git clone $GIT/desktop-app/nimf.git
-          cd ../../../..
+          find ../../patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply
+          cd ..
+          cd qtwayland
+          find ../../patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
+          cd ..
 
           ./configure -prefix "$QT_PREFIX" \
           -release \
@@ -454,6 +443,7 @@ jobs:
           -qt-harfbuzz \
           -qt-pcre \
           -qt-xcb \
+          -no-icu \
           -no-gtk \
           -static \
           -dbus-runtime \
@@ -471,21 +461,9 @@ jobs:
           cd $LibrariesPath
           sudo cp -R qt-cache/. /
 
-      - name: Material Decoration.
-        run: |
-          cd $LibrariesPath
-
-          git clone --depth=1 $GIT/desktop-app/materialdecoration.git
-          cd materialdecoration
-          $QT_PREFIX/bin/qmake CONFIG+=static
-          make -j$(nproc)
-          sudo make install
-          cd ..
-          rm -rf materialdecoration
-
       - name: Breakpad cache.
         id: cache-breakpad
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/breakpad-cache
           key: ${{ runner.OS }}-breakpad-${{ env.CACHE_KEY }}
@@ -536,6 +514,39 @@ jobs:
           mkdir -p breakpad/out/Default/
           cp breakpad-cache/dump_syms breakpad/out/Default/dump_syms
 
+      - name: WebRTC cache.
+        id: cache-webrtc
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.LibrariesPath }}/tg_owt
+          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
+      - name: WebRTC.
+        if: steps.cache-webrtc.outputs.cache-hit != 'true'
+        run: |
+          cd $LibrariesPath
+
+          git clone $GIT/desktop-app/tg_owt.git
+          mkdir -p tg_owt/out/Debug
+          cd tg_owt/out/Debug
+          cmake -G Ninja \
+          -DCMAKE_BUILD_TYPE=Debug \
+          -DTG_OWT_SPECIAL_TARGET=linux \
+          -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_$QT/qtbase/src/3rdparty/libjpeg \
+          -DTG_OWT_OPENSSL_INCLUDE_PATH=$OPENSSL_PREFIX/include \
+          -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
+          -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include \
+          ../..
+          ninja
+
+          # Cleanup.
+          cd $LibrariesPath/tg_owt
+          mv out/Debug/libtg_owt.a libtg_owt.a
+          rm -rf out
+          mkdir -p out/Debug
+          mv libtg_owt.a out/Debug/libtg_owt.a
+
+          rm -rf $LibrariesPath/openssl_${OPENSSL_VER}
+
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'
         run: |
@@ -554,6 +565,7 @@ jobs:
           -D CMAKE_CXX_FLAGS="-s" \
           -D TDESKTOP_API_TEST=ON \
           -D DESKTOP_APP_USE_PACKAGED=OFF \
+          -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
           $DEFINE
 
           cd ../out/Debug

.github/workflows/mac.yml

@@ -5,6 +5,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
+      - '!docs/building-xcode.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -23,6 +24,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
+      - '!docs/building-xcode.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -77,6 +79,7 @@ jobs:
 
       - name: First set up.
         run: |
+          sudo chown -R `whoami`:admin /usr/local/share
           brew install automake fdk-aac lame libass libtool libvorbis libvpx \
           ninja opus sdl shtool texi2html theora x264 xvid yasm pkg-config
 
@@ -86,6 +89,7 @@ jobs:
           echo $MIN_MAC >> CACHE_KEY.txt
           echo $PREFIX >> CACHE_KEY.txt
           echo $MANUAL_CACHING >> CACHE_KEY.txt
+          echo "$GITHUB_WORKSPACE" >> CACHE_KEY.txt
           if [ "$AUTO_CACHING" == "1" ]; then
             thisFile=$REPO_NAME/.github/workflows/mac.yml
             echo `md5 -q $thisFile` >> CACHE_KEY.txt
@@ -98,14 +102,6 @@ jobs:
           cd Libraries/macos
           echo ::set-env name=LibrariesPath::`pwd`
 
-      - name: Range-v3.
-        run: |
-          echo "Find necessary branch from doc."
-          cloneRange=$(grep -A 1 "range-v3" $REPO_NAME/$DOC_PATH | sed -n 1p)
-          cd $LibrariesPath
-          echo $cloneRange
-          eval $cloneRange
-
       - name: Patches.
         run: |
           echo "Find necessary commit from doc."
@@ -138,7 +134,7 @@ jobs:
 
       - name: OpenSSL cache.
         id: cache-openssl
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/openssl_${{ env.OPENSSL_VER }}
           key: ${{ runner.OS }}-${{ env.OPENSSL_VER }}-${{ env.CACHE_KEY }}
@@ -152,12 +148,13 @@ jobs:
           git checkout OpenSSL_"$OPENSSL_VER"-stable
           ./Configure \
           --prefix=$PREFIX \
+          no-tests \
           darwin64-x86_64-cc \
           -static \
           $MIN_MAC
           make build_libs -j$(nproc)
 
-          SSL_DIR=$LibrariesPath/openssl_${{ env.OPENSSL_VER }}
+          SSL_DIR=$LibrariesPath/openssl_$OPENSSL_VER
           mkdir -p $SSL_DIR/include
           copyLib() {
             cp $1.a $SSL_DIR/$1.a
@@ -168,31 +165,35 @@ jobs:
 
       - name: Opus cache.
         id: cache-opus
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ env.LibrariesPath }}/opus
+          path: ${{ env.LibrariesPath }}/opus-cache
           key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }}
-      - name: Opus.
+      - name: Opus clone.
+        run: |
+          cd $LibrariesPath
+
+          git clone -b v1.3 --depth=1 $GIT/xiph/opus
+      - name: Opus build.
         if: steps.cache-opus.outputs.cache-hit != 'true'
         run: |
           cd $LibrariesPath
 
-          git clone $GIT/xiph/opus
           cd opus
-          git checkout v1.3
           ./autogen.sh
           CFLAGS="$MIN_MAC $UNGUARDED" CPPFLAGS="$MIN_MAC $UNGUARDED" LDFLAGS="$MIN_MAC" ./configure --prefix=$PREFIX
           make -j$(nproc)
+          sudo make DESTDIR="$LibrariesPath/opus-cache" install
       - name: Opus install.
         run: |
-          cd $LibrariesPath/opus
-          sudo make install
+          cd $LibrariesPath
+          sudo cp -R opus-cache/. /
 
       - name: Libiconv cache.
         id: cache-libiconv
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ env.LibrariesPath }}/${{ env.LIBICONV_VER }}
+          path: ${{ env.LibrariesPath }}/libiconv-cache
           key: ${{ runner.OS }}-${{ env.LIBICONV_VER }}-${{ env.CACHE_KEY }}
       - name: Libiconv.
         if: steps.cache-libiconv.outputs.cache-hit != 'true'
@@ -204,14 +205,15 @@ jobs:
           cd $LIBICONV_VER
           CFLAGS="$MIN_MAC $UNGUARDED" CPPFLAGS="$MIN_MAC $UNGUARDED" LDFLAGS="$MIN_MAC" ./configure --enable-static --prefix=$PREFIX
           make -j$(nproc)
+          sudo make DESTDIR="$LibrariesPath/libiconv-cache" install
       - name: Libiconv install.
         run: |
-          cd $LibrariesPath/$LIBICONV_VER
-          sudo make install
+          cd $LibrariesPath
+          sudo cp -R libiconv-cache/. /
 
       - name: FFmpeg cache.
         id: cache-ffmpeg
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/ffmpeg-cache
           key: ${{ runner.OS }}-ffmpeg-${{ env.CACHE_KEY }}
@@ -367,7 +369,7 @@ jobs:
 
       - name: Crashpad cache.
         id: cache-crashpad
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/crashpad
           key: ${{ runner.OS }}-crashpad-${{ env.CACHE_KEY }}-${{ hashFiles('**/crashpad.diff') }}-${{ hashFiles('**/mini_chromium.diff') }}
@@ -406,10 +408,10 @@ jobs:
 
       - name: Qt 5.12.8 cache.
         id: cache-qt
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/qt-cache
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8.diff') }}
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8/*') }}
       - name: Use cached Qt 5.12.8.
         if: steps.cache-qt.outputs.cache-hit == 'true'
         run: |
@@ -422,14 +424,14 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone git://code.qt.io/qt/qt5.git qt$QT
-          cd qt$QT
+          git clone git://code.qt.io/qt/qt5.git qt_$QT
+          cd qt_$QT
           perl init-repository --module-subset=qtbase,qtimageformats
           git checkout v5.12.8
           git submodule update qtbase
           git submodule update qtimageformats
           cd qtbase
-          git apply ../../patches/qtbase_$QT.diff
+          find ../../patches/qtbase_$QT -type f -print0 | sort -z | xargs -0 git apply
           cd ..
 
           ./configure \
@@ -452,6 +454,36 @@ jobs:
           make clean
           cp -r $QT_PREFIX $LibrariesPath/qt-cache
 
+      - name: WebRTC cache.
+        id: cache-webrtc
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.LibrariesPath }}/tg_owt
+          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
+      - name: WebRTC.
+        if: steps.cache-webrtc.outputs.cache-hit != 'true'
+        run: |
+          cd $LibrariesPath
+
+          git clone $GIT/desktop-app/tg_owt.git
+          mkdir -p tg_owt/out/Debug
+          cd tg_owt/out/Debug
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug \
+          -DTG_OWT_SPECIAL_TARGET=mac \
+          -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_$QT/qtbase/src/3rdparty/libjpeg \
+          -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_$OPENSSL_VER/include \
+          -DTG_OWT_OPUS_INCLUDE_PATH=$PREFIX/include/opus \
+          -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include \
+          ../..
+          ninja
+
+          # Cleanup.
+          cd $LibrariesPath/tg_owt
+          mv out/Debug/libtg_owt.a libtg_owt.a
+          rm -rf out
+          mkdir -p out/Debug
+          mv libtg_owt.a out/Debug/libtg_owt.a
+
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'
         run: |
@@ -466,7 +498,11 @@ jobs:
             echo ::set-env name=ARTIFACT_NAME::Telegram
           fi
 
-          ./configure.sh -D TDESKTOP_API_TEST=ON -D DESKTOP_APP_USE_PACKAGED=OFF $DEFINE
+          ./configure.sh \
+          -D TDESKTOP_API_TEST=ON \
+          -D DESKTOP_APP_USE_PACKAGED=OFF \
+          -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
+          $DEFINE
 
           cd ../out
 

.github/workflows/master_updater.yml

@@ -0,0 +1,35 @@
+name: Master branch updater.
+
+on:
+  release:
+    types: released
+
+jobs:
+  updater:
+    runs-on: ubuntu-latest
+    env:
+      SKIP: "0"
+      to_branch: "master"
+    steps:
+      - uses: actions/checkout@v1
+        if: env.SKIP == '0'
+      - name: Push the code to the master branch.
+        if: env.SKIP == '0'
+        run: |
+          token=${{ secrets.TOKEN_FOR_MASTER_UPDATER }}
+          if [ -z "${token}" ]; then
+              echo "Token is unset. Nothing to do."
+              exit 0
+          fi
+
+          url=https://x-access-token:$token@github.com/$GITHUB_REPOSITORY
+          latest_tag=$(git describe --tags --abbrev=0)
+          echo "Latest tag: $latest_tag"
+
+          git remote set-url origin $url
+          git remote -v
+          git checkout master
+          git merge $latest_tag
+
+          git push origin HEAD:refs/heads/$to_branch
+          echo "Done!"

.github/workflows/snap.yml

@@ -12,7 +12,6 @@ on:
       - '!.github/workflows/snap.yml'
       - 'Telegram/build/**'
       - 'Telegram/Patches/**'
-      - '!Telegram/Patches/ffmpeg.diff'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -31,7 +30,6 @@ on:
       - '!.github/workflows/snap.yml'
       - 'Telegram/build/**'
       - 'Telegram/Patches/**'
-      - '!Telegram/Patches/ffmpeg.diff'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -43,13 +41,11 @@ on:
 jobs:
 
   linux:
-    name: Ubuntu 18.04
-    runs-on: ubuntu-18.04
+    name: Ubuntu
+    runs-on: ubuntu-latest
 
     env:
       UPLOAD_ARTIFACT: "false"
-      ONLY_CACHE: "false"
-      MANUAL_CACHING: "5"
 
     steps:
       - name: Clone.
@@ -59,57 +55,22 @@ jobs:
 
       - name: First set up.
         run: |
-          sudo apt-get update
-          sudo apt-get install gcc-8 g++-8 -y
+          sudo apt-get purge --autoremove lxd
+
           sudo snap install --classic snapcraft
+          sudo snap install lxd
 
           # Workaround for snapcraft
           # See https://forum.snapcraft.io/t/13258
           sudo chown root:root /
 
-          md5() {
-            md5cache=$(md5sum $1.txt | cut -c -32)
-            echo ::set-env name=$1::$md5cache
-          }
-          keyFor() {
-            keyName="${1^^}_CACHE_KEY"
-            awk -v RS="" -v ORS="\n\n" '/^  '"$1"':/' snap/snapcraft.yaml > $keyName.txt
-            md5 $keyName
-          }
+          sudo usermod -aG lxd $USER
 
-          snap run snapcraft --version > CACHE_KEY.txt
-          gcc-8 --version >> CACHE_KEY.txt
-          echo $MANUAL_CACHING >> CACHE_KEY.txt
-          md5 CACHE_KEY
-
-          keyFor cmake
-          keyFor ffmpeg
-
-      - name: CMake cache.
-        id: cache-cmake
-        uses: actions/cache@v1
-        with:
-          path: parts/cmake
-          key: ${{ runner.OS }}-cmake-${{ env.CACHE_KEY }}-${{ env.CMAKE_CACHE_KEY }}
-
-      - name: CMake build.
-        if: steps.cache-cmake.outputs.cache-hit != 'true'
-        run: sudo snap run snapcraft build --destructive-mode cmake
-
-      - name: FFmpeg cache.
-        id: cache-ffmpeg
-        uses: actions/cache@v1
-        with:
-          path: parts/ffmpeg
-          key: ${{ runner.OS }}-ffmpeg-${{ env.CACHE_KEY }}-${{ env.FFMPEG_CACHE_KEY }}
-
-      - name: FFmpeg build.
-        if: steps.cache-ffmpeg.outputs.cache-hit != 'true'
-        run: sudo snap run snapcraft build --destructive-mode ffmpeg
+          sudo snap run lxd init --auto
+          sudo snap run lxd waitready
 
       - name: Telegram Desktop snap build.
-        if: env.ONLY_CACHE == 'false'
-        run: sudo snap run snapcraft --destructive-mode
+        run: sg lxd -c 'snap run snapcraft --use-lxd'
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
@@ -126,8 +87,3 @@ jobs:
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: artifact
-
-      - name: Remove unneeded directories for cache.
-        run: |
-          sudo rm -rf parts/*/{build,src,ubuntu}
-          sudo rm -rf parts/*/state/{stage,prime}

.github/workflows/win.yml

@@ -5,6 +5,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
+      - '!docs/building-msvc.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -25,6 +26,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
+      - '!docs/building-msvc.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -58,6 +60,7 @@ jobs:
       VC: "call vcvars32.bat && cd Libraries"
       GIT: "https://github.com"
       QT: "5_12_8"
+      QT_VER: "5.12.8"
       OPENSSL_VER: "1_1_1"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
@@ -109,15 +112,6 @@ jobs:
         run: |
           choco install --no-progress -y nasm yasm jom ninja
 
-      - name: Range-v3.
-        shell: bash
-        run: |
-          echo "Find necessary branch from doc."
-          cloneRange=$(grep -A 1 "range-v3" $REPO_NAME/$DOC_PATH | sed -n 1p)
-          cd $LibrariesPath
-          echo $cloneRange
-          eval $cloneRange
-
       - name: Patches.
         shell: bash
         run: |
@@ -128,6 +122,20 @@ jobs:
           cd Patches
           eval $checkoutCommit
 
+      - name: Find any version of Python 2.
+        shell: cmd
+        run: |
+          echo Find any version of Python 2.
+          for /D %%a in (C:\hostedtoolcache\windows\Python\2.*) do (
+            SET PY2=%%a\x64
+          )
+          if [%PY2%] == [] (
+            echo Python 2 is not found.
+            exit 1
+          )
+          echo Found %PY2%.
+          echo ::set-env name=PY2::%PY2%
+
       - name: LZMA.
         shell: cmd
         run: |
@@ -140,7 +148,7 @@ jobs:
 
       - name: OpenSSL cache.
         id: cache-openssl
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/openssl_${{ env.OPENSSL_VER }}
           key: ${{ runner.OS }}-${{ env.CACHE_KEY }}-${{ env.OPENSSL_VER }}
@@ -153,7 +161,7 @@ jobs:
           git clone %GIT%/openssl/openssl.git openssl_%OPENSSL_VER%
           cd openssl_%OPENSSL_VER%
           git checkout OpenSSL_%OPENSSL_VER%-stable
-          perl Configure no-shared debug-VC-WIN32
+          perl Configure no-shared no-tests debug-VC-WIN32
           nmake
           mkdir out32.dbg
           move libcrypto.lib out32.dbg
@@ -161,7 +169,7 @@ jobs:
           move ossl_static.pdb out32.dbg\ossl_static
           nmake clean
           move out32.dbg\ossl_static out32.dbg\ossl_static.pdb
-          perl Configure no-shared VC-WIN32
+          perl Configure no-shared no-tests VC-WIN32
           nmake
           mkdir out32
           move libcrypto.lib out32
@@ -184,7 +192,7 @@ jobs:
 
       - name: OpenAL Soft cache.
         id: cache-openal
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/openal-soft
           key: ${{ runner.OS }}-openal-soft-${{ env.CACHE_KEY }}
@@ -198,17 +206,18 @@ jobs:
           cd openal-soft
           git checkout fix_capture
           cd build
-          cmake ^
+          cmake .. ^
           -G "Visual Studio 16 2019" ^
           -A Win32 ^
           -D LIBTYPE:STRING=STATIC ^
-          -D FORCE_STATIC_VCRT:STRING=ON ..
+          -D FORCE_STATIC_VCRT=ON ^
+          -D ALSOFT_BACKEND_WASAPI=OFF
 
           msbuild -m OpenAL.vcxproj /property:Configuration=Debug
 
       - name: Breakpad cache.
         id: cache-breakpad
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/breakpad
           key: ${{ runner.OS }}-breakpad-${{ env.CACHE_KEY }}-${{ hashFiles('**/breakpad.diff') }}
@@ -221,16 +230,6 @@ jobs:
         run: |
           cd %LibrariesPath%
 
-          echo Find any version of Python 2.
-          for /D %%a in (C:\hostedtoolcache\windows\Python\2.*) do (
-            SET PY2=%%a\x64
-          )
-          IF [%PY2%] == [] (
-            echo Python 2 is not found.
-            exit 1
-          )
-          echo Found %PY2%.
-
           git clone %GIT%/telegramdesktop/gyp.git
           cd gyp
           SET PATH=%PY2%;%cd%;%PATH%
@@ -257,7 +256,7 @@ jobs:
 
       - name: Opus cache.
         id: cache-opus
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/opus
           key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }}
@@ -276,7 +275,7 @@ jobs:
 
       - name: FFmpeg cache.
         id: cache-ffmpeg
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/ffmpeg
           key: ${{ runner.OS }}-ffmpeg-${{ env.CACHE_KEY }}-2-${{ hashFiles('**/build_ffmpeg_win.sh') }}
@@ -298,10 +297,10 @@ jobs:
 
       - name: Qt 5.12.8 cache.
         id: cache-qt
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ env.LibrariesPath }}/Qt-5.12.8
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8.diff') }}
+          path: ${{ env.LibrariesPath }}/Qt-${{ env.QT_VER }}
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8/*') }}
       - name: Configure Qt 5.12.8.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         shell: cmd
@@ -311,18 +310,18 @@ jobs:
           git clone git://code.qt.io/qt/qt5.git qt_%QT%
           cd qt_%QT%
           perl init-repository --module-subset=qtbase,qtimageformats
-          git checkout v5.12.8
+          git checkout v%QT_VER%
           git submodule update qtbase
           git submodule update qtimageformats
           cd qtbase
-          git apply ../../patches/qtbase_%QT%.diff
+          for /r %%i in (..\..\patches\qtbase_%QT%\*) do git apply %%i
           cd ..
 
-          SET SSL=%LibrariesPath%\openssl_1_1_1
+          SET SSL=%LibrariesPath%\openssl_%OPENSSL_VER%
           SET LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib
 
           configure ^
-          -prefix "%LibrariesPath%\Qt-5.12.8" ^
+          -prefix "%LibrariesPath%\Qt-%QT_VER%" ^
           -debug ^
           -force-debug-info ^
           -opensource ^
@@ -350,6 +349,57 @@ jobs:
           cd ..
           rmdir /S /Q qt_%QT%
 
+      - name: WebRTC cache.
+        id: cache-webrtc
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.LibrariesPath }}/tg_owt
+          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
+      - name: WebRTC.
+        if: steps.cache-webrtc.outputs.cache-hit != 'true'
+        shell: cmd
+        run: |
+          %VC%
+
+          :: Qt libjpeg.
+          mkdir qt_%QT%
+          cd qt_%QT%
+          git clone -b %QT_VER% https://github.com/qt/qtbase
+
+          move qtbase\src\3rdparty\libjpeg ..
+          cd ..
+          dir
+          rmdir /S /Q qt_%QT%
+          mkdir qt_%QT%\qtbase\src\3rdparty\
+          move libjpeg qt_%QT%\qtbase\src\3rdparty\
+
+          :: WebRTC.
+          cd %LibrariesPath%
+
+          git clone %GIT%/desktop-app/tg_owt.git
+          mkdir tg_owt\out\Debug
+          cd tg_owt\out\Debug
+          cmake -G Ninja ^
+          -DCMAKE_BUILD_TYPE=Debug ^
+          -DTG_OWT_SPECIAL_TARGET=win ^
+          -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_%QT%/qtbase/src/3rdparty/libjpeg ^
+          -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_%OPENSSL_VER%/include ^
+          -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
+          -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ^
+          ../..
+
+          ninja
+
+          :: Cleanup.
+          cd %LibrariesPath%\tg_owt
+          move out\Debug\tg_owt.lib tg_owt.lib
+          rmdir /S /Q out
+          mkdir out\Debug
+          move tg_owt.lib out\Debug\tg_owt.lib
+
+          cd %LibrariesPath%
+          rmdir /S /Q qt_%QT%
+
       - name: Read defines.
         shell: bash
         run: |
@@ -372,6 +422,7 @@ jobs:
           call configure.bat ^
           -D TDESKTOP_API_TEST=ON ^
           -D DESKTOP_APP_USE_PACKAGED=OFF ^
+          -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF ^
           %TDESKTOP_BUILD_DEFINE% ^
           -DCMAKE_SYSTEM_VERSION=%SDK%
 
@@ -386,7 +437,6 @@ jobs:
           cd %REPO_NAME%\out\Debug
           mkdir artifact
           move Telegram.exe artifact/
-          move Updater.exe artifact/
       - uses: actions/upload-artifact@master
         name: Upload artifact.
         if: env.UPLOAD_ARTIFACT == 'true'

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "Telegram/ThirdParty/libtgvoip"]
 	path = Telegram/ThirdParty/libtgvoip
 	url = https://github.com/telegramdesktop/libtgvoip
-[submodule "Telegram/ThirdParty/variant"]
-	path = Telegram/ThirdParty/variant
-	url = https://github.com/mapbox/variant
 [submodule "Telegram/ThirdParty/GSL"]
 	path = Telegram/ThirdParty/GSL
 	url = https://github.com/Microsoft/GSL.git
@@ -67,3 +64,36 @@
 [submodule "Telegram/ThirdParty/hunspell"]
 	path = Telegram/ThirdParty/hunspell
 	url = https://github.com/hunspell/hunspell
+[submodule "Telegram/ThirdParty/materialdecoration"]
+	path = Telegram/ThirdParty/materialdecoration
+	url = https://github.com/desktop-app/materialdecoration.git
+[submodule "Telegram/ThirdParty/range-v3"]
+	path = Telegram/ThirdParty/range-v3
+	url = https://github.com/ericniebler/range-v3.git
+[submodule "Telegram/ThirdParty/fcitx-qt5"]
+	path = Telegram/ThirdParty/fcitx-qt5
+	url = https://github.com/fcitx/fcitx-qt5.git
+[submodule "Telegram/ThirdParty/nimf"]
+	path = Telegram/ThirdParty/nimf
+	url = https://github.com/hamonikr/nimf.git
+[submodule "Telegram/ThirdParty/hime"]
+	path = Telegram/ThirdParty/hime
+	url = https://github.com/hime-ime/hime.git
+[submodule "Telegram/ThirdParty/qt5ct"]
+	path = Telegram/ThirdParty/qt5ct
+	url = https://github.com/desktop-app/qt5ct.git
+[submodule "Telegram/ThirdParty/lxqt-qtplugin"]
+	path = Telegram/ThirdParty/lxqt-qtplugin
+	url = https://github.com/lxqt/lxqt-qtplugin.git
+[submodule "Telegram/ThirdParty/libqtxdg"]
+	path = Telegram/ThirdParty/libqtxdg
+	url = https://github.com/lxqt/libqtxdg.git
+[submodule "Telegram/ThirdParty/fcitx5-qt"]
+	path = Telegram/ThirdParty/fcitx5-qt
+	url = https://github.com/fcitx/fcitx5-qt.git
+[submodule "Telegram/lib_webrtc"]
+	path = Telegram/lib_webrtc
+	url = https://github.com/desktop-app/lib_webrtc.git
+[submodule "Telegram/ThirdParty/tgcalls"]
+	path = Telegram/ThirdParty/tgcalls
+	url = https://github.com/TelegramMessenger/tgcalls.git

CMakeLists.txt

@@ -36,5 +36,9 @@ include(cmake/options.cmake)
 
 include(cmake/external/qt/package.cmake)
 
+set(desktop_app_skip_libs
+    variant
+)
+
 add_subdirectory(cmake)
 add_subdirectory(Telegram)

README.md

@@ -13,18 +13,28 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
 
 ## Supported systems
 
-* Windows XP - Windows 10 (**not** RT)
-* Mac OS X 10.8 - Mac OS X 10.15
-* Mac OS X 10.6 - Mac OS X 10.7 (separate build)
-* Ubuntu 12.04 - Ubuntu 20.04
-* Fedora 22 - Fedora 31
-* [Snappy](https://snapcraft.io/telegram-desktop)
-* [Flathub](https://flathub.org/apps/details/org.telegram.desktop)
+The latest version is available for
+
+* [Windows 7 and above](https://telegram.org/dl/desktop/win) ([portable](https://telegram.org/dl/desktop/win_portable))
+* [macOS 10.12 and above](https://telegram.org/dl/desktop/mac)
+* [OS X 10.10 and 10.11](https://telegram.org/dl/desktop/osx)
+* [Linux static build for 64 bit](https://telegram.org/dl/desktop/linux) ([32 bit](https://telegram.org/dl/desktop/linux32))
+* [Snap](https://snapcraft.io/telegram-desktop)
+* [Flatpak](https://flathub.org/apps/details/org.telegram.desktop)
+
+## Old system versions
+
+Version **1.8.15** was the last that supports older systems
+
+* [Windows XP and Vista](https://updates.tdesktop.com/tsetup/tsetup.1.8.15.exe) ([portable](https://updates.tdesktop.com/tsetup/tportable.1.8.15.zip))
+* [OS X 10.8 and 10.9](https://updates.tdesktop.com/tmac/tsetup.1.8.15.dmg)
+* [OS X 10.6 and 10.7](https://updates.tdesktop.com/tmac32/tsetup32.1.8.15.dmg)
 
 ## Third-party
 
-* Qt 5.12.8 and 5.6.2, slightly patched ([LGPL](http://doc.qt.io/qt-5/lgpl.html))
-* OpenSSL 1.1.1 ([OpenSSL License](https://www.openssl.org/source/license.html))
+* Qt 5.12.8, 5.6.2 and 5.3.2 slightly patched ([LGPL](http://doc.qt.io/qt-5/lgpl.html))
+* OpenSSL 1.1.1 and 1.0.1 ([OpenSSL License](https://www.openssl.org/source/license.html))
+* WebRTC ([New BSD License](https://github.com/desktop-app/tg_owt/blob/master/src/LICENSE))
 * zlib 1.2.11 ([zlib License](http://www.zlib.net/zlib_license.html))
 * LZMA SDK 9.20 ([public domain](http://www.7-zip.org/sdk.html))
 * liblzma ([public domain](http://tukaani.org/xz/))
@@ -36,9 +46,9 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
 * Opus codec ([BSD License](http://www.opus-codec.org/license/))
 * FFmpeg ([LGPL](https://www.ffmpeg.org/legal.html))
 * Guideline Support Library ([MIT License](https://github.com/Microsoft/GSL/blob/master/LICENSE))
-* Mapbox Variant ([BSD License](https://github.com/mapbox/variant/blob/master/LICENSE))
 * Range-v3 ([Boost License](https://github.com/ericniebler/range-v3/blob/master/LICENSE.txt))
 * Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html))
+* Vazir font ([License](https://github.com/rastikerdar/vazir-font/blob/master/LICENSE))
 * Emoji alpha codes ([MIT License](https://github.com/emojione/emojione/blob/master/extras/alpha-codes/LICENSE.md))
 * Catch test framework ([Boost License](https://github.com/philsquared/Catch/blob/master/LICENSE.txt))
 * xxHash ([BSD License](https://github.com/Cyan4973/xxHash/blob/dev/LICENSE))

Telegram/CMakeLists.txt

@@ -18,22 +18,24 @@ endif()
 add_subdirectory(lib_storage)
 add_subdirectory(lib_lottie)
 add_subdirectory(lib_qr)
+add_subdirectory(lib_webrtc)
 add_subdirectory(codegen)
 
-include(CheckCXXSourceCompiles)
 include(lib_ui/cmake/generate_styles.cmake)
-include(cmake/generate_lang.cmake)
 include(cmake/generate_numbers.cmake)
 
 get_filename_component(src_loc SourceFiles REALPATH)
 get_filename_component(res_loc Resources REALPATH)
 
 include(cmake/telegram_options.cmake)
-include(cmake/lib_export.cmake)
 include(cmake/lib_ffmpeg.cmake)
-include(cmake/lib_mtproto.cmake)
-include(cmake/lib_scheme.cmake)
 include(cmake/lib_tgvoip.cmake)
+include(cmake/lib_tgcalls.cmake)
+include(cmake/td_export.cmake)
+include(cmake/td_mtproto.cmake)
+include(cmake/td_lang.cmake)
+include(cmake/td_scheme.cmake)
+include(cmake/td_ui.cmake)
 
 set(style_files
     boxes/boxes.style
@@ -59,31 +61,25 @@ set(dependent_style_files
     ${submodules_loc}/lib_ui/ui/basic.style
     ${submodules_loc}/lib_ui/ui/layers/layers.style
     ${submodules_loc}/lib_ui/ui/widgets/widgets.style
+    ${src_loc}/ui/td_common.style
 )
 
 generate_styles(Telegram ${src_loc} "${style_files}" "${dependent_style_files}")
-generate_lang(Telegram ${res_loc}/langs/lang.strings)
 generate_numbers(Telegram ${res_loc}/numbers.txt)
 
 set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON)
 
-if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-    target_link_libraries(Telegram
-    PRIVATE
-        desktop-app::external_statusnotifieritem
-        desktop-app::external_dbusmenu_qt
-    )
-endif()
-
-if (add_hunspell_library)
-    target_link_libraries(Telegram PRIVATE desktop-app::external_hunspell)
-endif()
-
 target_link_libraries(Telegram
 PRIVATE
-    tdesktop::lib_mtproto
-    tdesktop::lib_scheme
-    tdesktop::lib_export
+    tdesktop::lib_tgcalls_legacy
+    tdesktop::lib_tgcalls
+    tdesktop::lib_tgvoip
+    tdesktop::td_export
+    tdesktop::td_mtproto
+    tdesktop::td_lang
+    tdesktop::td_scheme
+    tdesktop::td_ui
+    desktop-app::lib_webrtc
     desktop-app::lib_base
     desktop-app::lib_crl
     desktop-app::lib_ui
@@ -100,34 +96,94 @@ PRIVATE
     desktop-app::external_qr_code_generator
     desktop-app::external_crash_reports
     desktop-app::external_auto_updates
-    tdesktop::lib_tgvoip
     desktop-app::external_openssl
     desktop-app::external_openal
 )
 
-if (NOT DESKTOP_APP_USE_PACKAGED)
-    target_link_libraries(Telegram PRIVATE desktop-app::external_opus)
-endif()
+if (LINUX)
+    target_link_libraries(Telegram
+    PRIVATE
+        desktop-app::external_materialdecoration
+        desktop-app::external_nimf_qt5
+        desktop-app::external_qt5ct_support
+    )
 
-# Telegram uses long atomic types, so on some architectures libatomic is needed.
-check_cxx_source_compiles("
-#include <atomic>
-std::atomic_int64_t foo;
-int main() {return foo;}
-" HAVE_LONG_ATOMIC_WITHOUT_LIB)
-if (NOT HAVE_LONG_ATOMIC_WITHOUT_LIB)
-    target_link_libraries(Telegram PRIVATE atomic)
-endif()
+    if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
+        # conflicts with Qt static link
+        if (DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES)
+            target_link_libraries(Telegram
+            PRIVATE
+                desktop-app::external_lxqt_qtplugin
+            )
+        endif()
 
-if (DESKTOP_APP_USE_PACKAGED)
-    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-    find_package(Threads)
+        target_link_libraries(Telegram
+        PRIVATE
+            desktop-app::external_statusnotifieritem
+            desktop-app::external_dbusmenu_qt
+            desktop-app::external_fcitx_qt5
+            desktop-app::external_fcitx5_qt5
+            desktop-app::external_hime_qt
+        )
+    endif()
+
+    if (DESKTOP_APP_USE_PACKAGED AND Qt5WaylandClient_VERSION VERSION_LESS 5.13.0)
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
+
+        target_include_directories(Telegram
+        PRIVATE
+            ${WAYLAND_CLIENT_INCLUDE_DIRS}
+        )
+    endif()
+
+    if (DESKTOP_APP_USE_PACKAGED)
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(XCB_SCREENSAVER REQUIRED IMPORTED_TARGET xcb-screensaver)
+        pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb)
+
+        target_link_libraries(Telegram
+        PRIVATE
+            PkgConfig::XCB_SCREENSAVER
+            PkgConfig::XCB
+        )
+    else()
+        target_link_static_libraries(Telegram PRIVATE xcb-screensaver)
+        target_link_libraries(Telegram PRIVATE xcb)
+    endif()
+
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
+    pkg_check_modules(GOBJECT REQUIRED IMPORTED_TARGET gobject-2.0)
+    pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
 
     target_link_libraries(Telegram
     PRIVATE
-        ${CMAKE_DL_LIBS}
-        Threads::Threads
+        PkgConfig::GLIB2
+        PkgConfig::GOBJECT
+        PkgConfig::GIO
     )
+
+    target_compile_definitions(Telegram PRIVATE G_LOG_DOMAIN="Telegram")
+
+    if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
+        find_package(PkgConfig REQUIRED)
+
+        if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
+            pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
+            pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
+
+            target_link_libraries(Telegram
+            PRIVATE
+                PkgConfig::GTK3
+                PkgConfig::X11
+            )
+        else()
+            pkg_search_module(GTK REQUIRED gtk+-2.0 gtk+-3.0)
+            target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
+            target_link_libraries(Telegram PRIVATE X11)
+        endif()
+    endif()
 endif()
 
 target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h)
@@ -135,12 +191,27 @@ nice_target_sources(Telegram ${src_loc}
 PRIVATE
     ${style_files}
 
+    api/api_authorizations.cpp
+    api/api_authorizations.h
+    api/api_bot.cpp
+    api/api_bot.h
     api/api_chat_filters.cpp
     api/api_chat_filters.h
+    api/api_chat_invite.cpp
+    api/api_chat_invite.h
     api/api_common.h
+    api/api_editing.cpp
+    api/api_editing.h
+    api/api_global_privacy.cpp
+    api/api_global_privacy.h
+    api/api_hash.cpp
     api/api_hash.h
+    api/api_media.cpp
+    api/api_media.h
     api/api_self_destruct.cpp
     api/api_self_destruct.h
+    api/api_send_progress.cpp
+    api/api_send_progress.h
     api/api_sending.cpp
     api/api_sending.h
     api/api_sensitive_content.cpp
@@ -149,6 +220,10 @@ PRIVATE
     api/api_single_message_search.h
     api/api_text_entities.cpp
     api/api_text_entities.h
+    api/api_toggling_media.cpp
+    api/api_toggling_media.h
+    api/api_updates.cpp
+    api/api_updates.h
     boxes/filters/edit_filter_box.cpp
     boxes/filters/edit_filter_box.h
     boxes/filters/edit_filter_chats_list.cpp
@@ -253,8 +328,14 @@ PRIVATE
     calls/calls_instance.h
     calls/calls_panel.cpp
     calls/calls_panel.h
+    calls/calls_signal_bars.cpp
+    calls/calls_signal_bars.h
     calls/calls_top_bar.cpp
     calls/calls_top_bar.h
+    calls/calls_userpic.cpp
+    calls/calls_userpic.h
+    calls/calls_video_bubble.cpp
+    calls/calls_video_bubble.h
     chat_helpers/bot_keyboard.cpp
     chat_helpers/bot_keyboard.h
     chat_helpers/emoji_keywords.cpp
@@ -271,16 +352,20 @@ PRIVATE
     chat_helpers/gifs_list_widget.h
     chat_helpers/message_field.cpp
     chat_helpers/message_field.h
+    chat_helpers/send_context_menu.cpp
+    chat_helpers/send_context_menu.h
     chat_helpers/spellchecker_common.cpp
     chat_helpers/spellchecker_common.h
-    chat_helpers/stickers.cpp
-    chat_helpers/stickers.h
+    chat_helpers/stickers_emoji_image_loader.cpp
+    chat_helpers/stickers_emoji_image_loader.h
     chat_helpers/stickers_emoji_pack.cpp
     chat_helpers/stickers_emoji_pack.h
     chat_helpers/stickers_dice_pack.cpp
     chat_helpers/stickers_dice_pack.h
     chat_helpers/stickers_list_widget.cpp
     chat_helpers/stickers_list_widget.h
+    chat_helpers/stickers_lottie.cpp
+    chat_helpers/stickers_lottie.h
     chat_helpers/tabbed_panel.cpp
     chat_helpers/tabbed_panel.h
     chat_helpers/tabbed_section.cpp
@@ -309,7 +394,6 @@ PRIVATE
     core/launcher.h
     core/local_url_handlers.cpp
     core/local_url_handlers.h
-    core/media_active_cache.h
     core/mime_type.cpp
     core/mime_type.h
     core/sandbox.cpp
@@ -323,6 +407,10 @@ PRIVATE
     core/utils.cpp
     core/utils.h
     core/version.h
+    data/stickers/data_stickers_set.cpp
+    data/stickers/data_stickers_set.h
+    data/stickers/data_stickers.cpp
+    data/stickers/data_stickers.h
     data/data_abstract_structure.cpp
     data/data_abstract_structure.h
     data/data_auto_download.cpp
@@ -331,18 +419,22 @@ PRIVATE
     data/data_chat.h
     data/data_chat_filters.cpp
     data/data_chat_filters.h
+    data/data_changes.cpp
+    data/data_changes.h
     data/data_channel.cpp
     data/data_channel.h
     data/data_channel_admins.cpp
     data/data_channel_admins.h
+    data/data_cloud_file.cpp
+    data/data_cloud_file.h
     data/data_cloud_themes.cpp
     data/data_cloud_themes.h
     data/data_countries.cpp
     data/data_countries.h
     data/data_document.cpp
     data/data_document.h
-    data/data_document_good_thumbnail.cpp
-    data/data_document_good_thumbnail.h
+    data/data_document_media.cpp
+    data/data_document_media.h
     data/data_drafts.cpp
     data/data_drafts.h
     data/data_folder.cpp
@@ -373,10 +465,16 @@ PRIVATE
     data/data_peer_values.h
     data/data_photo.cpp
     data/data_photo.h
+    data/data_photo_media.cpp
+    data/data_photo_media.h
     data/data_poll.cpp
     data/data_poll.h
     data/data_pts_waiter.cpp
     data/data_pts_waiter.h
+    data/data_replies_list.cpp
+    data/data_replies_list.h
+    data/data_reply_preview.cpp
+    data/data_reply_preview.h
     data/data_search_controller.cpp
     data/data_search_controller.h
     data/data_session.cpp
@@ -421,6 +519,8 @@ PRIVATE
     dialogs/dialogs_search_from_controllers.h
     dialogs/dialogs_widget.cpp
     dialogs/dialogs_widget.h
+    export/export_manager.cpp
+    export/export_manager.h
     export/view/export_view_content.cpp
     export/view/export_view_content.h
     export/view/export_view_panel_controller.cpp
@@ -494,14 +594,20 @@ PRIVATE
     history/view/history_view_message.cpp
     history/view/history_view_message.h
     history/view/history_view_object.h
+    history/view/history_view_replies_section.cpp
+    history/view/history_view_replies_section.h
     history/view/history_view_schedule_box.cpp
     history/view/history_view_schedule_box.h
     history/view/history_view_scheduled_section.cpp
     history/view/history_view_scheduled_section.h
+    history/view/history_view_send_action.cpp
+    history/view/history_view_send_action.h
     history/view/history_view_service_message.cpp
     history/view/history_view_service_message.h
     history/view/history_view_top_bar_widget.cpp
     history/view/history_view_top_bar_widget.h
+    history/view/history_view_webpage_preview.cpp
+    history/view/history_view_webpage_preview.h
     history/history.cpp
     history/history.h
     history/history_drag_area.cpp
@@ -615,31 +721,22 @@ PRIVATE
     intro/intro_widget.h
     lang/lang_cloud_manager.cpp
     lang/lang_cloud_manager.h
-    lang/lang_file_parser.cpp
-    lang/lang_file_parser.h
-    lang/lang_hardcoded.h
     lang/lang_instance.cpp
     lang/lang_instance.h
-    lang/lang_keys.cpp
-    lang/lang_keys.h
     lang/lang_numbers_animation.cpp
     lang/lang_numbers_animation.h
-    lang/lang_tag.cpp
-    lang/lang_tag.h
-    lang/lang_text_entity.cpp
-    lang/lang_text_entity.h
     lang/lang_translator.cpp
     lang/lang_translator.h
-    lang/lang_values.cpp
-    lang/lang_values.h
     main/main_account.cpp
     main/main_account.h
     main/main_app_config.cpp
     main/main_app_config.h
+    main/main_domain.cpp
+    main/main_domain.h
     main/main_session.cpp
     main/main_session.h
-    main/main_settings.cpp
-    main/main_settings.h
+    main/main_session_settings.cpp
+    main/main_session_settings.h
     media/audio/media_audio.cpp
     media/audio/media_audio.h
     media/audio/media_audio_capture.cpp
@@ -654,6 +751,8 @@ PRIVATE
     media/audio/media_audio_track.h
     media/audio/media_child_ffmpeg_loader.cpp
     media/audio/media_child_ffmpeg_loader.h
+    media/audio/media_openal_functions.cpp
+    media/audio/media_openal_functions.h
     media/clip/media_clip_check_streaming.cpp
     media/clip/media_clip_check_streaming.h
     media/clip/media_clip_ffmpeg.cpp
@@ -719,8 +818,6 @@ PRIVATE
     mtproto/connection_tcp.cpp
     mtproto/connection_tcp.h
     mtproto/core_types.h
-    mtproto/dc_options.cpp
-    mtproto/dc_options.h
     mtproto/dedicated_file_loader.cpp
     mtproto/dedicated_file_loader.h
     mtproto/facade.cpp
@@ -737,6 +834,7 @@ PRIVATE
     mtproto/type_utils.h
     overview/overview_layout.cpp
     overview/overview_layout.h
+    overview/overview_layout_delegate.h
     passport/passport_encryption.cpp
     passport/passport_encryption.h
     passport/passport_form_controller.cpp
@@ -765,6 +863,8 @@ PRIVATE
     platform/linux/linux_gdk_helper.h
     platform/linux/linux_libs.cpp
     platform/linux/linux_libs.h
+    platform/linux/linux_xlib_helper.cpp
+    platform/linux/linux_xlib_helper.h
     platform/linux/file_utilities_linux.cpp
     platform/linux/file_utilities_linux.h
     platform/linux/launcher_linux.cpp
@@ -775,11 +875,11 @@ PRIVATE
     platform/linux/notifications_manager_linux.h
     platform/linux/specific_linux.cpp
     platform/linux/specific_linux.h
+    platform/linux/window_title_linux.h
     platform/mac/file_utilities_mac.mm
     platform/mac/file_utilities_mac.h
     platform/mac/launcher_mac.mm
     platform/mac/launcher_mac.h
-    platform/mac/mac_iconv_helper.c
     platform/mac/main_window_mac.mm
     platform/mac/main_window_mac.h
     platform/mac/notifications_manager_mac.mm
@@ -790,8 +890,24 @@ PRIVATE
     platform/mac/specific_mac_p.h
     platform/mac/window_title_mac.mm
     platform/mac/window_title_mac.h
-    platform/mac/mac_touchbar.h
-    platform/mac/mac_touchbar.mm
+    platform/mac/touchbar/items/mac_formatter_item.h
+    platform/mac/touchbar/items/mac_formatter_item.mm
+    platform/mac/touchbar/items/mac_pinned_chats_item.h
+    platform/mac/touchbar/items/mac_pinned_chats_item.mm
+    platform/mac/touchbar/items/mac_scrubber_item.h
+    platform/mac/touchbar/items/mac_scrubber_item.mm
+    platform/mac/touchbar/mac_touchbar_audio.h
+    platform/mac/touchbar/mac_touchbar_audio.mm
+    platform/mac/touchbar/mac_touchbar_common.h
+    platform/mac/touchbar/mac_touchbar_common.mm
+    platform/mac/touchbar/mac_touchbar_controls.h
+    platform/mac/touchbar/mac_touchbar_controls.mm
+    platform/mac/touchbar/mac_touchbar_main.h
+    platform/mac/touchbar/mac_touchbar_main.mm
+    platform/mac/touchbar/mac_touchbar_manager.h
+    platform/mac/touchbar/mac_touchbar_manager.mm
+    platform/mac/touchbar/mac_touchbar_media_view.h
+    platform/mac/touchbar/mac_touchbar_media_view.mm
     platform/win/audio_win.cpp
     platform/win/audio_win.h
     platform/win/file_utilities_win.cpp
@@ -854,6 +970,10 @@ PRIVATE
     settings/settings_privacy_controllers.h
     settings/settings_privacy_security.cpp
     settings/settings_privacy_security.h
+    storage/details/storage_file_utilities.cpp
+    storage/details/storage_file_utilities.h
+    storage/details/storage_settings_scheme.cpp
+    storage/details/storage_settings_scheme.h
     storage/download_manager_mtproto.cpp
     storage/download_manager_mtproto.h
     storage/file_download.cpp
@@ -872,8 +992,14 @@ PRIVATE
     storage/serialize_common.h
     storage/serialize_document.cpp
     storage/serialize_document.h
+    storage/serialize_peer.cpp
+    storage/serialize_peer.h
+    storage/storage_account.cpp
+    storage/storage_account.h
     storage/storage_cloud_blob.cpp
     storage/storage_cloud_blob.h
+    storage/storage_domain.cpp
+    storage/storage_domain.h
     storage/storage_facade.cpp
     storage/storage_facade.h
     # storage/storage_feed_messages.cpp
@@ -906,8 +1032,8 @@ PRIVATE
     ui/image/image.h
     ui/image/image_location.cpp
     ui/image/image_location.h
-    ui/image/image_source.cpp
-    ui/image/image_source.h
+    ui/image/image_location_factory.cpp
+    ui/image/image_location_factory.h
     ui/widgets/continuous_sliders.cpp
     ui/widgets/continuous_sliders.h
     ui/widgets/discrete_sliders.cpp
@@ -954,6 +1080,7 @@ PRIVATE
     window/window_connecting_widget.h
     window/window_controller.cpp
     window/window_controller.h
+    window/window_controls_layout.h
     window/window_filters_menu.cpp
     window/window_filters_menu.h
     window/window_history_hider.cpp
@@ -972,6 +1099,8 @@ PRIVATE
     window/window_session_controller.h
     window/window_slide_animation.cpp
     window/window_slide_animation.h
+    window/window_title_qt.cpp
+    window/window_title_qt.h
     window/window_title.h
     window/window_top_bar_wrap.h
     window/themes/window_theme.cpp
@@ -1008,16 +1137,21 @@ PRIVATE
     mainwidget.h
     mainwindow.cpp
     mainwindow.h
-    observer_peer.cpp
-    observer_peer.h
+    qt_static_plugins.cpp
     settings.cpp
     settings.h
+    stdafx.h
 )
 
-if (DESKTOP_APP_USE_PACKAGED)
-    nice_target_sources(Telegram ${src_loc} PRIVATE qt_functions.cpp)
-else()
-    nice_target_sources(Telegram ${src_loc} PRIVATE qt_static_plugins.cpp)
+if (NOT LINUX)
+    remove_target_sources(Telegram ${src_loc}
+        window/window_title_qt.cpp
+        window/window_title_qt.h
+    )
+endif()
+
+if (NOT DESKTOP_APP_USE_PACKAGED)
+    nice_target_sources(Telegram ${src_loc} PRIVATE platform/mac/mac_iconv_helper.c)
 endif()
 
 nice_target_sources(Telegram ${res_loc}
@@ -1027,6 +1161,8 @@ PRIVATE
     qrc/emoji_3.qrc
     qrc/emoji_4.qrc
     qrc/emoji_5.qrc
+    qrc/emoji_6.qrc
+    qrc/emoji_7.qrc
     qrc/emoji_preview.qrc
     qrc/telegram/telegram.qrc
     qrc/telegram/sounds.qrc
@@ -1051,11 +1187,11 @@ if (WIN32)
     #     $<IF:${release},"Appending compatibility manifest.","Finalizing build.">
     # )
 elseif (APPLE)
-    target_link_libraries(Telegram
-    PRIVATE
-        desktop-app::external_sp_media_key_tap
-        desktop-app::external_iconv
-    )
+    target_link_libraries(Telegram PRIVATE desktop-app::external_sp_media_key_tap)
+
+    if (NOT DESKTOP_APP_USE_PACKAGED)
+        target_link_libraries(Telegram PRIVATE desktop-app::external_iconv)
+    endif()
 
     set(icons_path ${CMAKE_CURRENT_SOURCE_DIR}/Telegram/Images.xcassets)
     set_target_properties(Telegram PROPERTIES RESOURCE ${icons_path})
@@ -1094,19 +1230,6 @@ elseif (APPLE)
             )
         endif()
     endif()
-elseif (LINUX)
-    if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
-        find_package(PkgConfig REQUIRED)
-
-        pkg_search_module(GTK REQUIRED gtk+-2.0 gtk+-3.0)
-        target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
-        target_compile_options(Telegram PRIVATE -Wno-register)
-
-        if (DESKTOP_APP_USE_PACKAGED)
-            find_library(X11_LIBRARY X11)
-            target_link_libraries(Telegram PRIVATE ${X11_LIBRARY})
-        endif()
-    endif()
 endif()
 
 if (build_macstore)
@@ -1163,22 +1286,13 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/Telegram PREFIX Resources FILES ${
 
 target_include_directories(Telegram PRIVATE ${src_loc})
 
-if (NOT DESKTOP_APP_USE_PACKAGED)
-    target_include_directories(Telegram PRIVATE ${third_party_loc}/minizip)
-endif()
-
 target_compile_definitions(Telegram
 PRIVATE
     TDESKTOP_API_ID=${TDESKTOP_API_ID}
     TDESKTOP_API_HASH=${TDESKTOP_API_HASH}
-    AL_ALEXT_PROTOTYPES
 )
 
-if (NOT DESKTOP_APP_USE_PACKAGED)
-    target_compile_definitions(Telegram PRIVATE AL_LIBTYPE_STATIC)
-endif()
-
-if (${CMAKE_GENERATOR} MATCHES "(Visual Studio|Xcode)")
+if (APPLE OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL "" OR NOT "${output_name}" STREQUAL "Telegram")
     set(output_folder ${CMAKE_BINARY_DIR})
 elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "")
     set(output_folder ${CMAKE_BINARY_DIR}/bin)
@@ -1188,7 +1302,7 @@ endif()
 
 set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
 
-if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR NOT LINUX) AND NOT build_macstore AND NOT build_winstore)
+if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT build_winstore)
     add_executable(Updater WIN32)
     init_target(Updater)
 
@@ -1204,6 +1318,10 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR NOT LINUX) AND NOT build_macstore AND
 
     set_target_properties(Updater PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
 
+    if (WIN32 AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        target_link_options(Updater PRIVATE -municode)
+    endif()
+
     if (LINUX)
         target_link_options(Updater PRIVATE -static-libstdc++)
     endif()

Telegram/Patches/build_ffmpeg_win.sh

@@ -13,6 +13,8 @@ pacman --noconfirm -S pkg-config
 PKG_CONFIG_PATH="/mingw64/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 ./configure --toolchain=msvc \
+--extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
+--extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
 --extra-ldflags="-libpath:$FullExecPath/../opus/win32/VS2015/Win32/Release" \
 --disable-programs \
 --disable-doc \

Telegram/Patches/ffmpeg.diff

@@ -1,225 +0,0 @@
-diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile
-index 00f93bf59f..52da7036f3 100644
---- a/libavcodec/aarch64/Makefile
-+++ b/libavcodec/aarch64/Makefile
-@@ -6,6 +6,7 @@ OBJS-$(CONFIG_H264DSP)                  += aarch64/h264dsp_init_aarch64.o
- OBJS-$(CONFIG_H264PRED)                 += aarch64/h264pred_init.o
- OBJS-$(CONFIG_H264QPEL)                 += aarch64/h264qpel_init_aarch64.o
- OBJS-$(CONFIG_HPELDSP)                  += aarch64/hpeldsp_init_aarch64.o
-+OBJS-$(CONFIG_IDCTDSP)                  += aarch64/idctdsp_init_aarch64.o
- OBJS-$(CONFIG_MPEGAUDIODSP)             += aarch64/mpegaudiodsp_init.o
- OBJS-$(CONFIG_NEON_CLOBBER_TEST)        += aarch64/neontest.o
- OBJS-$(CONFIG_VIDEODSP)                 += aarch64/videodsp_init.o
-@@ -21,6 +22,7 @@ OBJS-$(CONFIG_VC1DSP)                   += aarch64/vc1dsp_init_aarch64.o
- OBJS-$(CONFIG_VORBIS_DECODER)           += aarch64/vorbisdsp_init.o
- OBJS-$(CONFIG_VP9_DECODER)              += aarch64/vp9dsp_init_10bpp_aarch64.o \
-                                            aarch64/vp9dsp_init_12bpp_aarch64.o \
-+                                           aarch64/vp9mc_aarch64.o             \
-                                            aarch64/vp9dsp_init_aarch64.o
- 
- # ARMv8 optimizations
-@@ -41,8 +43,7 @@ NEON-OBJS-$(CONFIG_H264PRED)            += aarch64/h264pred_neon.o
- NEON-OBJS-$(CONFIG_H264QPEL)            += aarch64/h264qpel_neon.o             \
-                                            aarch64/hpeldsp_neon.o
- NEON-OBJS-$(CONFIG_HPELDSP)             += aarch64/hpeldsp_neon.o
--NEON-OBJS-$(CONFIG_IDCTDSP)             += aarch64/idctdsp_init_aarch64.o      \
--                                           aarch64/simple_idct_neon.o
-+NEON-OBJS-$(CONFIG_IDCTDSP)             += aarch64/simple_idct_neon.o
- NEON-OBJS-$(CONFIG_MDCT)                += aarch64/mdct_neon.o
- NEON-OBJS-$(CONFIG_MPEGAUDIODSP)        += aarch64/mpegaudiodsp_neon.o
- NEON-OBJS-$(CONFIG_VP8DSP)              += aarch64/vp8dsp_neon.o
-diff --git a/libavcodec/aarch64/idctdsp_init_aarch64.c b/libavcodec/aarch64/idctdsp_init_aarch64.c
-index 0406e60830..742a3372e3 100644
---- a/libavcodec/aarch64/idctdsp_init_aarch64.c
-+++ b/libavcodec/aarch64/idctdsp_init_aarch64.c
-@@ -21,6 +21,8 @@
-  */
- 
- #include "libavutil/attributes.h"
-+#include "libavutil/cpu.h"
-+#include "libavutil/arm/cpu.h"
- #include "libavcodec/avcodec.h"
- #include "libavcodec/idctdsp.h"
- #include "idct.h"
-@@ -28,7 +30,9 @@
- av_cold void ff_idctdsp_init_aarch64(IDCTDSPContext *c, AVCodecContext *avctx,
-                                      unsigned high_bit_depth)
- {
--    if (!avctx->lowres && !high_bit_depth) {
-+    int cpu_flags = av_get_cpu_flags();
-+
-+    if (have_neon(cpu_flags) && !avctx->lowres && !high_bit_depth) {
-         if (avctx->idct_algo == FF_IDCT_AUTO ||
-             avctx->idct_algo == FF_IDCT_SIMPLEAUTO ||
-             avctx->idct_algo == FF_IDCT_SIMPLENEON) {
-diff --git a/libavcodec/aarch64/vp9mc_16bpp_neon.S b/libavcodec/aarch64/vp9mc_16bpp_neon.S
-index cac6428709..53b372c262 100644
---- a/libavcodec/aarch64/vp9mc_16bpp_neon.S
-+++ b/libavcodec/aarch64/vp9mc_16bpp_neon.S
-@@ -25,31 +25,6 @@
- //                            const uint8_t *ref, ptrdiff_t ref_stride,
- //                            int h, int mx, int my);
- 
--function ff_vp9_copy128_aarch64, export=1
--1:
--        ldp             x5,  x6,  [x2]
--        ldp             x7,  x8,  [x2, #16]
--        stp             x5,  x6,  [x0]
--        ldp             x9,  x10, [x2, #32]
--        stp             x7,  x8,  [x0, #16]
--        subs            w4,  w4,  #1
--        ldp             x11, x12, [x2, #48]
--        stp             x9,  x10, [x0, #32]
--        stp             x11, x12, [x0, #48]
--        ldp             x5,  x6,  [x2, #64]
--        ldp             x7,  x8,  [x2, #80]
--        stp             x5,  x6,  [x0, #64]
--        ldp             x9,  x10, [x2, #96]
--        stp             x7,  x8,  [x0, #80]
--        ldp             x11, x12, [x2, #112]
--        stp             x9,  x10, [x0, #96]
--        stp             x11, x12, [x0, #112]
--        add             x2,  x2,  x3
--        add             x0,  x0,  x1
--        b.ne            1b
--        ret
--endfunc
--
- function ff_vp9_avg64_16_neon, export=1
-         mov             x5,  x0
-         sub             x1,  x1,  #64
-diff --git a/libavcodec/aarch64/vp9mc_aarch64.S b/libavcodec/aarch64/vp9mc_aarch64.S
-new file mode 100644
-index 0000000000..f17a8cf04a
---- /dev/null
-+++ b/libavcodec/aarch64/vp9mc_aarch64.S
-@@ -0,0 +1,81 @@
-+/*
-+ * Copyright (c) 2016 Google Inc.
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include "libavutil/aarch64/asm.S"
-+
-+// All public functions in this file have the following signature:
-+// typedef void (*vp9_mc_func)(uint8_t *dst, ptrdiff_t dst_stride,
-+//                            const uint8_t *ref, ptrdiff_t ref_stride,
-+//                            int h, int mx, int my);
-+
-+function ff_vp9_copy128_aarch64, export=1
-+1:
-+        ldp             x5,  x6,  [x2]
-+        ldp             x7,  x8,  [x2, #16]
-+        stp             x5,  x6,  [x0]
-+        ldp             x9,  x10, [x2, #32]
-+        stp             x7,  x8,  [x0, #16]
-+        subs            w4,  w4,  #1
-+        ldp             x11, x12, [x2, #48]
-+        stp             x9,  x10, [x0, #32]
-+        stp             x11, x12, [x0, #48]
-+        ldp             x5,  x6,  [x2, #64]
-+        ldp             x7,  x8,  [x2, #80]
-+        stp             x5,  x6,  [x0, #64]
-+        ldp             x9,  x10, [x2, #96]
-+        stp             x7,  x8,  [x0, #80]
-+        ldp             x11, x12, [x2, #112]
-+        stp             x9,  x10, [x0, #96]
-+        stp             x11, x12, [x0, #112]
-+        add             x2,  x2,  x3
-+        add             x0,  x0,  x1
-+        b.ne            1b
-+        ret
-+endfunc
-+
-+function ff_vp9_copy64_aarch64, export=1
-+1:
-+        ldp             x5,  x6,  [x2]
-+        ldp             x7,  x8,  [x2, #16]
-+        stp             x5,  x6,  [x0]
-+        ldp             x9,  x10, [x2, #32]
-+        stp             x7,  x8,  [x0, #16]
-+        subs            w4,  w4,  #1
-+        ldp             x11, x12, [x2, #48]
-+        stp             x9,  x10, [x0, #32]
-+        stp             x11, x12, [x0, #48]
-+        add             x2,  x2,  x3
-+        add             x0,  x0,  x1
-+        b.ne            1b
-+        ret
-+endfunc
-+
-+function ff_vp9_copy32_aarch64, export=1
-+1:
-+        ldp             x5,  x6,  [x2]
-+        ldp             x7,  x8,  [x2, #16]
-+        stp             x5,  x6,  [x0]
-+        subs            w4,  w4,  #1
-+        stp             x7,  x8,  [x0, #16]
-+        add             x2,  x2,  x3
-+        add             x0,  x0,  x1
-+        b.ne            1b
-+        ret
-+endfunc
-diff --git a/libavcodec/aarch64/vp9mc_neon.S b/libavcodec/aarch64/vp9mc_neon.S
-index f67624ca04..abf2bae9db 100644
---- a/libavcodec/aarch64/vp9mc_neon.S
-+++ b/libavcodec/aarch64/vp9mc_neon.S
-@@ -25,23 +25,6 @@
- //                            const uint8_t *ref, ptrdiff_t ref_stride,
- //                            int h, int mx, int my);
- 
--function ff_vp9_copy64_aarch64, export=1
--1:
--        ldp             x5,  x6,  [x2]
--        ldp             x7,  x8,  [x2, #16]
--        stp             x5,  x6,  [x0]
--        ldp             x9,  x10, [x2, #32]
--        stp             x7,  x8,  [x0, #16]
--        subs            w4,  w4,  #1
--        ldp             x11, x12, [x2, #48]
--        stp             x9,  x10, [x0, #32]
--        stp             x11, x12, [x0, #48]
--        add             x2,  x2,  x3
--        add             x0,  x0,  x1
--        b.ne            1b
--        ret
--endfunc
--
- function ff_vp9_avg64_neon, export=1
-         mov             x5,  x0
- 1:
-@@ -64,19 +47,6 @@ function ff_vp9_avg64_neon, export=1
-         ret
- endfunc
- 
--function ff_vp9_copy32_aarch64, export=1
--1:
--        ldp             x5,  x6,  [x2]
--        ldp             x7,  x8,  [x2, #16]
--        stp             x5,  x6,  [x0]
--        subs            w4,  w4,  #1
--        stp             x7,  x8,  [x0, #16]
--        add             x2,  x2,  x3
--        add             x0,  x0,  x1
--        b.ne            1b
--        ret
--endfunc
--
- function ff_vp9_avg32_neon, export=1
- 1:
-         ld1             {v2.16b, v3.16b},  [x2], x3