diff options
| author | Marius Bakke <[email protected]> | 2020-01-11 22:38:24 +0100 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2020-01-11 22:38:24 +0100 |
| commit | b7bf02a418e946b610ef68e8c5131f2350835956 (patch) | |
| tree | 6d84387279b9870dc0b151bb9d3dce7f9d9de73d /gnu/packages/patches/libtgvoip-disable-webrtc.patch | |
| parent | 233c1be0a30846f6646b1f4edc6257037d0835fc (diff) | |
| parent | 13efb24850bc40fab2448771c87c77c9a69fc231 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/libtgvoip-disable-webrtc.patch')
| -rw-r--r-- | gnu/packages/patches/libtgvoip-disable-webrtc.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/gnu/packages/patches/libtgvoip-disable-webrtc.patch b/gnu/packages/patches/libtgvoip-disable-webrtc.patch new file mode 100644 index 0000000000..0ca532301c --- /dev/null +++ b/gnu/packages/patches/libtgvoip-disable-webrtc.patch @@ -0,0 +1,47 @@ +Copied from Debian. + +Description: Fix build of WebRTC on non-Linux systems + * Define the WEBRTC_LINUX macro only on Linux, and not on GNU/Hurd or FreeBSD. + * Fix type cast in the CurrentThreadId function. +Bug-Debian: https://bugs.debian.org/920851 +Author: Nicholas Guriev <[email protected]> +Last-Update: Tue, 29 Jan 2019 23:26:44 +0300 + +--- a/libtgvoip.gyp ++++ b/libtgvoip.gyp +@@ -869,20 +869,18 @@ + '"<(OS)" == "linux"', { + 'defines': [ + 'WEBRTC_POSIX', +- 'WEBRTC_LINUX', + ], + 'conditions': [ + [ '"<!(uname -m)" == "i686"', { + 'cflags_cc': [ + '-msse2', + ], ++ }], ['"<!(uname -s)" == "Linux"', { ++ 'defines': [ ++ 'WEBRTC_LINUX', ++ ], + }] + ], +- 'direct_dependent_settings': { +- 'libraries': [ +- +- ], +- }, + }, + ], + ], +--- a/webrtc_dsp/rtc_base/platform_thread_types.cc ++++ b/webrtc_dsp/rtc_base/platform_thread_types.cc +@@ -31,7 +31,7 @@ PlatformThreadId CurrentThreadId() { + return syscall(__NR_gettid); + #else + // Default implementation for nacl and solaris. +- return reinterpret_cast<pid_t>(pthread_self()); ++ return static_cast<pid_t>(pthread_self()); + #endif + #endif // defined(WEBRTC_POSIX) + } |