Attachment 342173 Details for Bug 186396 – Patch

[patch] Patch

bug-186396-20180607091035.patch (text/plain), 5.03 KB, created by Darin Adler on 2018-06-07 09:10:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Adler

Created: 2018-06-07 09:10:36 PDT

Size: 5.03 KB

patch

obsolete

>Subversion Revision: 232528
>diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
>index 2e311fd6b1b53b3e799db2b13d589e07ea3e0e3a..c7d69813c8e323f285b2e9211b111358cecb5046 100644
>--- a/Source/ThirdParty/libwebrtc/ChangeLog
>+++ b/Source/ThirdParty/libwebrtc/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-06-07  Darin Adler  <darin@apple.com>
>+
>+        [Cocoa] Minor ARC tidying of libwebrtc
>+        https://bugs.webkit.org/show_bug.cgi?id=186396
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig: Set CLANG_ENABLE_OBJC_ARC here as we will eventually be
>+        doing in all the various Base.xcconfig files as we make progress on conversion.
>+
>+        * Configurations/libwebrtc.xcconfig: Removed override of CLANG_ENABLE_OBJC_ARC here and
>+        also removed five other redundant settings that match Base.xcconfig.
>+
>+        * libwebrtc.xcodeproj/project.pbxproj: Removed explicit -fobjc-arc that was set on
>+        one particular source file, since that's already the default for the project.
>+
> 2018-06-04  Youenn Fablet  <youenn@apple.com>
> 
>         [WK1] Add an option to restrict communication to localhost sockets
>diff --git a/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
>index aa4442078975faa415f3ad13f1013c71e3d05074..ee2b3187c01920133ab2ab314609fee3cb26f026 100644
>--- a/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
>+++ b/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
>@@ -9,6 +9,7 @@ ALWAYS_SEARCH_USER_PATHS = NO;
> 
> CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
> CLANG_CXX_LIBRARY = libc++;
>+CLANG_ENABLE_OBJC_ARC = YES;
> CLANG_ENABLE_OBJC_WEAK = YES;
> CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
> CLANG_WARN_BOOL_CONVERSION = YES;
>diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
>index 5058dbb1bf0ccfd0bb9a17023f8fabccb67cab91..d8cf487e91246b2e42b0cdadbe5f1bb00370f4c5 100644
>--- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
>+++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
>@@ -17,14 +17,7 @@ DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = @loader_path/../../../
> DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE);
> DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
> 
>-CLANG_ENABLE_OBJC_ARC = YES;
>-
>-CLANG_WARN_BOOL_CONVERSION = YES;
>-CLANG_WARN_ENUM_CONVERSION = YES;
>-CLANG_WARN_INT_CONVERSION = YES;
> GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
>-COMBINE_HIDPI_IMAGES = NO;
>-ENABLE_STRICT_OBJC_MSGSEND = YES;
> HEADER_SEARCH_PATHS = Source Source/third_party/jsoncpp/source/include Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include Source/third_party/boringssl/src/include Source/third_party/libyuv/include Source/third_party/usrsctp/usrsctplib Source/third_party/usrsctp/usrsctplib/usrsctplib Source/webrtc/sdk/objc/Framework/Headers Source/webrtc/common_audio/signal_processing/include Source/webrtc/modules/audio_coding/codecs/isac/main/include Source/third_party/opus/src/celt Source/third_party/opus/src/include Source/third_party/opus/src/src Source/webrtc/modules/audio_device/mac Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet Source/webrtc/modules/audio_device/ios;
> 
> PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc;
>diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
>index f217ec367cf4553f2f5a84776950562733c66e60..5da55824979fd39c73f70e6e0e291228d655a09f 100644
>--- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
>+++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
>@@ -2745,7 +2745,7 @@
> 		5CFD537C1E4BA4F500482908 /* audio_device_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD53751E4BA4F500482908 /* audio_device_ios.h */; };
> 		5CFD53801E4BA4F500482908 /* audio_session_observer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD53791E4BA4F500482908 /* audio_session_observer.h */; };
> 		5CFD53811E4BA4F500482908 /* voice_processing_audio_unit.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD537A1E4BA4F500482908 /* voice_processing_audio_unit.h */; };
>-		5CFD53821E4BA4F500482908 /* voice_processing_audio_unit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD537B1E4BA4F500482908 /* voice_processing_audio_unit.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
>+		5CFD53821E4BA4F500482908 /* voice_processing_audio_unit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD537B1E4BA4F500482908 /* voice_processing_audio_unit.mm */; };
> 		5CFD538D1E4BD3A300482908 /* compare_neon.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53851E4BD3A300482908 /* compare_neon.cc */; };
> 		5CFD538E1E4BD3A300482908 /* compare_neon64.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53861E4BD3A300482908 /* compare_neon64.cc */; };
> 		5CFD538F1E4BD3A300482908 /* rotate_neon.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53871E4BD3A300482908 /* rotate_neon.cc */; };

Flags:

mitz: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186396: 342173