build with ffmpeg4.4

2 files changed, 16 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64ec182e09d6..9d46e9a20aba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,7 +21,7 @@ pkgbase = kotatogram-dev-git
 	makedepends = libtg_owt
 	makedepends = meson
 	depends = hunspell
-	depends = ffmpeg
+	depends = ffmpeg4.4
 	depends = hicolor-icon-theme
 	depends = lz4
 	depends = minizip
@@ -57,6 +57,7 @@ pkgbase = kotatogram-dev-git
 	depends = xcb-util-keysyms
 	depends = libxcb
 	depends = gcc-libs
+	depends = libdispatch
 	optdepends = webkit2gtk: embedded browser features
 	optdepends = xdg-desktop-portal: desktop integration
 	provides = kotatogram-desktop
@@ -99,8 +100,6 @@ pkgbase = kotatogram-dev-git
 	source = kotatogram-desktop-dispatch::git+https://github.com/apple/swift-corelibs-libdispatch.git
 	source = 0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch
 	source = block-sponsored_messages.patch
-	source = fix_ffmpeg5_build_24044.patch
-	source = fix_tgcalls_ffmpeg5.patch
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
@@ -136,7 +135,5 @@ pkgbase = kotatogram-dev-git
 	b2sums = SKIP
 	b2sums = 462900e97b9d7a9d40bc02d3dc7dacd3060cc19af02135065628e38e83835a2fb438581ca78001aaffc27d8b0473a78d39509c35f50e4ebb25607fe9c6bae264
 	b2sums = 96a703e3c7e4a2e2229c386daa24af0ca0228d130a35a6ba25e5da4885297d5d0b33fe37f26f71955cac01e3250dc4f811ebb6ff0fe58f3f7e5d5380a970347f
-	b2sums = 850eb9a923f12a58d6844f41fb6648c9873fa94f13d76f629dbd5c8e5ee4729a4bdb982dff8be846ad5e62d90cbecc99cc41d8c108e42e70b74d8304e1d3cef9
-	b2sums = c8f9125281606c020c346ac0e021adc75c1ce64454daa4c0a8126b209f3235ede129602de5c831745ed1424457d890cf3e6ee20c886716128bb580f39f3e58a1
 
 pkgname = kotatogram-dev-git
diff --git a/PKGBUILD b/PKGBUILD
index 6b20547b275f..0f91b7827cd5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,10 +13,10 @@ arch=('x86_64')
 url="https://kotatogram.github.io"
 license=('GPL3')
 provides=(kotatogram-desktop kotatogram-desktop-git)
-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' 'kwayland' 'glibmm'
          'rnnoise' 'pipewire' 'libxtst' 'jemalloc' 'libxrandr' 'abseil-cpp' 'libjpeg-turbo' 'opus' 'openssl' 'libx11' 'libvpx' 'libxcomposite'
-         'libxdamage' 'libxext' 'libxfixes' 'zlib' 'wayland'  'glibc' 'libsigc++' 'glib2' 'xcb-util-keysyms' 'libxcb' 'gcc-libs')
+         'libxdamage' 'libxext' 'libxfixes' 'zlib' 'wayland'  'glibc' 'libsigc++' 'glib2' 'xcb-util-keysyms' 'libxcb' 'gcc-libs' 'libdispatch')
 makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl'
              'extra-cmake-modules' 'wayland-protocols' 'plasma-wayland-protocols' 'webkit2gtk' 'unzip'
              'yasm' 'libtg_owt' 'meson')
@@ -59,8 +59,6 @@ source=("${_pkgname}::git+https://github.com/kotatogram/${_pkgname}.git#branch=d
 
         "0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch"
         "block-sponsored_messages.patch"
-        "fix_ffmpeg5_build_24044.patch"
-        "fix_tgcalls_ffmpeg5.patch"
         )
 
 
@@ -99,8 +97,7 @@ b2sums=('SKIP'
         'SKIP'
         '462900e97b9d7a9d40bc02d3dc7dacd3060cc19af02135065628e38e83835a2fb438581ca78001aaffc27d8b0473a78d39509c35f50e4ebb25607fe9c6bae264'
         '96a703e3c7e4a2e2229c386daa24af0ca0228d130a35a6ba25e5da4885297d5d0b33fe37f26f71955cac01e3250dc4f811ebb6ff0fe58f3f7e5d5380a970347f'
-        '850eb9a923f12a58d6844f41fb6648c9873fa94f13d76f629dbd5c8e5ee4729a4bdb982dff8be846ad5e62d90cbecc99cc41d8c108e42e70b74d8304e1d3cef9'
-        'c8f9125281606c020c346ac0e021adc75c1ce64454daa4c0a8126b209f3235ede129602de5c831745ed1424457d890cf3e6ee20c886716128bb580f39f3e58a1')
+)
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -150,20 +147,28 @@ prepare() {
     #patches
     #patch -p1 < "${srcdir}/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch"
     patch -p1 < "${srcdir}/block-sponsored_messages.patch"
-    patch -p1 < "${srcdir}/fix_ffmpeg5_build_24044.patch"
-    cd "${srcdir}/${_pkgname}/Telegram/ThirdParty/tgcalls/"
-    patch -p1 < "${srcdir}/fix_tgcalls_ffmpeg5.patch"
 }
 
 build() {
     cd "${srcdir}/${_pkgname}"
     export CXXFLAGS+=" -Wp,-U_GLIBCXX_ASSERTIONS"
+    export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig' # force build with ffmpeg4.4
     cmake . \
         -B build \
         -G Ninja  \
         -DCMAKE_INSTALL_PREFIX="/usr" \
         -DCMAKE_BUILD_TYPE=Release \
         -DTDESKTOP_API_TEST=ON
+
+    # Hack to compile for ffmpeg4.4
+    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
+
     cmake --build build
 }