fix crash, remove unnecessary dependecies, use packaged libtd_owt

instead of building it

4 files changed, 12 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0cd30bd07372..95def4deaa1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kotatogram-dev-git
 	pkgdesc = Kotatogram – experimental Telegram Desktop fork - Dev branch
 	pkgver = k1.4.8.r174.g98f2683e5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://kotatogram.github.io
 	arch = x86_64
 	license = GPL3
@@ -16,8 +16,6 @@ pkgbase = kotatogram-dev-git
 	makedepends = webkit2gtk
 	makedepends = unzip
 	makedepends = yasm
-	makedepends = protobuf
-	makedepends = libva
 	depends = hunspell
 	depends = ffmpeg
 	depends = hicolor-icon-theme
@@ -55,7 +53,6 @@ pkgbase = kotatogram-dev-git
 	depends = xcb-util-keysyms
 	depends = libxcb
 	depends = gcc-libs
-	depends = rlottie-git
 	optdepends = webkit2gtk: embedded browser features
 	optdepends = xdg-desktop-portal: desktop integration
 	provides = kotatogram-desktop
@@ -66,7 +63,6 @@ pkgbase = kotatogram-dev-git
 	source = kotatogram-desktop::git+https://github.com/kotatogram/kotatogram-desktop.git#branch=dev
 	source = kotatogram-desktop-libtgvoip::git+https://github.com/telegramdesktop/libtgvoip.git
 	source = kotatogram-desktop-GSL::git+https://github.com/Microsoft/GSL.git
-	source = kotatogram-desktop-Catch::git+https://github.com/philsquared/Catch
 	source = kotatogram-desktop-xxHash::git+https://github.com/Cyan4973/xxHash.git
 	source = kotatogram-desktop-rlottie::git+https://github.com/desktop-app/rlottie.git
 	source = kotatogram-desktop-lz4::git+https://github.com/lz4/lz4.git
@@ -75,7 +71,6 @@ pkgbase = kotatogram-dev-git
 	source = kotatogram-desktop-lib_base::git+https://github.com/desktop-app/lib_base.git
 	source = kotatogram-desktop-codegen::git+https://github.com/desktop-app/codegen.git
 	source = kotatogram-desktop-lib_ui::git+https://github.com/kotatogram/lib_ui.git
-	source = kotatogram-desktop-lib_rlottie::git+https://github.com/desktop-app/lib_rlottie.git
 	source = kotatogram-desktop-lib_lottie::git+https://github.com/desktop-app/lib_lottie.git
 	source = kotatogram-desktop-lib_tl::git+https://github.com/desktop-app/lib_tl.git
 	source = kotatogram-desktop-lib_spellcheck::git+https://github.com/desktop-app/lib_spellcheck.git
@@ -96,17 +91,10 @@ pkgbase = kotatogram-dev-git
 	source = kotatogram-desktop-lib_webview::git+https://github.com/desktop-app/lib_webview.git
 	source = kotatogram-desktop-lib_waylandshells::git+https://github.com/desktop-app/lib_waylandshells.git
 	source = kotatogram-desktop-jemalloc::git+https://github.com/jemalloc/jemalloc.git
-	source = kotatogram-desktop-tg_owt::git+https://github.com/desktop-app/tg_owt.git
-	source = libvpx::git+https://chromium.googlesource.com/webm/libvpx.git
-	source = libyuv::git+https://chromium.googlesource.com/libyuv/libyuv.git
-	source = pipewire::git+https://github.com/PipeWire/pipewire.git
+	source = kotatogram-desktop-kwayland::git+https://github.com/KDE/kwayland.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 = lottie-fix.patch
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
@@ -142,6 +130,5 @@ pkgbase = kotatogram-dev-git
 	b2sums = SKIP
 	b2sums = 462900e97b9d7a9d40bc02d3dc7dacd3060cc19af02135065628e38e83835a2fb438581ca78001aaffc27d8b0473a78d39509c35f50e4ebb25607fe9c6bae264
 	b2sums = 96a703e3c7e4a2e2229c386daa24af0ca0228d130a35a6ba25e5da4885297d5d0b33fe37f26f71955cac01e3250dc4f811ebb6ff0fe58f3f7e5d5380a970347f
-	b2sums = 8feeb47ad0c238b32cb91788340b8794d6e58fa3a1c4027a57f7edcbd2c30d755cf27a778d446d59a4dbc07c255f3d0bcefdce4b5322ed2d00854c6e4a7831e0
 
 pkgname = kotatogram-dev-git
diff --git a/.gitignore b/.gitignore
index 0e3a9329b81d..64a9bb9e4eac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
 kotatogram-desktop*
-libvpx
-libyuv
-pipewire
 kotatogram-dev-git*
 pkg/
 src/
diff --git a/PKGBUILD b/PKGBUILD
index e2084dc858fc..6d0d1d4aa221 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=kotatogram-dev-git
 _pkgname=kotatogram-desktop
 pkgver=k1.4.8.r174.g98f2683e5
-pkgrel=1
+pkgrel=2
 pkgdesc='Kotatogram – experimental Telegram Desktop fork - Dev branch'
 arch=('x86_64')
 url="https://kotatogram.github.io"
@@ -16,20 +16,16 @@ provides=(kotatogram-desktop kotatogram-desktop-git)
 depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 'ttf-opensans'
          'qt5-imageformats' 'qt5-svg' 'qt5-wayland' 'libdbusmenu-qt5' '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' 'rlottie-git' )
+         'libxdamage' 'libxext' 'libxfixes' 'zlib' 'wayland'  'glibc' 'libsigc++' 'glib2' 'xcb-util-keysyms' 'libxcb' 'gcc-libs')
 makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl'
              'extra-cmake-modules' 'webkit2gtk' 'unzip'
-             'yasm'
-
-             'protobuf' 'libva'
-             )
+             'yasm')
 optdepends=('webkit2gtk: embedded browser features'
             'xdg-desktop-portal: desktop integration')
 conflicts=('kotatogram-desktop-bin' 'kotatogram-desktop-dynamic-bin' 'kotatogram-desktop')
 source=("${_pkgname}::git+https://github.com/kotatogram/${_pkgname}.git#branch=dev"
         "${_pkgname}-libtgvoip::git+https://github.com/telegramdesktop/libtgvoip.git"
         "${_pkgname}-GSL::git+https://github.com/Microsoft/GSL.git"
-        "${_pkgname}-Catch::git+https://github.com/philsquared/Catch"
         "${_pkgname}-xxHash::git+https://github.com/Cyan4973/xxHash.git"
         "${_pkgname}-rlottie::git+https://github.com/desktop-app/rlottie.git"
         "${_pkgname}-lz4::git+https://github.com/lz4/lz4.git"
@@ -38,7 +34,6 @@ source=("${_pkgname}::git+https://github.com/kotatogram/${_pkgname}.git#branch=d
         "${_pkgname}-lib_base::git+https://github.com/desktop-app/lib_base.git"
         "${_pkgname}-codegen::git+https://github.com/desktop-app/codegen.git"
         "${_pkgname}-lib_ui::git+https://github.com/kotatogram/lib_ui.git"
-        "${_pkgname}-lib_rlottie::git+https://github.com/desktop-app/lib_rlottie.git"
         "${_pkgname}-lib_lottie::git+https://github.com/desktop-app/lib_lottie.git"
         "${_pkgname}-lib_tl::git+https://github.com/desktop-app/lib_tl.git"
         "${_pkgname}-lib_spellcheck::git+https://github.com/desktop-app/lib_spellcheck.git"
@@ -59,15 +54,11 @@ source=("${_pkgname}::git+https://github.com/kotatogram/${_pkgname}.git#branch=d
         "${_pkgname}-lib_webview::git+https://github.com/desktop-app/lib_webview.git"
         "${_pkgname}-lib_waylandshells::git+https://github.com/desktop-app/lib_waylandshells.git"
         "${_pkgname}-jemalloc::git+https://github.com/jemalloc/jemalloc.git"
-        "${_pkgname}-tg_owt::git+https://github.com/desktop-app/tg_owt.git"
-
-        "libvpx::git+https://chromium.googlesource.com/webm/libvpx.git"
-        "libyuv::git+https://chromium.googlesource.com/libyuv/libyuv.git"
-        "pipewire::git+https://github.com/PipeWire/pipewire.git"
+        "${_pkgname}-kwayland::git+https://github.com/KDE/kwayland.git"
+        "${_pkgname}-dispatch::git+https://github.com/apple/swift-corelibs-libdispatch.git"
 
         "0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch"
-        "block-sponsored_messages.patch"
-        "lottie-fix.patch")
+        "block-sponsored_messages.patch")
 
 
 b2sums=('SKIP'
@@ -103,13 +94,8 @@ b2sums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        'SKIP'
-        'SKIP'
-        'SKIP'
-        'SKIP'
         '462900e97b9d7a9d40bc02d3dc7dacd3060cc19af02135065628e38e83835a2fb438581ca78001aaffc27d8b0473a78d39509c35f50e4ebb25607fe9c6bae264'
-        '96a703e3c7e4a2e2229c386daa24af0ca0228d130a35a6ba25e5da4885297d5d0b33fe37f26f71955cac01e3250dc4f811ebb6ff0fe58f3f7e5d5380a970347f'
-        '8feeb47ad0c238b32cb91788340b8794d6e58fa3a1c4027a57f7edcbd2c30d755cf27a778d446d59a4dbc07c255f3d0bcefdce4b5322ed2d00854c6e4a7831e0')
+        '96a703e3c7e4a2e2229c386daa24af0ca0228d130a35a6ba25e5da4885297d5d0b33fe37f26f71955cac01e3250dc4f811ebb6ff0fe58f3f7e5d5380a970347f')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -127,7 +113,6 @@ prepare() {
     git config submodule.Telegram/lib_base.url "${srcdir}/${_pkgname}-lib_base"
     git config submodule.Telegram/codegen.url "${srcdir}/${_pkgname}-codegen"
     git config submodule.Telegram/lib_ui.url "${srcdir}/${_pkgname}-lib_ui"
-    git config submodule.Telegram/lib_rlottie.url "${srcdir}/${_pkgname}-lib_rlottie"
     git config submodule.Telegram/lib_lottie.url "${srcdir}/${_pkgname}-lib_lottie"
     git config submodule.Telegram/lib_tl.url "${srcdir}/${_pkgname}-lib_tl"
     git config submodule.Telegram/lib_spellcheck.url "${srcdir}/${_pkgname}-lib_spellcheck"
@@ -139,7 +124,6 @@ prepare() {
 
     git config submodule.Telegram/ThirdParty/libtgvoip.url "${srcdir}/${_pkgname}-libtgvoip"
     git config submodule.Telegram/ThirdParty/GSL.url "${srcdir}/${_pkgname}-GSL"
-    git config submodule.Telegram/ThirdParty/Catch.url "${srcdir}/${_pkgname}-Catch"
     git config submodule.Telegram/ThirdParty/xxHash.url "${srcdir}/${_pkgname}-xxHash"
     git config submodule.Telegram/ThirdParty/rlottie.url "${srcdir}/${_pkgname}-rlottie"
     git config submodule.Telegram/ThirdParty/lz4.url "${srcdir}/${_pkgname}-lz4"
@@ -154,34 +138,17 @@ prepare() {
     git config submodule.Telegram/ThirdParty/fcitx5-qt.url "${srcdir}/${_pkgname}-fcitx5-qt"
     git config submodule.Telegram/ThirdParty/tgcalls.url "${srcdir}/${_pkgname}-tgcalls"
     git config submodule.Telegram/ThirdParty/jemalloc.url "${srcdir}/${_pkgname}-jemalloc"
+    git config submodule.Telegram/ThirdParty/kwayland.url "${srcdir}/${_pkgname}-kwayland"
+    git config submodule.Telegram/ThirdParty/dispatch.url "${srcdir}/${_pkgname}-dispatch"
 
     git submodule update
 
     #patches
     patch -p1 < "${srcdir}/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch"
     patch -p1 < "${srcdir}/block-sponsored_messages.patch"
-
-    cd "${srcdir}/${_pkgname}-tg_owt"
-    git submodule init
-    git config submodule.src/third_party/libvpx/source/libvpx.url "$srcdir"/libvpx
-    git config submodule.src/third_party/libyuv.url "$srcdir"/libyuv
-    git config submodule.src/third_party/pipewire.url "$srcdir"/pipewire
-    git submodule update
-
-    cd "${srcdir}/${_pkgname}/Telegram/lib_lottie/"
-    patch -p1 < $srcdir/lottie-fix.patch
 }
 
 build() {
-    cd "${srcdir}/${_pkgname}-tg_owt"
-    cmake . \
-        -B build \
-        -G Ninja \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \
-        -DBUILD_SHARED_LIBS=OFF
-    cmake --build build
-
     cd "${srcdir}/${_pkgname}"
     cmake . \
         -B build \
@@ -189,7 +156,6 @@ build() {
         -DCMAKE_INSTALL_PREFIX="/usr" \
         -DCMAKE_BUILD_TYPE=Release \
         -DDESKTOP_APP_QT6=off \
-        -Dtg_owt_DIR="${srcdir}/${_pkgname}-tg_owt/build" \
         -DTDESKTOP_API_TEST=ON
     cmake --build build
 }
diff --git a/lottie-fix.patch b/lottie-fix.patch
deleted file mode 100644
index 7c6aa4ee23d6..000000000000
--- a/lottie-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/lottie/details/lottie_frame_provider_direct.cpp b/lottie/details/lottie_frame_provider_direct.cpp
-index 4c3cad3..e5f5d6f 100644
---- a/lottie/details/lottie_frame_provider_direct.cpp
-+++ b/lottie/details/lottie_frame_provider_direct.cpp
-@@ -30,7 +30,8 @@ int GetLottieFrameIndex(not_null<rlottie::Animation*> animation, Quality quality
- 	return (quality == Quality::Default && rate == 60) ? (index * 2) : index;
- }
- 
--[[nodiscard]] rlottie::FitzModifier MapModifier(SkinModifier modifier) {
-+#ifndef DESKTOP_APP_USE_PACKAGED_RLOTTIE
-+[nodiscard]] rlottie::FitzModifier MapModifier(SkinModifier modifier) {
- 	using Result = rlottie::FitzModifier;
- 	switch (modifier) {
- 	case SkinModifier::None: return Result::None;
-@@ -42,6 +43,7 @@ int GetLottieFrameIndex(not_null<rlottie::Animation*> animation, Quality quality
- 	}
- 	Unexpected("Unexpected modifier in MapModifier.");
- }
-+#endif
- 
- } // namespace
-