Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (283173 => 283174)
--- trunk/Source/_javascript_Core/ChangeLog 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1,3 +1,12 @@
+2021-09-28 Alex Christensen <[email protected]>
+
+ Mostly fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=230868
+
+ Reviewed by Don Olmstead.
+
+ * shell/PlatformMac.cmake:
+
2021-09-28 Saam Barati <[email protected]>
Make byte codes with arithmetic profiles switch to using an index instead of a pointer in metadata
Modified: trunk/Source/_javascript_Core/shell/PlatformMac.cmake (283173 => 283174)
--- trunk/Source/_javascript_Core/shell/PlatformMac.cmake 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/_javascript_Core/shell/PlatformMac.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -7,4 +7,5 @@
../API/tests/testapi.mm
)
list(APPEND testapi_SOURCES ${testapi_OBJC_SOURCES})
+list(APPEND jsc_LIBRARIES WTF)
set_source_files_properties(${testapi_OBJC_SOURCES} PROPERTIES COMPILE_FLAGS -fobjc-arc)
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (283173 => 283174)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1,3 +1,13 @@
+2021-09-28 Alex Christensen <[email protected]>
+
+ Mostly fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=230868
+
+ Reviewed by Don Olmstead.
+
+ * Compiler.cmake:
+ * Metal.cmake:
+
2021-09-23 Kyle Piddington <[email protected]>
[WebGL2, Safari 15 - iOS15] Problems with drawElements in some conditions
Modified: trunk/Source/ThirdParty/ANGLE/Compiler.cmake (283173 => 283174)
--- trunk/Source/ThirdParty/ANGLE/Compiler.cmake 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/ThirdParty/ANGLE/Compiler.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -385,8 +385,6 @@
"src/compiler/translator/TranslatorMetalDirect/Reference.h"
"src/compiler/translator/TranslatorMetalDirect/RewriteCaseDeclarations.cpp"
"src/compiler/translator/TranslatorMetalDirect/RewriteCaseDeclarations.h"
- "src/compiler/translator/TranslatorMetalDirect/RewriteGlobalQualifierDecls.cpp"
- "src/compiler/translator/TranslatorMetalDirect/RewriteGlobalQualifierDecls.h"
"src/compiler/translator/TranslatorMetalDirect/RewriteKeywords.cpp"
"src/compiler/translator/TranslatorMetalDirect/RewriteKeywords.h"
"src/compiler/translator/TranslatorMetalDirect/RewriteOutArgs.cpp"
Modified: trunk/Source/ThirdParty/ANGLE/Metal.cmake (283173 => 283174)
--- trunk/Source/ThirdParty/ANGLE/Metal.cmake 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/ThirdParty/ANGLE/Metal.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -28,8 +28,10 @@
"src/libANGLE/renderer/metal/FrameBufferMtl.mm"
"src/libANGLE/renderer/metal/IOSurfaceSurfaceMtl.h"
"src/libANGLE/renderer/metal/IOSurfaceSurfaceMtl.mm"
+ "src/libANGLE/renderer/metal/ImageMtl.mm"
"src/libANGLE/renderer/metal/ProgramMtl.h"
"src/libANGLE/renderer/metal/ProgramMtl.mm"
+ "src/libANGLE/renderer/metal/ProvokingVertexHelper.mm"
"src/libANGLE/renderer/metal/QueryMtl.h"
"src/libANGLE/renderer/metal/QueryMtl.mm"
"src/libANGLE/renderer/metal/RenderBufferMtl.h"
@@ -61,8 +63,6 @@
"src/libANGLE/renderer/metal/mtl_format_utils.mm"
"src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.h"
"src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm"
- "src/libANGLE/renderer/metal/mtl_glslang_utils.h"
- "src/libANGLE/renderer/metal/mtl_glslang_utils.mm"
"src/libANGLE/renderer/metal/mtl_occlusion_query_pool.h"
"src/libANGLE/renderer/metal/mtl_occlusion_query_pool.mm"
"src/libANGLE/renderer/metal/mtl_render_utils.h"
Modified: trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt (283173 => 283174)
--- trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1418,6 +1418,8 @@
if (APPLE)
list(APPEND webrtc_SOURCES
+ Source/third_party/libyuv/source/scale.cc
+
Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm
Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderVTBVP9.mm
Source/webrtc/sdk/objc/components/video_codec/RTCCodecSpecificInfoH265.mm
@@ -1425,8 +1427,6 @@
Source/webrtc/common_video/h265/h265_pps_parser.cc
Source/webrtc/common_video/h265/h265_vps_parser.cc
Source/webrtc/common_video/h265/h265_sps_parser.cc
- Source/webrtc/modules/rtp_rtcp/source/h265_sps_parser.h
- Source/webrtc/modules/rtp_rtcp/source/h265_sps_parser.cc
Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH265.mm
Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm
Source/webrtc/modules/video_coding/h265_vps_sps_pps_tracker.cc
@@ -1442,7 +1442,7 @@
Source/webrtc/rtc_base/mac_ifaddrs_converter.cc
Source/webrtc/rtc_base/system/cocoa_threading.mm
-
+
Source/webrtc/sdk/WebKit/WebKitUtilities.mm
Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp
Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp
@@ -1485,6 +1485,18 @@
Source/webrtc/sdk/objc/native/src/objc_video_encoder_factory.mm
Source/webrtc/sdk/objc/native/src/objc_video_frame.mm
)
+ if (NOT WTF_CPU_X86_64)
+ list(APPEND webrtc_SOURCES
+ Source/third_party/libyuv/source/row_neon.cc
+ Source/third_party/libyuv/source/rotate_neon64.cc
+ Source/third_party/libyuv/source/row_neon64.cc
+ Source/third_party/libyuv/source/compare_neon.cc
+ Source/third_party/libyuv/source/scale_neon64.cc
+ Source/third_party/libyuv/source/scale_neon.cc
+ Source/third_party/libyuv/source/rotate_neon.cc
+ Source/third_party/libyuv/source/compare_neon64.cc
+ )
+ endif ()
set(webm_SOURCES
Source/third_party/libwebm/m2ts/vpxpes_parser.cc
@@ -1558,7 +1570,7 @@
Source/third_party/libwebm/webm_parser/include/webm/reader.h
Source/third_party/libwebm/webm_parser/include/webm/webm_parser.h
DESTINATION ${webm_PRIVATE_HEADERS_DIR})
-
+
set(libwebrtc_PRIVATE_HEADERS_DIR "${CMAKE_BINARY_DIR}/libwebrtc/PrivateHeaders/libwebrtc")
file(MAKE_DIRECTORY ${libwebrtc_PRIVATE_HEADERS_DIR})
file(COPY
@@ -1597,7 +1609,7 @@
Source/third_party/libyuv/source/scale.cc
Source/third_party/libyuv/source/scale_neon.cc
Source/third_party/libyuv/source/scale_neon64.cc
-
+
Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c
Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c
Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c
@@ -1750,6 +1762,7 @@
if (APPLE)
list(APPEND webrtc_INCLUDE_DIRECTORIES PRIVATE
+ Source/third_party/libvpx/source/libvpx
Source/webrtc/sdk/objc
Source/webrtc/sdk/objc/base
Source/webrtc/sdk/objc/Framework/Classes
@@ -1866,7 +1879,7 @@
SCTP_USE_OPENSSL_SHA1
)
- add_library(opus STATIC
+ set(opus_SOURCES
Source/third_party/opus/src/celt/kiss_fft.c
Source/third_party/opus/src/celt/rate.c
Source/third_party/opus/src/celt/mdct.c
@@ -1879,12 +1892,6 @@
Source/third_party/opus/src/celt/mathops.c
Source/third_party/opus/src/celt/celt_lpc.c
Source/third_party/opus/src/celt/celt_encoder.c
- Source/third_party/opus/src/celt/x86/vq_sse2.c
- Source/third_party/opus/src/celt/x86/pitch_sse4_1.c
- Source/third_party/opus/src/celt/x86/pitch_sse2.c
- Source/third_party/opus/src/celt/x86/x86cpu.c
- Source/third_party/opus/src/celt/x86/x86_celt_map.c
- Source/third_party/opus/src/celt/x86/pitch_sse.c
Source/third_party/opus/src/celt/pitch.c
Source/third_party/opus/src/celt/laplace.c
Source/third_party/opus/src/celt/entenc.c
@@ -1955,7 +1962,6 @@
Source/third_party/opus/src/silk/fixed/process_gains_FIX.c
Source/third_party/opus/src/silk/fixed/encode_frame_FIX.c
Source/third_party/opus/src/silk/fixed/LTP_analysis_filter_FIX.c
- Source/third_party/opus/src/silk/fixed/x86/prefilter_FIX_sse.c
Source/third_party/opus/src/silk/fixed/regularize_correlations_FIX.c
Source/third_party/opus/src/silk/fixed/autocorr_FIX.c
Source/third_party/opus/src/silk/fixed/find_LTP_FIX.c
@@ -1971,7 +1977,6 @@
Source/third_party/opus/src/silk/HP_variable_cutoff.c
Source/third_party/opus/src/silk/code_signs.c
Source/third_party/opus/src/silk/log2lin.c
- Source/third_party/opus/src/silk/x86/x86_silk_map.c
Source/third_party/opus/src/silk/biquad_alt.c
Source/third_party/opus/src/silk/tables_LTP.c
Source/third_party/opus/src/silk/float/LPC_analysis_filter_FLP.c
@@ -2038,6 +2043,22 @@
Source/third_party/opus/src/src/mlp_data.c
Source/third_party/opus/src/src/opus_multistream.c
)
+
+ if (WTF_CPU_X86_64)
+ list(APPEND opus_SOURCES
+ Source/third_party/opus/src/celt/x86/vq_sse2.c
+ Source/third_party/opus/src/celt/x86/pitch_sse4_1.c
+ Source/third_party/opus/src/celt/x86/pitch_sse2.c
+ Source/third_party/opus/src/celt/x86/x86cpu.c
+ Source/third_party/opus/src/celt/x86/x86_celt_map.c
+ Source/third_party/opus/src/celt/x86/pitch_sse.c
+ Source/third_party/opus/src/silk/fixed/x86/prefilter_FIX_sse.c
+ Source/third_party/opus/src/silk/x86/x86_silk_map.c
+ )
+ endif ()
+
+ add_library(opus STATIC ${opus_SOURCES})
+
target_include_directories(opus PRIVATE
Source/third_party/opus/src
Source/third_party/opus/src/celt
@@ -2053,9 +2074,8 @@
"-DOPUS_EXPORT="
"-DHAVE_LRINT HAVE_LRINTF"
)
-
+
set(vpx_SOURCES
- Source/third_party/libvpx/source/config/mac/x64/vpx_config.c
Source/third_party/libvpx/source/libvpx/vp9/decoder/vp9_job_queue.c
Source/third_party/libvpx/source/libvpx/vpxstats.c
Source/third_party/libvpx/source/libvpx/args.c
@@ -2082,10 +2102,6 @@
Source/third_party/libvpx/source/libvpx/vp9/common/vp9_tile_common.c
Source/third_party/libvpx/source/libvpx/vp9/common/vp9_pred_common.c
Source/third_party/libvpx/source/libvpx/vp9/common/vp9_loopfilter.c
- Source/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_highbd_iht16x16_add_sse4.c
- Source/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c
- Source/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c
- Source/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_highbd_iht4x4_add_sse4.c
Source/third_party/libvpx/source/libvpx/vp9/common/vp9_idct.c
Source/third_party/libvpx/source/libvpx/vp9/common/vp9_scale.c
Source/third_party/libvpx/source/libvpx/vp9/common/vp9_reconintra.c
@@ -2118,11 +2134,6 @@
Source/third_party/libvpx/source/libvpx/vp8/encoder/onyx_if.c
Source/third_party/libvpx/source/libvpx/vp8/encoder/encodemv.c
Source/third_party/libvpx/source/libvpx/vp8/encoder/dct.c
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_quantize_sse2.c
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/denoising_sse2.c
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse4.c
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_quantize_ssse3.c
Source/third_party/libvpx/source/libvpx/vp8/encoder/picklpf.c
Source/third_party/libvpx/source/libvpx/vp8/encoder/encodeframe.c
Source/third_party/libvpx/source/libvpx/vp8/encoder/ratectrl.c
@@ -2155,11 +2166,6 @@
Source/third_party/libvpx/source/libvpx/vp8/common/dequantize.c
Source/third_party/libvpx/source/libvpx/vp8/common/swapyv12buffer.c
Source/third_party/libvpx/source/libvpx/vp8/common/reconinter.c
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/bilinear_filter_sse2.c
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/idct_blk_sse2.c
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/idct_blk_mmx.c
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_x86.c
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/vp8_asm_stubs.c
Source/third_party/libvpx/source/libvpx/vp8/common/reconintra4x4.c
Source/third_party/libvpx/source/libvpx/vp8/common/generic
Source/third_party/libvpx/source/libvpx/vp8/common/generic/systemdependent.c
@@ -2193,31 +2199,6 @@
Source/third_party/libvpx/source/libvpx/vpx_dsp/bitreader_buffer.c
Source/third_party/libvpx/source/libvpx/vpx_dsp/deblock.c
Source/third_party/libvpx/source/libvpx/vpx_dsp/psnrhvs.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct8x8_add_sse4.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct4x4_add_sse4.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct32x32_add_sse4.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct16x16_add_sse4.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct4x4_add_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_quantize_intrin_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_intrapred_intrin_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sum_squares_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/quantize_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/loopfilter_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/avg_intrin_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_loopfilter_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_variance_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/avg_pred_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/inv_txfm_ssse3.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/quantize_ssse3.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_intrapred_intrin_ssse3.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct8x8_add_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/inv_txfm_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct32x32_add_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/post_proc_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/variance_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/fwd_txfm_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct16x16_add_sse2.c
Source/third_party/libvpx/source/libvpx/vpx_dsp/bitwriter_buffer.c
Source/third_party/libvpx/source/libvpx/vpx_dsp/intrapred.c
Source/third_party/libvpx/source/libvpx/vpx_dsp/avg.c
@@ -2242,22 +2223,7 @@
Source/third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c
Source/third_party/libvpx/source/libvpx/ivfdec.c
Source/third_party/libvpx/source/libvpx/tools_common.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c
-
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/highbd_temporal_filter_sse4.c
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/temporal_filter_sse4.c
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_denoiser_sse2.c
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_diamond_search_sad_avx.c
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_error_avx2.c
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_highbd_block_error_intrin_sse2.c
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_avx2.c
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_sse2.c
-
- Source/third_party/libvpx/source/libvpx/vpx_ports/emms_mmx.c
+
Source/third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c
Source/third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c
Source/third_party/libvpx/source/libvpx/vp9/vp9_iface_common.c
@@ -2304,78 +2270,252 @@
Source/third_party/libvpx/source/libvpx/vp9/encoder/vp9_treewriter.c
)
- set(vpx_ASSEMBLY_SOURCES
- Source/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_mfqe_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/copy_sse3.asm
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/block_error_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/bitdepth_conversion_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/add_noise_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_sad_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/inv_wht_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_sad4d_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_variance_impl_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sad_ssse3.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sad_sse4.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/intrapred_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/avg_ssse3_x86_64.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/intrapred_ssse3.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sad_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sad_sse3.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sad4d_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/subtract_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/fwd_txfm_ssse3_x86_64.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_intrapred_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/subpel_variance_sse2.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/ssim_opt_x86_64.asm
- Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/deblock_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_mmx.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/iwalsh_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/mfqe_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/dequantize_mmx.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/recon_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_ssse3.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_mmx.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/recon_mmx.asm
- Source/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm
- Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/copy_sse2.asm
- )
- foreach(_file ${vpx_ASSEMBLY_SOURCES})
- get_filename_component(_name ${_file} NAME_WE)
- add_custom_command(
- OUTPUT ${libwebrtc_DERIVED_SOURCES_DIR}/${_name}.o
- MAIN_DEPENDENCY ${_file}
- DEPENDS yasm
- COMMAND ${CMAKE_BINARY_DIR}/bin/yasm -fmacho64 ${CMAKE_CURRENT_SOURCE_DIR}/${_file} -I ${CMAKE_CURRENT_SOURCE_DIR}/Source/third_party/libvpx/source/libvpx -I ${CMAKE_CURRENT_SOURCE_DIR}/Source/third_party/libvpx/source/config/mac/x64 -o ${libwebrtc_DERIVED_SOURCES_DIR}/${_name}.o
- VERBATIM)
- list(APPEND vpx_SOURCES ${libwebrtc_DERIVED_SOURCES_DIR}/${_name}.o)
- endforeach()
+ if (WTF_CPU_X86_64)
+ list(APPEND vpx_SOURCES
+ Source/third_party/libvpx/source/config/mac/x64/vpx_config.c
+ Source/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_highbd_iht16x16_add_sse4.c
+ Source/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c
+ Source/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c
+ Source/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_highbd_iht4x4_add_sse4.c
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_quantize_sse2.c
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/denoising_sse2.c
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse4.c
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_quantize_ssse3.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/bilinear_filter_sse2.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/idct_blk_sse2.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/idct_blk_mmx.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_x86.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/vp8_asm_stubs.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct8x8_add_sse4.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct4x4_add_sse4.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct32x32_add_sse4.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct16x16_add_sse4.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct4x4_add_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_quantize_intrin_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_intrapred_intrin_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sum_squares_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/quantize_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/loopfilter_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/avg_intrin_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_loopfilter_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_variance_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/avg_pred_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/inv_txfm_ssse3.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/quantize_ssse3.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_intrapred_intrin_ssse3.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct8x8_add_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/inv_txfm_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct32x32_add_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/post_proc_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/variance_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/fwd_txfm_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct16x16_add_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c
+ Source/third_party/libvpx/source/libvpx/vpx_ports/emms_mmx.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/highbd_temporal_filter_sse4.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/temporal_filter_sse4.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_denoiser_sse2.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_diamond_search_sad_avx.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_error_avx2.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_highbd_block_error_intrin_sse2.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_avx2.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_sse2.c
+ )
+
+ set(vpx_ASSEMBLY_SOURCES
+ Source/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_mfqe_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/copy_sse3.asm
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/block_error_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/bitdepth_conversion_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/add_noise_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_sad_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/inv_wht_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_sad4d_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_variance_impl_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sad_ssse3.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sad_sse4.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/intrapred_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/avg_ssse3_x86_64.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/intrapred_ssse3.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sad_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sad_sse3.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/sad4d_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/subtract_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/fwd_txfm_ssse3_x86_64.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_intrapred_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/subpel_variance_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/ssim_opt_x86_64.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/deblock_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_mmx.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/iwalsh_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/mfqe_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/dequantize_mmx.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/recon_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_ssse3.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_mmx.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/recon_mmx.asm
+ Source/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/x86/copy_sse2.asm
+ )
+ foreach(_file ${vpx_ASSEMBLY_SOURCES})
+ get_filename_component(_name ${_file} NAME_WE)
+ add_custom_command(
+ OUTPUT ${libwebrtc_DERIVED_SOURCES_DIR}/${_name}.o
+ MAIN_DEPENDENCY ${_file}
+ DEPENDS yasm
+ COMMAND ${CMAKE_BINARY_DIR}/bin/yasm -fmacho64 ${CMAKE_CURRENT_SOURCE_DIR}/${_file} -I ${CMAKE_CURRENT_SOURCE_DIR}/Source/third_party/libvpx/source/libvpx -I ${CMAKE_CURRENT_SOURCE_DIR}/Source/third_party/libvpx/source/config/mac/x64 -o ${libwebrtc_DERIVED_SOURCES_DIR}/${_name}.o
+ VERBATIM)
+ list(APPEND vpx_SOURCES ${libwebrtc_DERIVED_SOURCES_DIR}/${_name}.o)
+ endforeach()
+ else ()
+ list(APPEND vpx_SOURCES
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/arm/neon/vp9_denoiser_neon.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/arm/neon/vp9_error_neon.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/arm/neon/vp9_quantize_neon.c
+ Source/third_party/libvpx/source/libvpx/vp9/encoder/arm/neon/vp9_frame_scale_neon.c
+ Source/third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht4x4_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_highbd_iht4x4_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht_neon.h
+ Source/third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht16x16_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht8x8_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_highbd_iht8x8_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_highbd_iht16x16_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/shortfdct_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/denoising_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/copymem_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_blk_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/dequantizeb_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/vp8_loopfilter_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/mbloopfilter_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/sixtappredict_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/bilinearpredict_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/iwalsh_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/dequant_idct_neon.c
+ Source/third_party/libvpx/source/libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/sad4d_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_16_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_scaled_convolve8_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_horiz_filter_type2_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_neon.h
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/quantize_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/highbd_vpx_convolve_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type2_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/fdct32x32_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/transpose_neon.h
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_8_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct8x8_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/sad_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/fdct_partial_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct4x4_add_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve_copy_neon_asm.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/fdct_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_4_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct_neon.h
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/subpel_variance_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/highbd_vpx_convolve_copy_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_135_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_avg_horiz_filter_type1_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_neon_asm.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/highbd_idct_neon.h
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_vert_filter_type1_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/fwd_txfm_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/highbd_intrapred_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/save_reg_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type1_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/highbd_idct32x32_34_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_horiz_filter_type1_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/variance_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve_avg_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/subtract_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/deblock_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/avg_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/hadamard_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_neon_asm.h
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct16x16_1_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_neon.h
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/fdct16x16_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/intrapred_neon_asm.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_vert_filter_type2_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/highbd_vpx_convolve_avg_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct4x4_1_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/mem_neon.h
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct8x8_1_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_1_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct4x4_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/intrapred_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct16x16_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/highbd_idct32x32_135_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_avg_horiz_filter_type2_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve_avg_neon_asm.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/highbd_loopfilter_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_34_add_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/idct4x4_1_add_neon.asm
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/avg_pred_neon.c
+ Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve_copy_neon.c
+ Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/row_neon.cc
+ Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/rotate_neon64.cc
+ Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/compare_neon.cc
+ Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/scale_neon64.cc
+ Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/scale_neon.cc
+ Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/rotate_neon.cc
+ Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/compare_neon64.cc
+ Source/third_party/libvpx/source/libvpx/vpx_ports/arm_cpudetect.c
+ )
+ endif ()
+
add_library(vpx ${vpx_SOURCES})
- target_include_directories(vpx PRIVATE
+ set(vpx_INCLUDE_DIRECTORIES
Source/third_party/libvpx/source/config
- Source/third_party/libvpx/source/config/mac/x64
Source/third_party/libvpx/source/libvpx
Source/third_party/libyuv/include
Source/third_party/libvpx/source/libvpx/third_party/libwebm
)
- target_compile_options(vpx PRIVATE -mavx2)
+ if (WTF_CPU_X86_64)
+ list(APPEND vpx_INCLUDE_DIRECTORIES
+ Source/third_party/libvpx/source/config/mac/x64
+ )
+ target_compile_options(vpx PRIVATE -mavx2)
+ else ()
+ list(APPEND vpx_INCLUDE_DIRECTORIES
+ Source/third_party/libvpx/source/config/ios/arm64
+ )
+ endif ()
+ target_include_directories(vpx PRIVATE ${vpx_INCLUDE_DIRECTORIES})
add_library(yuv STATIC
Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/scale.cc
@@ -2388,7 +2528,6 @@
Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/planar_functions.cc
Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/row_common.cc
Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/scale_any.cc
- Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/scale_uv.cc
Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/rotate_gcc.cc
Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/convert.cc
Source/third_party/libvpx/source/libvpx/third_party/libyuv/source/convert_from.cc
@@ -2409,7 +2548,7 @@
Source/third_party/libvpx/source/libvpx/third_party/libyuv/include
Source/third_party/libyuv/include
)
-
+
add_executable(yasm
Source/third_party/yasm/x86cpu.c
Source/third_party/yasm/nasm-version.c
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (283173 => 283174)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1,3 +1,12 @@
+2021-09-28 Alex Christensen <[email protected]>
+
+ Mostly fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=230868
+
+ Reviewed by Don Olmstead.
+
+ * CMakeLists.txt:
+
2021-09-21 Youenn Fablet <[email protected]>
NetworkRTCUDPSocketCocoaConnections should handle NAT64 IP addresses correctly
Modified: trunk/Source/WTF/ChangeLog (283173 => 283174)
--- trunk/Source/WTF/ChangeLog 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WTF/ChangeLog 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1,3 +1,12 @@
+2021-09-28 Alex Christensen <[email protected]>
+
+ Mostly fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=230868
+
+ Reviewed by Don Olmstead.
+
+ * wtf/PlatformMac.cmake:
+
2021-09-28 Yusuke Suzuki <[email protected]>
Unreviewed, fix Windows build
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (283173 => 283174)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -36,6 +36,7 @@
spi/cocoa/SecuritySPI.h
spi/cocoa/objcSPI.h
+ spi/darwin/CodeSignSPI.h
spi/darwin/DataVaultSPI.h
spi/darwin/OSVariantSPI.h
spi/darwin/ProcessMemoryFootprint.h
@@ -51,6 +52,7 @@
list(APPEND WTF_SOURCES
BlockObjCExceptions.mm
+ ProcessPrivilege.cpp
TranslatedProcess.cpp
cf/CFURLExtras.cpp
@@ -61,7 +63,6 @@
cf/URLCF.cpp
cocoa/AutodrainedPool.cpp
- cocoa/CPUTimeCocoa.cpp
cocoa/CrashReporter.cpp
cocoa/Entitlements.mm
cocoa/FileSystemCocoa.mm
@@ -81,6 +82,7 @@
mac/FileSystemMac.mm
mac/SchedulePairMac.mm
+ posix/CPUTimePOSIX.cpp
posix/FileSystemPOSIX.cpp
posix/OSAllocatorPOSIX.cpp
posix/ThreadingPOSIX.cpp
Modified: trunk/Source/WebCore/ChangeLog (283173 => 283174)
--- trunk/Source/WebCore/ChangeLog 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WebCore/ChangeLog 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1,5 +1,16 @@
2021-09-28 Alex Christensen <[email protected]>
+ Mostly fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=230868
+
+ Reviewed by Don Olmstead.
+
+ * PlatformMac.cmake:
+ * platform/graphics/cg/ImageBufferUtilitiesCG.cpp:
+ (WebCore::encode):
+
+2021-09-28 Alex Christensen <[email protected]>
+
Fix build with non-internal Monterey SDK
https://bugs.webkit.org/show_bug.cgi?id=230872
Modified: trunk/Source/WebCore/PAL/ChangeLog (283173 => 283174)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1,5 +1,14 @@
2021-09-28 Alex Christensen <[email protected]>
+ Mostly fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=230868
+
+ Reviewed by Don Olmstead.
+
+ * pal/PlatformMac.cmake:
+
+2021-09-28 Alex Christensen <[email protected]>
+
Fix build with non-internal Monterey SDK
https://bugs.webkit.org/show_bug.cgi?id=230872
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (283173 => 283174)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -21,6 +21,8 @@
cocoa/UsageTrackingSoftLink.h
cocoa/VisionKitCoreSoftLink.h
+ ios/SystemStatusSoftLink.h
+
mac/DataDetectorsSoftLink.h
mac/LookupSoftLink.h
mac/QuickLookUISoftLink.h
@@ -28,6 +30,7 @@
spi/cf/CFLocaleSPI.h
spi/cf/CFNetworkConnectionCacheSPI.h
spi/cf/CFNetworkSPI.h
+ spi/cf/CFNotificationCenterSPI.h
spi/cf/CFUtilitiesSPI.h
spi/cf/CoreAudioSPI.h
spi/cf/CoreMediaSPI.h
@@ -153,7 +156,6 @@
cocoa/AppSSOSoftLink.mm
cocoa/AVFoundationSoftLink.mm
- cocoa/CryptoKitCBridgingSoftLink.mm
cocoa/DataDetectorsCoreSoftLink.mm
cocoa/FileSizeFormatterCocoa.mm
cocoa/Gunzip.cpp
Modified: trunk/Source/WebCore/PlatformMac.cmake (283173 => 283174)
--- trunk/Source/WebCore/PlatformMac.cmake 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WebCore/PlatformMac.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -55,6 +55,8 @@
${SYSTEMCONFIGURATION_LIBRARY}
${VIDEOTOOLBOX_LIBRARY}
${XML2_LIBRARY}
+ WTF
+ bmalloc
opus
usrsctp
vpx
@@ -129,6 +131,7 @@
"${WEBCORE_DIR}/platform/mac"
"${WEBCORE_DIR}/platform/mediacapabilities"
"${WEBCORE_DIR}/platform/mediarecorder/cocoa"
+ "${WEBCORE_DIR}/platform/mediastream/cocoa"
"${WEBCORE_DIR}/platform/mediastream/mac"
"${WEBCORE_DIR}/platform/network/cocoa"
"${WEBCORE_DIR}/platform/network/cf"
@@ -192,7 +195,6 @@
page/mac/WheelEventDeltaFilterMac.mm
page/scrolling/mac/ScrollingCoordinatorMac.mm
- page/scrolling/mac/ScrollingMomentumCalculatorMac.mm
page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
page/scrolling/mac/ScrollingTreeMac.mm
@@ -329,7 +331,6 @@
platform/graphics/cocoa/WebCoreCALayerExtras.mm
platform/graphics/cocoa/WebCoreDecompressionSession.mm
platform/graphics/cocoa/WebGLLayer.mm
- platform/graphics/cocoa/WebGPULayer.mm
platform/graphics/cocoa/WebMAudioUtilitiesCocoa.mm
platform/graphics/coretext/FontCascadeCoreText.cpp
@@ -536,6 +537,12 @@
Modules/webauthn/fido/Pin.h
+ page/CaptionUserPreferencesMediaAF.h
+
+ page/cocoa/DataDetectionResultsStorage.h
+ page/cocoa/DataDetectorElementInfo.h
+ page/cocoa/ImageOverlayDataDetectionResultIdentifier.h
+
page/mac/TextIndicatorWindow.h
page/mac/WebCoreFrameView.h
@@ -550,15 +557,17 @@
page/scrolling/mac/ScrollingTreeOverflowScrollingNodeMac.h
page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h
+ platform/CaptionPreferencesDelegate.h
platform/FrameRateMonitor.h
- platform/ImageExtractionResult.h
platform/MainThreadSharedTimer.h
platform/PictureInPictureSupport.h
platform/PlatformContentFilter.h
+ platform/ScrollAnimation.h
platform/ScrollingEffectsController.h
platform/ScrollSnapAnimatorState.h
platform/SharedTimer.h
platform/SystemSoundManager.h
+ platform/TextRecognitionResult.h
platform/audio/cocoa/AudioDestinationCocoa.h
platform/audio/cocoa/AudioOutputUnitAdaptor.h
@@ -571,6 +580,9 @@
platform/audio/ios/MediaSessionManagerIOS.h
+ platform/audio/mac/SharedRoutingArbitrator.h
+
+ platform/cf/MediaAccessibilitySoftLink.h
platform/cf/RunLoopObserver.h
platform/cocoa/AGXCompilerService.h
@@ -650,6 +662,7 @@
platform/graphics/cocoa/WebCoreCALayerExtras.h
platform/graphics/cocoa/WebMAudioUtilitiesCocoa.h
+ platform/graphics/cv/CVUtilities.h
platform/graphics/cv/GraphicsContextGLCV.h
platform/graphics/cv/ImageRotationSessionVT.h
platform/graphics/cv/PixelBufferConformerCV.h
@@ -701,6 +714,9 @@
platform/mediastream/RealtimeIncomingVideoSource.h
platform/mediastream/RealtimeMediaSourceIdentifier.h
+ platform/mediastream/cocoa/AudioMediaStreamTrackRendererInternalUnit.h
+ platform/mediastream/cocoa/AudioMediaStreamTrackRendererUnit.h
+
platform/mediastream/mac/RealtimeIncomingVideoSourceCocoa.h
platform/mediastream/mac/RealtimeVideoUtilities.h
platform/mediastream/mac/WebAudioSourceProviderCocoa.h
@@ -901,23 +917,6 @@
COMMAND cat ${MODERN_MEDIA_CONTROLS_SCRIPTS} > ${WebCore_DERIVED_SOURCES_DIR}/ModernMediaControls.js
VERBATIM)
-add_custom_command(
- OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibraryFunctionMap.cpp
- MAIN_DEPENDENCY Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt
- DEPENDS Modules/webgpu/WHLSL/WHLSLBuildStandardLibraryFunctionMap.py
- COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLBuildStandardLibraryFunctionMap.py ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibraryFunctionMap.cpp
- VERBATIM)
-add_custom_command(
- OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibrary.h
- DEPENDS ${_javascript_Core_SCRIPTS_DIR}/xxd.pl ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt
- COMMAND gzip -cn ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt > ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibrary.gz
- COMMAND ${PERL_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/xxd.pl WHLSLStandardLibrary ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibrary.gz ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibrary.h
- VERBATIM)
-list(APPEND WebCore_SOURCES
- ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibrary.h
- ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibraryFunctionMap.cpp
-)
-
list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)
list(APPEND WebCoreTestSupport_SOURCES
testing/Internals.mm
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.cpp (283173 => 283174)
--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.cpp 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.cpp 2021-09-28 16:22:30 UTC (rev 283174)
@@ -174,7 +174,7 @@
auto dataProvider = adoptCF(CGDataProviderCreateWithData(nullptr, data, dataSize, nullptr));
if (!dataProvider)
- return nullptr;
+ return false;
auto imageSize = source.size();
auto image = adoptCF(CGImageCreate(imageSize.width(), imageSize.height(), 8, 32, 4 * imageSize.width(), source.format().colorSpace.platformColorSpace(), kCGBitmapByteOrderDefault | dataAlphaInfo, dataProvider.get(), 0, false, kCGRenderingIntentDefault));
Modified: trunk/Source/WebKit/ChangeLog (283173 => 283174)
--- trunk/Source/WebKit/ChangeLog 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WebKit/ChangeLog 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1,3 +1,12 @@
+2021-09-28 Alex Christensen <[email protected]>
+
+ Mostly fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=230868
+
+ Reviewed by Don Olmstead.
+
+ * PlatformMac.cmake:
+
2021-09-28 Youenn Fablet <[email protected]>
applyConstraints throws OverconstrainedError if specify exact for deviceId
Modified: trunk/Source/WebKit/PlatformMac.cmake (283173 => 283174)
--- trunk/Source/WebKit/PlatformMac.cmake 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WebKit/PlatformMac.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -21,6 +21,7 @@
include(Headers.cmake)
list(APPEND WebKit_PRIVATE_LIBRARIES
+ Accessibility
PAL
WebKitLegacy
${APPLICATIONSERVICES_LIBRARY}
@@ -47,6 +48,9 @@
NetworkProcess/mac/NetworkConnectionToWebProcessMac.mm
NetworkProcess/webrtc/NetworkRTCProvider.mm
+ NetworkProcess/webrtc/NetworkRTCTCPSocketCocoa.mm
+ NetworkProcess/webrtc/NetworkRTCUDPSocketCocoa.mm
+ NetworkProcess/webrtc/NetworkRTCUtilitiesCocoa.mm
NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm
@@ -90,8 +94,10 @@
list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
"${CMAKE_BINARY_DIR}/libwebrtc/PrivateHeaders"
"${ICU_INCLUDE_DIRS}"
+ "${WEBKIT_DIR}/GPUProcess/mac"
"${WEBKIT_DIR}/NetworkProcess/cocoa"
"${WEBKIT_DIR}/NetworkProcess/mac"
+ "${WEBKIT_DIR}/NetworkProcess/PrivateClickMeasurement/cocoa"
"${WEBKIT_DIR}/PluginProcess/mac"
"${WEBKIT_DIR}/UIProcess/mac"
"${WEBKIT_DIR}/UIProcess/API/C/mac"
@@ -107,6 +113,7 @@
"${WEBKIT_DIR}/UIProcess/Media/cocoa"
"${WEBKIT_DIR}/UIProcess/PDF"
"${WEBKIT_DIR}/UIProcess/RemoteLayerTree"
+ "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/cocoa"
"${WEBKIT_DIR}/UIProcess/RemoteLayerTree/ios"
"${WEBKIT_DIR}/UIProcess/RemoteLayerTree/mac"
"${WEBKIT_DIR}/UIProcess/WebAuthentication/Cocoa"
@@ -132,6 +139,7 @@
"${WEBKIT_DIR}/Shared/ios"
"${WEBKIT_DIR}/Shared/cf"
"${WEBKIT_DIR}/Shared/Cocoa"
+ "${WEBKIT_DIR}/Shared/EntryPointUtilities/Cocoa/Daemon"
"${WEBKIT_DIR}/Shared/EntryPointUtilities/Cocoa/XPCService"
"${WEBKIT_DIR}/Shared/mac"
"${WEBKIT_DIR}/Shared/mac/MediaFormatReader"
@@ -444,6 +452,7 @@
UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.h
UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.h
UIProcess/API/Cocoa/_WKSessionState.h
+ UIProcess/API/Cocoa/_WKTapHandlingResult.h
UIProcess/API/Cocoa/_WKTextInputContext.h
UIProcess/API/Cocoa/_WKTextManipulationConfiguration.h
UIProcess/API/Cocoa/_WKTextManipulationDelegate.h
@@ -467,7 +476,6 @@
UIProcess/API/Cocoa/_WKWebsiteDataStore.h
UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h
UIProcess/API/Cocoa/_WKWebsiteDataStoreDelegate.h
- UIProcess/API/Cocoa/_WKWebsitePolicies.h
UIProcess/API/ios/WKWebViewPrivateForTestingIOS.h
@@ -776,10 +784,10 @@
set(WebKit_RESOURCES_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/Resources)
add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb COMMAND
- grep -o "^[^;]*" ${WEBKIT_DIR}/WebProcess/com.apple.WebProcess.sb.in | clang -E -P -w -include wtf/Platform.h -I ${WTF_FRAMEWORK_HEADERS_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb
+ grep -o "^[^;]*" ${WEBKIT_DIR}/WebProcess/com.apple.WebProcess.sb.in | clang -E -P -w -include wtf/Platform.h -I ${WTF_FRAMEWORK_HEADERS_DIR} -I ${bmalloc_FRAMEWORK_HEADERS_DIR} -I ${WEBKIT_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb
VERBATIM)
add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb COMMAND
- grep -o "^[^;]*" ${WEBKIT_DIR}/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in | clang -E -P -w -include wtf/Platform.h -I ${WTF_FRAMEWORK_HEADERS_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb
+ grep -o "^[^;]*" ${WEBKIT_DIR}/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in | clang -E -P -w -include wtf/Platform.h -I ${WTF_FRAMEWORK_HEADERS_DIR} -I ${bmalloc_FRAMEWORK_HEADERS_DIR} -I ${WEBKIT_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb
VERBATIM)
add_custom_target(WebKitSandboxProfiles ALL DEPENDS ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb)
add_dependencies(WebKit WebKitSandboxProfiles)
Modified: trunk/Source/WebKitLegacy/ChangeLog (283173 => 283174)
--- trunk/Source/WebKitLegacy/ChangeLog 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WebKitLegacy/ChangeLog 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1,3 +1,12 @@
+2021-09-28 Alex Christensen <[email protected]>
+
+ Mostly fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=230868
+
+ Reviewed by Don Olmstead.
+
+ * PlatformMac.cmake:
+
2021-09-20 Chris Dumez <[email protected]>
Stop using makeRef(*this) / makeRefPtr(this)
Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (283173 => 283174)
--- trunk/Source/WebKitLegacy/PlatformMac.cmake 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1,13 +1,19 @@
find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
find_library(QUARTZ_LIBRARY Quartz)
+find_library(SECURITYINTERFACE_LIBRARY SecurityInterface)
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
add_definitions(-DJSC_CLASS_AVAILABLE\\\(...\\\)=)
+list(APPEND WebKitLegacy_PRIVATE_LIBRARIES
+ ${SECURITYINTERFACE_LIBRARY}
+)
+
list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
"${PAL_FRAMEWORK_HEADERS_DIR}"
"${WEBKITLEGACY_DIR}"
"${WEBKITLEGACY_DIR}/mac"
+ "${WEBKITLEGACY_DIR}/mac/Misc"
"${WEBKITLEGACY_DIR}/mac/WebView"
"${WEBKITLEGACY_DIR}/mac/WebCoreSupport"
"${WebKitLegacy_FRAMEWORK_HEADERS_DIR}"
@@ -42,6 +48,7 @@
mac/Misc/WebElementDictionary.mm
mac/Misc/WebIconDatabase.mm
mac/Misc/WebKitErrors.m
+ mac/Misc/WebKitLogInitialization.mm
mac/Misc/WebKitLogging.m
mac/Misc/WebKitNSStringExtras.mm
mac/Misc/WebKitStatistics.m
Modified: trunk/Tools/ChangeLog (283173 => 283174)
--- trunk/Tools/ChangeLog 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Tools/ChangeLog 2021-09-28 16:22:30 UTC (rev 283174)
@@ -1,3 +1,14 @@
+2021-09-28 Alex Christensen <[email protected]>
+
+ Mostly fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=230868
+
+ Reviewed by Don Olmstead.
+
+ * DumpRenderTree/PlatformMac.cmake:
+ * DumpRenderTree/TestNetscapePlugIn/PlatformMac.cmake: Added.
+ * TestRunnerShared/PlatformMac.cmake: Added.
+
2021-09-28 Youenn Fablet <[email protected]>
REGRESSION (r283102): [ MacOS Debug ] TestWebKitAPI.WebKit2.CaptureIndicatorDelay is failing
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (283173 => 283174)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2021-09-28 16:20:25 UTC (rev 283173)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -11,11 +11,6 @@
link_directories(../../WebKitLibraries)
include_directories(../../WebKitLibraries)
-list(APPEND TestNetscapePlugIn_LIBRARIES
- ${QUARTZ_LIBRARY}
- WebKit
-)
-
list(APPEND DumpRenderTree_LIBRARIES
${CARBON_LIBRARY}
${QUARTZ_LIBRARY}
@@ -36,20 +31,6 @@
${WebKitTestRunner_SHARED_DIR}/spi
)
-# Common ${TestNetscapePlugIn_SOURCES} from CMakeLists.txt are C++ source files.
-list(APPEND TestNetscapePlugIn_Cpp_SOURCES
- ${TestNetscapePlugIn_SOURCES}
-)
-
-list(APPEND TestNetscapePlugIn_ObjCpp_SOURCES
- TestNetscapePlugIn/PluginObjectMac.mm
-)
-
-set(TestNetscapePlugIn_SOURCES
- ${TestNetscapePlugIn_Cpp_SOURCES}
- ${TestNetscapePlugIn_ObjCpp_SOURCES}
-)
-
# Common ${DumpRenderTree_SOURCES} from CMakeLists.txt are C++ source files.
list(APPEND DumpRenderTree_Cpp_SOURCES
${DumpRenderTree_SOURCES}
@@ -111,14 +92,6 @@
set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c99")
endforeach ()
-foreach (_file ${DumpRenderTree_Cpp_SOURCES} ${TestNetscapePlugIn_Cpp_SOURCES})
- set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c++17")
-endforeach ()
-
-foreach (_file ${DumpRenderTree_ObjCpp_SOURCES} ${TestNetscapePlugIn_ObjCpp_SOURCES})
- set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++17")
-endforeach ()
-
set(DumpRenderTree_RESOURCES
AHEM____.TTF
FontWithFeatures.otf
Added: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformMac.cmake (0 => 283174)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformMac.cmake (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformMac.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -0,0 +1,17 @@
+list(APPEND TestNetscapePlugIn_SOURCES
+ PluginObjectMac.mm
+)
+
+list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
+ ${bmalloc_FRAMEWORK_HEADERS_DIR}
+ ${WTF_FRAMEWORK_HEADERS_DIR}
+)
+
+find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+find_library(FOUNDATION_LIBRARY Foundation)
+find_library(QUARTZCORE_LIBRARY QuartzCore)
+list(APPEND TestNetscapePlugIn_LIBRARIES
+ ${COREFOUNDATION_LIBRARY}
+ ${FOUNDATION_LIBRARY}
+ ${QUARTZCORE_LIBRARY}
+)
Added: trunk/Tools/TestRunnerShared/PlatformMac.cmake (0 => 283174)
--- trunk/Tools/TestRunnerShared/PlatformMac.cmake (rev 0)
+++ trunk/Tools/TestRunnerShared/PlatformMac.cmake 2021-09-28 16:22:30 UTC (rev 283174)
@@ -0,0 +1 @@
+add_definitions(-DJSC_API_AVAILABLE\\\(...\\\)=)
