<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211127] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211127">211127</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-24 18:18:01 -0800 (Tue, 24 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Use HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE for libwebrtc
https://bugs.webkit.org/show_bug.cgi?id=167353
Patch by Youenn Fablet <youenn@apple.com> on 2017-01-24
Reviewed by Alex Christensen.
Source/ThirdParty/libwebrtc:
* CMakeLists.txt:
Tools:
* Scripts/webkitpy/libwebrtc/generate_cmake.py:
(CMakeGenerator.initialize_targets):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartylibwebrtcCMakeListstxt">trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcChangeLog">trunk/Source/ThirdParty/libwebrtc/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylibwebrtcgenerate_cmakepy">trunk/Tools/Scripts/webkitpy/libwebrtc/generate_cmake.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartylibwebrtcCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt (211126 => 211127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt 2017-01-25 01:44:09 UTC (rev 211126)
+++ trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt 2017-01-25 02:18:01 UTC (rev 211127)
</span><span class="lines">@@ -2747,7 +2747,7 @@
</span><span class="cx"> ${LIBWEBRTC_INPUT_DIR}/webrtc/base/logging_mac.mm)
</span><span class="cx"> add_library(WebrtcBaseRtc_Base_Approved STATIC ${WebrtcBaseRtc_Base_Approved_SOURCES})
</span><span class="cx"> target_compile_options(WebrtcBaseRtc_Base_Approved PRIVATE "-fno-strict-aliasing" "-fstack-protector-strong" "-fcolor-diagnostics" "-arch" "x86_64" "-gdwarf-2" "-mmacosx-version-min=10.9" "-Wall" "-Werror" "-Wextra" "-Wpartial-availability" "-Wno-missing-field-initializers" "-Wno-unused-parameter" "-Wno-c++11-narrowing" "-Wno-covered-switch-default" "-Wno-deprecated-register" "-Wno-unneeded-internal-declaration" "-Wno-inconsistent-missing-override" "-Wno-shift-negative-value" "-O0" "-fvisibility=hidden" "-Wheader-hygiene" "-Wstring-conversion" "-Wno-strict-overflow" "-Wimplicit-fallthrough" "-Wthread-safety" "-Winconsistent-missing-override" "-Wundef" "-std=c99" &quo
t;-fno-threadsafe-statics" "-fvisibility-inlines-hidden" "-Wno-undefined-bool-conversion" "-Wno-tautological-undefined-compare" "-stdlib=libc++" "-fno-rtti" "-fno-exceptions" "-Wnon-virtual-dtor" "-Woverloaded-virtual" "-Wobjc-missing-property-synthesis" "-fobjc-call-cxx-cdtors")
</span><del>-target_compile_definitions(WebrtcBaseRtc_Base_Approved PRIVATE V8_DEPRECATION_WARNINGS ENABLE_NOTIFICATIONS ENABLE_PLUGINS=1 ENABLE_PDF=1 ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1 ENABLE_PRINT_PREVIEW=1 ENABLE_SPELLCHECK=1 USE_BROWSER_SPELLCHECKER=1 NO_TCMALLOC USE_EXTERNAL_POPUP_MENU=1 ENABLE_WEBRTC=1 ENABLE_EXTENSIONS=1 ENABLE_TASK_MANAGER=1 ENABLE_THEMES=1 ENABLE_SESSION_SERVICE=1 ENABLE_SUPERVISED_USERS=1 FULL_SAFE_BROWSING SAFE_BROWSING_CSD SAFE_BROWSING_DB_LOCAL CHROMIUM_BUILD ENABLE_MEDIA_ROUTER=1 FIELDTRIAL_TESTING_ENABLED CR_CLANG_REVISION=284979-1 CR_XCODE_VERSION=0820 __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 _DEBUG DYNAMIC_ANNOTATIONS_ENABLED=1 WTF_USE_DYNAMIC_ANNOTATIONS=1 WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE EXPAT_RELATIVE_PATH RTC_DISABLE_VP9 WEBRTC_POSIX WEBRTC_MAC)
</del><ins>+target_compile_definitions(WebrtcBaseRtc_Base_Approved PRIVATE V8_DEPRECATION_WARNINGS ENABLE_NOTIFICATIONS ENABLE_PLUGINS=1 ENABLE_PDF=1 ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1 ENABLE_PRINT_PREVIEW=1 ENABLE_SPELLCHECK=1 USE_BROWSER_SPELLCHECKER=1 NO_TCMALLOC USE_EXTERNAL_POPUP_MENU=1 ENABLE_WEBRTC=1 ENABLE_EXTENSIONS=1 ENABLE_TASK_MANAGER=1 ENABLE_THEMES=1 ENABLE_SESSION_SERVICE=1 ENABLE_SUPERVISED_USERS=1 FULL_SAFE_BROWSING SAFE_BROWSING_CSD SAFE_BROWSING_DB_LOCAL CHROMIUM_BUILD ENABLE_MEDIA_ROUTER=1 FIELDTRIAL_TESTING_ENABLED CR_CLANG_REVISION=284979-1 CR_XCODE_VERSION=0820 __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 _DEBUG DYNAMIC_ANNOTATIONS_ENABLED=1 WTF_USE_DYNAMIC_ANNOTATIONS=1 WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE EXPAT_RELATIVE_PATH RTC_DISABLE_VP9 WEBRTC_POSIX WEBRTC_MAC HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE)
</ins><span class="cx"> target_include_directories(WebrtcBaseRtc_Base_Approved PRIVATE ${LIBWEBRTC_INPUT_DIR}/ ${LIBWEBRTC_OUTPUT_DIR}/gen/)
</span><span class="cx"> set_target_properties(WebrtcBaseRtc_Base_Approved PROPERTIES LINK_FLAGS "-stdlib=libc++ -arch x86_64 -mmacosx-version-min=10.9")
</span><span class="cx"> set_target_properties(WebrtcBaseRtc_Base_Approved PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${LIBWEBRTC_OUTPUT_DIR}/obj/webrtc/base)
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (211126 => 211127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-01-25 01:44:09 UTC (rev 211126)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-01-25 02:18:01 UTC (rev 211127)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-01-24 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] Use HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE for libwebrtc
+ https://bugs.webkit.org/show_bug.cgi?id=167353
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+
</ins><span class="cx"> 2017-01-23 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Filter libwebrtc link flags
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211126 => 211127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-25 01:44:09 UTC (rev 211126)
+++ trunk/Tools/ChangeLog 2017-01-25 02:18:01 UTC (rev 211127)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-01-24 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] Use HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE for libwebrtc
+ https://bugs.webkit.org/show_bug.cgi?id=167353
+
+ Reviewed by Alex Christensen.
+
+ * Scripts/webkitpy/libwebrtc/generate_cmake.py:
+ (CMakeGenerator.initialize_targets):
+
</ins><span class="cx"> 2017-01-24 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> WKR should not confuse Miguel Gomez with Andres Gomez
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylibwebrtcgenerate_cmakepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/libwebrtc/generate_cmake.py (211126 => 211127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/libwebrtc/generate_cmake.py 2017-01-25 01:44:09 UTC (rev 211126)
+++ trunk/Tools/Scripts/webkitpy/libwebrtc/generate_cmake.py 2017-01-25 02:18:01 UTC (rev 211127)
</span><span class="lines">@@ -160,6 +160,8 @@
</span><span class="cx"> self.remove_webrtc_base_sha1()
</span><span class="cx"> self.targets.pop("//build/config/sanitizers:options_sources")
</span><span class="cx">
</span><ins>+ self.targets["//webrtc/base:rtc_base_approved"]["defines"].append("HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE")
+
</ins><span class="cx"> def _remove_target(self, targetName):
</span><span class="cx"> self.targets.pop(targetName)
</span><span class="cx"> for name, target in self.targets.iteritems():
</span></span></pre>
</div>
</div>
</body>
</html>