Date: Friday, August 21, 2020 @ 03:39:01 Author: farseerfc Revision: 685727
upgpkg: libwebrtc 83.git1.18721df-2: libwebrtc fix linking issues with telegram-desktop 2.3 Added: libwebrtc/trunk/0001-IWYU-fix-missing-uint32_t-size_t-definitions.patch Modified: libwebrtc/trunk/PKGBUILD libwebrtc/trunk/args.gn ---------------------------------------------------------+ 0001-IWYU-fix-missing-uint32_t-size_t-definitions.patch | 141 ++++++++++++++ PKGBUILD | 40 +++ args.gn | 15 - 3 files changed, 181 insertions(+), 15 deletions(-) Added: 0001-IWYU-fix-missing-uint32_t-size_t-definitions.patch =================================================================== --- 0001-IWYU-fix-missing-uint32_t-size_t-definitions.patch (rev 0) +++ 0001-IWYU-fix-missing-uint32_t-size_t-definitions.patch 2020-08-21 03:39:01 UTC (rev 685727) @@ -0,0 +1,141 @@ +From 0e7b7af7fbf86732dd64888f260a5df0335c695a Mon Sep 17 00:00:00 2001 +From: Jiachen YANG <farsee...@gmail.com> +Date: Fri, 21 Aug 2020 09:11:29 +0900 +Subject: [PATCH] IWYU fix missing uint32_t size_t definitions + +--- + call/rtx_receive_stream.h | 1 + + common_video/h264/h264_common.h | 1 + + common_video/h264/pps_parser.h | 1 + + common_video/h264/prefix_parser.h | 1 + + common_video/h264/sps_parser.h | 1 + + common_video/h265/h265_common.h | 1 + + common_video/h265/h265_pps_parser.h | 1 + + modules/audio_processing/aec3/clockdrift_detector.h | 1 + + modules/congestion_controller/rtp/transport_feedback_demuxer.h | 1 + + modules/rtp_rtcp/source/receive_statistics_impl.h | 1 + + 10 files changed, 10 insertions(+) + +diff --git a/call/rtx_receive_stream.h b/call/rtx_receive_stream.h +index 8ffa4400a9..66cc46dc09 100644 +--- a/call/rtx_receive_stream.h ++++ b/call/rtx_receive_stream.h +@@ -12,6 +12,7 @@ + #define CALL_RTX_RECEIVE_STREAM_H_ + + #include <map> ++#include <stdint.h> + + #include "call/rtp_packet_sink_interface.h" + +diff --git a/common_video/h264/h264_common.h b/common_video/h264/h264_common.h +index 0b1843ee38..e0f10432af 100644 +--- a/common_video/h264/h264_common.h ++++ b/common_video/h264/h264_common.h +@@ -14,6 +14,7 @@ + #include <stddef.h> + #include <stdint.h> + ++#include <stdint.h> + #include <vector> + + #include "rtc_base/buffer.h" +diff --git a/common_video/h264/pps_parser.h b/common_video/h264/pps_parser.h +index d6c31b0688..43acb66c15 100644 +--- a/common_video/h264/pps_parser.h ++++ b/common_video/h264/pps_parser.h +@@ -10,6 +10,7 @@ + + #ifndef COMMON_VIDEO_H264_PPS_PARSER_H_ + #define COMMON_VIDEO_H264_PPS_PARSER_H_ ++#include <stdint.h> + + #include "absl/types/optional.h" + +diff --git a/common_video/h264/prefix_parser.h b/common_video/h264/prefix_parser.h +index 9298eb4276..486a591d87 100644 +--- a/common_video/h264/prefix_parser.h ++++ b/common_video/h264/prefix_parser.h +@@ -10,6 +10,7 @@ + + #ifndef COMMON_VIDEO_H264_PREFIX_PARSER_H_ + #define COMMON_VIDEO_H264_PREFIX_PARSER_H_ ++#include <stdint.h> + + #include "absl/types/optional.h" + +diff --git a/common_video/h264/sps_parser.h b/common_video/h264/sps_parser.h +index 76e627d27a..376b52852e 100644 +--- a/common_video/h264/sps_parser.h ++++ b/common_video/h264/sps_parser.h +@@ -10,6 +10,7 @@ + + #ifndef COMMON_VIDEO_H264_SPS_PARSER_H_ + #define COMMON_VIDEO_H264_SPS_PARSER_H_ ++#include <stdint.h> + + #include "absl/types/optional.h" + +diff --git a/common_video/h265/h265_common.h b/common_video/h265/h265_common.h +index a829195a10..d2d93fb89e 100644 +--- a/common_video/h265/h265_common.h ++++ b/common_video/h265/h265_common.h +@@ -14,6 +14,7 @@ + #include <memory> + #include <vector> + ++#include <stdint.h> + #include "rtc_base/buffer.h" + + namespace webrtc { +diff --git a/common_video/h265/h265_pps_parser.h b/common_video/h265/h265_pps_parser.h +index 28c95ea9bc..a923b2b334 100644 +--- a/common_video/h265/h265_pps_parser.h ++++ b/common_video/h265/h265_pps_parser.h +@@ -10,6 +10,7 @@ + + #ifndef COMMON_VIDEO_H265_PPS_PARSER_H_ + #define COMMON_VIDEO_H265_PPS_PARSER_H_ ++#include <stdint.h> + + #include "absl/types/optional.h" + +diff --git a/modules/audio_processing/aec3/clockdrift_detector.h b/modules/audio_processing/aec3/clockdrift_detector.h +index 22528c9489..69e624e8b1 100644 +--- a/modules/audio_processing/aec3/clockdrift_detector.h ++++ b/modules/audio_processing/aec3/clockdrift_detector.h +@@ -12,6 +12,7 @@ + #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ + + #include <array> ++#include <cstddef> + + namespace webrtc { + +diff --git a/modules/congestion_controller/rtp/transport_feedback_demuxer.h b/modules/congestion_controller/rtp/transport_feedback_demuxer.h +index bcd25d5835..c7cede7ac3 100644 +--- a/modules/congestion_controller/rtp/transport_feedback_demuxer.h ++++ b/modules/congestion_controller/rtp/transport_feedback_demuxer.h +@@ -10,6 +10,7 @@ + #ifndef MODULES_CONGESTION_CONTROLLER_RTP_TRANSPORT_FEEDBACK_DEMUXER_H_ + #define MODULES_CONGESTION_CONTROLLER_RTP_TRANSPORT_FEEDBACK_DEMUXER_H_ + ++#include <stdint.h> + #include <map> + #include <utility> + #include <vector> +diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.h b/modules/rtp_rtcp/source/receive_statistics_impl.h +index e352ae8787..363dd9272a 100644 +--- a/modules/rtp_rtcp/source/receive_statistics_impl.h ++++ b/modules/rtp_rtcp/source/receive_statistics_impl.h +@@ -14,6 +14,7 @@ + #include <algorithm> + #include <map> + #include <vector> ++#include <stdint.h> + + #include "absl/types/optional.h" + #include "modules/include/module_common_types_public.h" +-- +2.28.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-21 02:33:48 UTC (rev 685726) +++ PKGBUILD 2020-08-21 03:39:01 UTC (rev 685727) @@ -3,7 +3,7 @@ pkgname=libwebrtc _commit=18721df pkgver=83.git1.${_commit} -pkgrel=1 +pkgrel=2 pkgdesc='WebRTC library - static linked' arch=('x86_64') url='https://webrtc.org/?hl=de' @@ -10,7 +10,7 @@ license=('custom:BSD') makedepends=('git' 'gn' 'ninja' 'unzip' 'python2' 'python' 'libxrandr' 'libxcomposite' 'openssl' 'glibc' 'ffmpeg' 'libva') options=('staticlibs') -source=("webrtc::git+https://github.com/open-webrtc-toolkit/owt-deps-webrtc#commit=${_commit}" +source=("webrtc_src::git+https://github.com/open-webrtc-toolkit/owt-deps-webrtc.git#commit=${_commit}" 'https://storage.googleapis.com/chrome-infra/depot_tools.zip' gclient-conf args.gn @@ -17,24 +17,27 @@ src.diff build.diff third_party.diff - libsrtp.diff) + libsrtp.diff + 0001-IWYU-fix-missing-uint32_t-size_t-definitions.patch) noextract=('depot_tools.zip') b2sums=('SKIP' - 'c931652e11cc81db2cf7b8f547c72dbea2cc1fe1a11b01eae0af677fab91a48ba0339265eda110a4f3f53f859d1bdb520576a534600a582d5dc93979acf3f606' + 'f903724dcb80904aeb85c4ba4d4140916b96e278efcba52a28c76db093801850d8d74d34c63b78374ed2f18fa8d5f649cb6fdf6879939b58142e8382bcdd77b4' '25ab3e116e2f241219fe31e96166e009a233813417c6901ed3ff0cafcdc7b6bff17ae284167164028203e4a5e94548deff3e4bad00aff6c8286bd7d63cb9cdb2' - '235560d3bf6c1023398eb53051f2fde522501c939105d100d0091a832909f0ffe7e4e98068a4ec3f2ee790994e904be7e35c12fdfe9020862fb2a0c8f32209e1' + '3c20948f295d58df70a3b579ad33c5d92b9bb140b0a01bbb59e3157e07944978a10396c112c99fe28d57997e223eb4adebde31f41d995f47c14107bc52d443a8' '923a626e69c819e550e1681257e1fb0c5c2a64160b13bd5d5a322125cba58020ba84330c8056d94a23175090055686916860d083adea08f8c8bff9e5e0ebbe01' 'f8af81b249989296402e8ab9fa999559b8c9e18ac78c64766554db44289fe16778795a7ce4cd902b13f6ee9aa4866e8ae112af617a32f069674eec659c84a54a' 'c8cbe2395066cdb639fd9cc8242ae345e4d4e2dabb3803397f162b26a0dfd170ddb888474e85c65fd2142a3462c984164fac0bc061f163128aad92d350be26ab' - 'fb6d9de8c49667e3726f255aabe8840a60e73d0d3a2ea5fd539580cc7aa734a2486267b00a236e0114adfd852a0710833b729c153761097668fdf7f6d755de94') + 'fb6d9de8c49667e3726f255aabe8840a60e73d0d3a2ea5fd539580cc7aa734a2486267b00a236e0114adfd852a0710833b729c153761097668fdf7f6d755de94' + '06bb59cb637bd896d4ee719023adb7d3595e4884c9c697b44796a88aaf575bd6bd898e2be594e007b6dcce6f5d5956dd0498ef5a611d401a075a5abb4dea2a92') prepare() { - mv webrtc src + mv webrtc_src src unzip depot_tools.zip -d depot_tools mv gclient-conf .gclient DEPOT_TOOLS_UPDATE=0 "${srcdir}"/depot_tools/gclient sync --no-history cd src patch -Np1 < "${srcdir}"/src.diff + patch -Np1 < "${srcdir}"/0001-IWYU-fix-missing-uint32_t-size_t-definitions.patch cd build patch -Np1 < "${srcdir}"/build.diff cd ../third_party @@ -41,6 +44,7 @@ patch -Np1 < "${srcdir}"/third_party.diff cd libsrtp patch -Np1 < "${srcdir}"/libsrtp.diff + cd ../.. mkdir out/Release cp "${srcdir}"/args.gn out/Release/args.gn @@ -50,6 +54,7 @@ build() { cd src + ninja -C out/Release webrtc } @@ -56,4 +61,25 @@ package() { install -Dm644 -t "${pkgdir}"/usr/lib/ "${srcdir}"/src/out/Release/obj/${pkgname}.a install -Dm644 -t "${pkgdir}"/usr/share/licenses/libwebrtc/ "${srcdir}"/src/LICENSE + mkdir -p "${pkgdir}"/usr/include/libwebrtc + cd src + shopt -s globstar + for i in ./**/*.h;do + if [[ $i =~ "./test/" || $i =~ "./build/" || $i =~ "./third_party/" ]]; then + continue + fi + install -Dm644 -t ${pkgdir}/usr/include/libwebrtc/$(dirname $i) $i + done + for i in third_party/abseil-cpp/**/*.h; do + if [[ $i =~ "/test/" || $i =~ "/build/" ]]; then + continue + fi + install -Dm644 -t ${pkgdir}/usr/include/libwebrtc/$(dirname $i) $i + done + for i in third_party/libyuv/**/*.h; do + if [[ $i =~ "/test/" || $i =~ "/build/" ]]; then + continue + fi + install -Dm644 -t ${pkgdir}/usr/include/libwebrtc/$(dirname $i) $i + done } Modified: args.gn =================================================================== --- args.gn 2020-08-21 02:33:48 UTC (rev 685726) +++ args.gn 2020-08-21 03:39:01 UTC (rev 685727) @@ -3,26 +3,25 @@ is_component_build=false is_debug=false is_clang=false -symbol_level=2 proprietary_codecs=true -use_custom_libcxx=true -use_system_libjpeg=true +use_custom_libcxx=false +use_system_libjpeg=false use_rtti=true use_gold=false use_sysroot=false linux_use_bundled_binutils=false -enable_dsyms=false +enable_dsyms=true rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false rtc_build_opus=false rtc_build_ssl=false -rtc_ssl_root="/usr/include/openssl/" -rtc_ssl_libs=["/usr/lib/libssl.so","/usr/lib/libcrypto.so","/usr/lib/libdl.so","/usr/lib/libpthread.so"] +rtc_ssl_root="/usr/include" +rtc_ssl_libs=["ssl","crypto"] rtc_builtin_ssl_root_certificates=true rtc_build_ffmpeg=false -rtc_ffmpeg_root="../../../ffmpeg" -rtc_ffmpeg_libs=["/usr/lib/libavfilter.so","/usr/lib/libswscale.so","/usr/lib/libswresample.so","/usr/lib/libavutil.so","/usr/lib/libva-x11.so","/usr/lib/libva-drm.so","/usr/lib/libva.so","/usr/lib/libvdpau.so","/usr/lib/libdrm.so","/usr/lib/libXfixes.so","/usr/lib/libXext.so","/usr/lib/libX11.so","/usr/lib/libxcb.so","/usr/lib/libXau.so","/usr/lib/libXdmcp.so","/usr/lib/libdbus-1.so"] +rtc_ffmpeg_root="/usr/include" +rtc_ffmpeg_libs=["avcodec","swscale","swresample","avutil"] rtc_opus_root="/usr/include/opus" rtc_enable_protobuf=false treat_warnings_as_errors=false