diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | Update-webrtc-packaged-build-for-tg_owt.patch | 191 |
3 files changed, 203 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = telegram-desktop-udf-patched pkgdesc = Telegram Desktop client with several personal patches - pkgver = 2.3.2 - pkgrel = 2 + pkgver = 2.4.2 + pkgrel = 1 url = https://desktop.telegram.org/ arch = x86_64 license = GPL3 @@ -27,15 +27,17 @@ pkgbase = telegram-desktop-udf-patched optdepends = ttf-opensans: default Open Sans font family provides = telegram-desktop conflicts = telegram-desktop - source = https://github.com/telegramdesktop/tdesktop/releases/download/v2.3.2/tdesktop-2.3.2-full.tar.gz + source = https://github.com/telegramdesktop/tdesktop/releases/download/v2.4.2/tdesktop-2.4.2-full.tar.gz source = Use-tg_owt-webrtc-fork.patch + source = Update-webrtc-packaged-build-for-tg_owt.patch::https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d.patch source = always_delete_for_everyone.patch source = always_clear_history_for_everyone.patch source = always_pin_without_notify.patch source = always_send_as_photo_or_album.patch source = force_gtk_integration.patch - sha512sums = 757e57389ce24656c1d6676d6f0808e3d444785394e916b9f5fb47511662f01b6742c88c2a27274c4d9bb58263ae281218579c78cce7db119e2c863c1eaacc90 + sha512sums = e626ac2f74b7ba9c8db847b26275d88d4c95beb3c2b8787d0ecdc7dc1b40548e825056acf45ece1e647e6a3d6da7215d16d908f443da311b9d99769639c19ad3 sha512sums = 071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43 + sha512sums = b3c44e76a3907f7acc197746b471564577e912bf0561e9576dc8459211c88f400716437bcaa10967376461c69c8a98a56477d26d3feb9ca34747d9208bf5f6c6 sha512sums = e88fa96024efc6176c818d0a46684e0ee1fb3a7bdadb323ad3b29f736209c80b6c31b135cf84389e7e2bbd614e57b241e4437c94b6fd114e73cfc418bf130015 sha512sums = 4a7e9de924bbf32fb4cd24ffa2764bcf49e0540bba649829b180da20a62810d4a21ebf11529d4eca22c9ceaa93b434ca3fbfd0b636795f8109ea4e1eddbff8f3 sha512sums = b4eeeb4b2801f3edcc7423f28403b1dfabd3f3869425e4f102a2a4554bde93e63bd73d2d4dbf3e5748ce831b570e441d3917f532fc5cceac1ee5e8fd0832cb30 @@ -10,8 +10,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop-udf-patched -pkgver=2.3.2 -pkgrel=2 +pkgver=2.4.2 +pkgrel=1 pkgdesc='Telegram Desktop client with several personal patches' arch=('x86_64') url="https://desktop.telegram.org/" @@ -28,6 +28,7 @@ conflicts=('telegram-desktop') source=( "https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz" "Use-tg_owt-webrtc-fork.patch" + "Update-webrtc-packaged-build-for-tg_owt.patch::https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d.patch" # Custom patches "always_delete_for_everyone.patch" "always_clear_history_for_everyone.patch" @@ -36,8 +37,9 @@ source=( "force_gtk_integration.patch" ) sha512sums=( - '757e57389ce24656c1d6676d6f0808e3d444785394e916b9f5fb47511662f01b6742c88c2a27274c4d9bb58263ae281218579c78cce7db119e2c863c1eaacc90' + 'e626ac2f74b7ba9c8db847b26275d88d4c95beb3c2b8787d0ecdc7dc1b40548e825056acf45ece1e647e6a3d6da7215d16d908f443da311b9d99769639c19ad3' '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43' + 'b3c44e76a3907f7acc197746b471564577e912bf0561e9576dc8459211c88f400716437bcaa10967376461c69c8a98a56477d26d3feb9ca34747d9208bf5f6c6' # Custom patches 'e88fa96024efc6176c818d0a46684e0ee1fb3a7bdadb323ad3b29f736209c80b6c31b135cf84389e7e2bbd614e57b241e4437c94b6fd114e73cfc418bf130015' '4a7e9de924bbf32fb4cd24ffa2764bcf49e0540bba649829b180da20a62810d4a21ebf11529d4eca22c9ceaa93b434ca3fbfd0b636795f8109ea4e1eddbff8f3' @@ -48,6 +50,7 @@ sha512sums=( prepare() { cd tdesktop-$pkgver-full/cmake + patch -R -Np1 -i ${srcdir}/Update-webrtc-packaged-build-for-tg_owt.patch patch -R -Np1 -i ${srcdir}/Use-tg_owt-webrtc-fork.patch sed 's|set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)|set(webrtc_build_loc /usr/lib)|' -i external/webrtc/CMakeLists.txt @@ -77,7 +80,6 @@ build() { -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \ -DDESKTOP_APP_SPECIAL_TARGET="" \ -DDESKTOP_APP_WEBRTC_LOCATION=/usr/include/libwebrtc \ - -DTDESKTOP_USE_GTK_FILE_DIALOG=ON ninja -C build } diff --git a/Update-webrtc-packaged-build-for-tg_owt.patch b/Update-webrtc-packaged-build-for-tg_owt.patch new file mode 100644 index 000000000000..1841ccf700f0 --- /dev/null +++ b/Update-webrtc-packaged-build-for-tg_owt.patch @@ -0,0 +1,191 @@ +From d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d Mon Sep 17 00:00:00 2001 +From: Ilya Fedin <fedin-ilja2010@ya.ru> +Date: Sat, 29 Aug 2020 20:48:37 +0400 +Subject: [PATCH] Update webrtc packaged build for tg_owt + +--- + external/webrtc/CMakeLists.txt | 136 ++++++++++++++++----------------- + variables.cmake | 1 - + 2 files changed, 68 insertions(+), 69 deletions(-) + +diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt +index 1273291..a354057 100644 +--- a/external/webrtc/CMakeLists.txt ++++ b/external/webrtc/CMakeLists.txt +@@ -7,96 +7,96 @@ + add_library(external_webrtc INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_webrtc ALIAS external_webrtc) + +-if (DESKTOP_APP_WEBRTC_LOCATION) +- set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION}) ++if (DESKTOP_APP_USE_PACKAGED) ++ find_package(tg_owt REQUIRED) ++ target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt) + else() + set(webrtc_loc ${libs_loc}/tg_owt/src) +-endif() +- +-set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>) +- +-target_compile_definitions(external_webrtc +-INTERFACE +- WEBRTC_ENABLE_PROTOBUF=0 +- WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE +- RTC_ENABLE_VP9 +- HAVE_SCTP +- WEBRTC_USE_H264 +- WEBRTC_LIBRARY_IMPL +- WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1 +- ABSL_ALLOCATOR_NOTHROW=1 +-) +- +-if (WIN32) +- set(webrtc_lib_prefix "") +- set(webrtc_lib_suffix .lib) ++ set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>) + + target_compile_definitions(external_webrtc + INTERFACE +- WEBRTC_WIN ++ WEBRTC_ENABLE_PROTOBUF=0 ++ WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE ++ RTC_ENABLE_VP9 ++ HAVE_SCTP ++ WEBRTC_USE_H264 ++ WEBRTC_LIBRARY_IMPL ++ WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1 ++ ABSL_ALLOCATOR_NOTHROW=1 + ) +-else() +- set(webrtc_lib_prefix lib) +- set(webrtc_lib_suffix .a) + +- if (APPLE) ++ if (WIN32) ++ set(webrtc_lib_prefix "") ++ set(webrtc_lib_suffix .lib) ++ + target_compile_definitions(external_webrtc + INTERFACE +- WEBRTC_MAC ++ WEBRTC_WIN + ) + else() ++ set(webrtc_lib_prefix lib) ++ set(webrtc_lib_suffix .a) ++ ++ if (APPLE) ++ target_compile_definitions(external_webrtc ++ INTERFACE ++ WEBRTC_MAC ++ ) ++ else() ++ target_compile_definitions(external_webrtc ++ INTERFACE ++ WEBRTC_LINUX ++ ) ++ endif() ++ + target_compile_definitions(external_webrtc + INTERFACE +- WEBRTC_LINUX ++ WEBRTC_POSIX + ) + endif() + +- target_compile_definitions(external_webrtc +- INTERFACE +- WEBRTC_POSIX +- ) +-endif() +- +-target_include_directories(external_webrtc +-INTERFACE +- ${webrtc_loc} +- ${webrtc_loc}/third_party/abseil-cpp +-) +- +-set(webrtc_libs +- ${webrtc_lib_prefix}tg_owt +-) +-if (APPLE) + target_include_directories(external_webrtc + INTERFACE +- ${webrtc_loc}/sdk/objc +- ${webrtc_loc}/sdk/objc/base +- ${webrtc_loc}/sdk/objc/components/video_codec +- ${webrtc_loc}/third_party/libyuv/include ++ ${webrtc_loc} ++ ${webrtc_loc}/third_party/abseil-cpp + ) +-endif() +-foreach (lib ${webrtc_libs}) +- list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}") +-endforeach() + +-if (WIN32) +- target_link_libraries(external_webrtc +- INTERFACE +- Secur32.lib # Required for rtc_base/http_common.cc +- dmoguids.lib # Required for the built-in WASAPI AEC, see modules/audio_device/BUILD.gn +- wmcodecdspuuid.lib +- amstrmid.lib +- msdmo.lib ++ set(webrtc_libs ++ ${webrtc_lib_prefix}tg_owt + ) +-elseif (APPLE) ++ if (APPLE) ++ target_include_directories(external_webrtc ++ INTERFACE ++ ${webrtc_loc}/sdk/objc ++ ${webrtc_loc}/sdk/objc/base ++ ${webrtc_loc}/sdk/objc/components/video_codec ++ ${webrtc_loc}/third_party/libyuv/include ++ ) ++ endif() ++ foreach (lib ${webrtc_libs}) ++ list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}") ++ endforeach() ++ ++ if (WIN32) ++ target_link_libraries(external_webrtc ++ INTERFACE ++ Secur32.lib # Required for rtc_base/http_common.cc ++ dmoguids.lib # Required for the built-in WASAPI AEC, see modules/audio_device/BUILD.gn ++ wmcodecdspuuid.lib ++ amstrmid.lib ++ msdmo.lib ++ ) ++ elseif (APPLE) ++ target_link_libraries(external_webrtc ++ INTERFACE ++ -ObjC ++ ) ++ endif() ++ + target_link_libraries(external_webrtc + INTERFACE +- -ObjC ++ ${webrtc_libs_list} ++ desktop-app::external_openssl + ) + endif() +- +-target_link_libraries(external_webrtc +-INTERFACE +- ${webrtc_libs_list} +- desktop-app::external_openssl +-) +diff --git a/variables.cmake b/variables.cmake +index 04a18bd..9e7f41f 100644 +--- a/variables.cmake ++++ b/variables.cmake +@@ -40,7 +40,6 @@ option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate + option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF) + option(DESKTOP_APP_USE_ENCHANT "Use Enchant instead of bundled Hunspell. (Linux only)" OFF) + set(DESKTOP_APP_QTWAYLANDCLIENT_PRIVATE_HEADERS "" CACHE STRING "QtWaylandClient headers location.") +-set(DESKTOP_APP_WEBRTC_LOCATION "" CACHE STRING "WebRTC source root location.") + + set(dont_bundle_fonts 0) + if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) |