Date: Monday, April 11, 2022 @ 16:44:35 Author: farseerfc Revision: 1185871
upgpkg: telegram-desktop 3.6.1-3: build against ffmpeg4.4 again Modified: telegram-desktop/trunk/PKGBUILD ----------+ PKGBUILD | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-11 16:38:19 UTC (rev 1185870) +++ PKGBUILD 2022-04-11 16:44:35 UTC (rev 1185871) @@ -2,12 +2,12 @@ # Contributor: hexchain <[email protected]> pkgname=telegram-desktop pkgver=3.6.1 -pkgrel=2 +pkgrel=3 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/"; license=('GPL3') -depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 'ttf-opensans' +depends=('hunspell' 'ffmpeg4.4' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 'ttf-opensans' 'qt6-imageformats' 'qt6-svg' 'qt6-wayland' 'qt6-5compat' 'xxhash' 'glibmm' 'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 'jemalloc' 'abseil-cpp' 'libdispatch') makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'meson' @@ -15,13 +15,12 @@ optdepends=('webkit2gtk: embedded browser features' 'xdg-desktop-portal: desktop integration') source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"; - fix-ffmpeg5.patch) + ) sha512sums=('dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba' - '6c6b1e3135ce670ecdceb11aa10fdc177951ae2088b7172249f4050b0a30346a8ebd2691302afe270acded2cef4d6eef930f8375b9a676ffcebd6801e645d6fe') + ) prepare() { cd tdesktop-$pkgver-full - patch -Np1 -d Telegram/ThirdParty/tgcalls -i "$srcdir"/fix-ffmpeg5.patch } build() { @@ -30,7 +29,8 @@ # Fix https://bugs.archlinux.org/task/73220 export CXXFLAGS+=" -Wp,-U_GLIBCXX_ASSERTIONS" - # Turns out we're allowed to use the official API key that telegram uses for their snap builds: + export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig' + #Turns out we're allowed to use the official API key that telegram uses for their snap builds: # https://github.com/telegramdesktop/tdesktop/blob/8fab9167beb2407c1153930ed03a4badd0c2b59f/snap/snapcraft.yaml#L87-L88 # Thanks @primeos! cmake \ @@ -40,6 +40,13 @@ -DCMAKE_BUILD_TYPE=Release \ -DTDESKTOP_API_ID=611335 \ -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c + sed -i "s|/usr/lib/libav|/usr/lib/ffmpeg4.4/libav|g" build/build.ninja + sed -i "s|/usr/lib/libsw|/usr/lib/ffmpeg4.4/libsw|g" build/build.ninja + sed -i "s|-lavcodec|/usr/lib/ffmpeg4.4/libavcodec.so|g" build/build.ninja + sed -i "s|-lavformat|/usr/lib/ffmpeg4.4/libavformat.so|g" build/build.ninja + sed -i "s|-lavutil|/usr/lib/ffmpeg4.4/libavutil.so|g" build/build.ninja + sed -i "s|-lswscale|/usr/lib/ffmpeg4.4/libswscale.so|g" build/build.ninja + sed -i "s|-lswresample|/usr/lib/ffmpeg4.4/libswresample.so|g" build/build.ninja ninja -C build }
