@@ -1966,6 +1966,8 @@ dist_patch_DATA = \
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
%D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \
%D%/packages/patches/webrtc-audio-processing-big-endian.patch \
+ %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \
+ %D%/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch \
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \
%D%/packages/patches/widelands-add-missing-map-include.patch \
%D%/packages/patches/widelands-system-wide_minizip.patch \
new file mode 100644
@@ -0,0 +1,138 @@
+From 6c28002ae4326db71980a3bfdf214d5df53d5b62 Mon Sep 17 00:00:00 2001
+From: Hilton Chain <hako@ultrarare.space>
+Date: Fri, 9 Sep 2022 22:28:23 +0800
+Subject: [PATCH] Allow disabling X11 desktop capturing independently.
+
+Squashed commit of the following:
+
+commit 253b09a07520a3cecb3b88b2b7e8889ab3d9158d
+Author: Hilton Chain <hako@ultrarare.space>
+Date: Fri Sep 9 22:13:15 2022 +0800
+
+ Adapt the patch with cmake_dependent_option.
+
+commit f6631bb43f353c9eafe1b1aba093e116518aa12a
+Author: Esteve Varela Colominas <esteve.varela@gmail.com>
+Date: Sun, 27 Jun 2021 23:57:04 +0200
+
+ Add -DTG_OWT_USE_X11
+
+ Allows disabling X11 desktop capturing independently of pipewire support, for
+ the few people that run wayland without any X11 support whatsoever.
+
+ This setup is untested, but supported by the GNI build system, see:
+ * src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions)
+
+ Toggling the WEBRTC_USE_X11 define also affects some files under
+ src/modules/audio_device, but that falls under "X11 support", regardless...
+
+ Use cmake_dependent_option to better declare variables that relate on other variables
+---
+ CMakeLists.txt | 42 ++++++++++++++++++++++++++++++++++----
+ cmake/libwebrtcbuild.cmake | 12 ++++++-----
+ 2 files changed, 45 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e081ae7..2b09682a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,6 +24,7 @@ endif()
+
+ option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." OFF)
+ option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers. Useful for packaged build." ${BUILD_SHARED_LIBS})
++cmake_dependent_option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON "UNIX; NOT APPLE" OFF)
+ cmake_dependent_option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture." ON "UNIX; NOT APPLE" OFF)
+ cmake_dependent_option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire for desktop capture." ${not_packaged_build} TG_OWT_USE_PIPEWIRE OFF)
+ option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." OFF)
+@@ -96,6 +97,10 @@ endif()
+ add_library(tg_owt)
+ init_target(tg_owt)
+
++if (TG_OWT_USE_X11)
++ link_x11(tg_owt)
++endif()
++
+ if (TG_OWT_USE_PIPEWIRE)
+ if (TG_OWT_DLOPEN_PIPEWIRE)
+ include(cmake/generate_stubs.cmake)
+@@ -188,10 +193,6 @@ endif()
+ include(cmake/libwebrtcbuild.cmake)
+ target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
+
+-if (UNIX AND NOT APPLE)
+- link_x11(tg_owt)
+-endif()
+-
+ function(add_sublibrary postfix)
+ add_library(tg_owt_${postfix} OBJECT)
+ init_feature_target(tg_owt_${postfix} ${postfix})
+@@ -2369,6 +2370,39 @@ if (NOT TG_OWT_USE_PROTOBUF)
+ )
+ endif()
+
++if (NOT TG_OWT_USE_X11)
++ remove_target_sources(tg_owt ${webrtc_loc}
++ # src/modules/desktop_capture/BUILD.gn (rtc_use_x11_extensions)
++ modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc
++ modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.h
++ modules/desktop_capture/linux/x11/screen_capturer_x11.cc
++ modules/desktop_capture/linux/x11/screen_capturer_x11.h
++ modules/desktop_capture/linux/x11/shared_x_display.cc
++ modules/desktop_capture/linux/x11/shared_x_display.h
++ modules/desktop_capture/linux/x11/window_capturer_x11.cc
++ modules/desktop_capture/linux/x11/window_capturer_x11.h
++ modules/desktop_capture/linux/x11/window_finder_x11.cc
++ modules/desktop_capture/linux/x11/window_finder_x11.h
++ modules/desktop_capture/linux/x11/window_list_utils.cc
++ modules/desktop_capture/linux/x11/window_list_utils.h
++ modules/desktop_capture/linux/x11/x_atom_cache.cc
++ modules/desktop_capture/linux/x11/x_atom_cache.h
++ modules/desktop_capture/linux/x11/x_error_trap.cc
++ modules/desktop_capture/linux/x11/x_error_trap.h
++ modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc
++ modules/desktop_capture/linux/x11/x_server_pixel_buffer.h
++ modules/desktop_capture/linux/x11/x_window_property.cc
++ modules/desktop_capture/linux/x11/x_window_property.h
++
++ # screen_drawer_linux.cc depends on x11, rest are revdeps
++ modules/desktop_capture/screen_drawer.cc
++ modules/desktop_capture/screen_drawer.h
++ modules/desktop_capture/screen_drawer_linux.cc
++ modules/desktop_capture/screen_drawer_lock_posix.cc
++ modules/desktop_capture/screen_drawer_lock_posix.h
++ )
++endif()
++
+ if (NOT TG_OWT_USE_PIPEWIRE)
+ remove_target_sources(tg_owt ${webrtc_loc}
+ modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc
+diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake
+index 4d037f4b..388b7aa9 100644
+--- a/cmake/libwebrtcbuild.cmake
++++ b/cmake/libwebrtcbuild.cmake
+@@ -29,6 +29,13 @@ INTERFACE
+ BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0
+ )
+
++if (TG_OWT_USE_X11)
++ target_compile_definitions(libwebrtcbuild
++ INTERFACE
++ WEBRTC_USE_X11
++ )
++endif()
++
+ if (TG_OWT_USE_PIPEWIRE)
+ target_compile_definitions(libwebrtcbuild
+ INTERFACE
+@@ -65,11 +72,6 @@ else()
+ INTERFACE
+ WEBRTC_MAC
+ )
+- else()
+- target_compile_definitions(libwebrtcbuild
+- INTERFACE
+- WEBRTC_USE_X11
+- )
+ endif()
+
+ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
new file mode 100644
@@ -0,0 +1,21 @@
+From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001
+From: Xiretza <xiretza@xiretza.xyz>
+Date: Sun, 15 May 2022 12:47:41 +0200
+Subject: [PATCH] fix(h265_pps_parser): fix missing cstdint include
+
+---
+ src/common_video/h265/h265_pps_parser.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h
+index 28c95ea9..c180b1b9 100644
+--- a/src/common_video/h265/h265_pps_parser.h
++++ b/src/common_video/h265/h265_pps_parser.h
+@@ -12,6 +12,7 @@
+ #define COMMON_VIDEO_H265_PPS_PARSER_H_
+
+ #include "absl/types/optional.h"
++#include <cstdint>
+
+ namespace rtc {
+ class BitBuffer;
@@ -30,6 +30,8 @@ (define-module (gnu packages telegram)
#:use-module (gnu packages digest)
#:use-module (gnu packages fcitx)
#:use-module (gnu packages fcitx5)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
@@ -58,10 +60,12 @@ (define-module (gnu packages telegram)
#:use-module (gnu packages tls)
#:use-module (gnu packages video)
#:use-module (gnu packages web)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xorg)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
@@ -85,8 +89,8 @@ (define-public abseil-cpp-cxxstd17
`(cons* "-DCMAKE_CXX_STANDARD=17" ,flags))))))))
(define-public webrtc-for-telegram-desktop
- (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34")
- (revision "166"))
+ (let ((commit "a5fbc9123e056e611e69acf0ceb4252ddd838adb")
+ (revision "167"))
(hidden-package
(package
(name "webrtc-for-telegram-desktop")
@@ -103,49 +107,61 @@ (define-public webrtc-for-telegram-desktop
(file-name
(git-file-name name version))
(sha256
- (base32 "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2"))
+ (base32 "1hzck63spjjkqzkj0mlrxygrix4lw0n3i5cmc0vkxaphfzawz74n"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-1)))
+ (patches
+ (search-patches
+ ;; https://github.com/desktop-app/tg_owt/pull/101
+ "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch"
+ ;; https://github.com/desktop-app/tg_owt/pull/107
+ "webrtc-for-telegram-desktop-allow-disabling-X11.patch"))
(snippet
`(begin
(let ((keep
'( ;; Custom forks which are incompatible with the ones in Guix.
- "abseil-cpp" "libsrtp" "openh264" "rnnoise"
+ "abseil-cpp" "libsrtp" "rnnoise"
;; Not available in Guix.
- "pffft" "usrsctp" "libyuv"
- ;; Has cmake support files for libvpx input.
- "libvpx")))
+ "crc32c" "libyuv" "pffft")))
(with-directory-excursion "src/third_party"
(for-each delete-file-recursively
(lset-difference string=?
(scandir ".")
- (cons* "." ".." keep)))))))))
+ (cons* "." ".." keep)))))
+ ;; Force using standalone openh264.
+ (substitute* "CMakeLists.txt"
+ (("\\include\\(cmake\\/libopenh264\\.cmake\\)")""))))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; No target
- #:configure-flags
- (list
- "-DCMAKE_C_FLAGS=-fPIC"
- "-DCMAKE_CXX_FLAGS=-fPIC")))
- (native-inputs
- (list perl pkg-config python-wrapper yasm))
+ (list #:tests? #f ; No target
+ ;; NOTE: Options commented are default values.
+ ;; See also: comments in inputs.
+ ;; #:configure-flags
+ ;; #~'("-DTG_OWT_USE_PIPEWIRE=ON"
+ ;; "-DTG_OWT_USE_X11=ON"
+ ;; "-DTG_OWT_USE_PROTOBUF=ON")
+ ))
+ (native-inputs (list pkg-config python-wrapper yasm))
(inputs
- (list alsa-lib
+ (list abseil-cpp-cxxstd17
ffmpeg
libjpeg-turbo
- glib
- libxcomposite
- libxdamage
- libxrender
- libxrandr
+ libvpx
+ openh264
openssl
opus
- pipewire
+ ;; TG_OWT_USE_PROTOBUF
protobuf
- pulseaudio
- libx11
+ ;; TG_OWT_USE_PIPEWIRE
+ glib libdrm libglvnd mesa pipewire-0.3
+ ;; TG_OWT_USE_X11
+ libxcomposite
+ libxdamage
libxext
+ libxfixes
+ libxrandr
+ libxrender
libxtst))
(synopsis "WebRTC support for Telegram Desktop")
(description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by
@@ -157,13 +173,11 @@ (define-public webrtc-for-telegram-desktop
license:asl2.0
;; LibYuv
(license:non-copyleft "file:///src/third_party/libyuv/LICENSE")
- ;; OpenH264
- license:bsd-2
;; PFFFT
(license:non-copyleft "file:///src/third_party/pffft/LICENSE")
;; RnNoise
license:gpl3
- ;; LibSRTP, LibVPx, UsrSCTP and Others
+ ;; LibSRTP, Crc32c and Others
license:bsd-3))))))
(define-public rlottie-for-telegram-desktop