Skip to content
This repository has been archived by the owner on Oct 25, 2024. It is now read-only.

Commit

Permalink
Add patches for untracked repositories.
Browse files Browse the repository at this point in the history
  • Loading branch information
jianjunz committed Jun 9, 2022
1 parent 1caf244 commit 3c07da4
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
4 changes: 3 additions & 1 deletion scripts/prepare_dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
LIBSRTP_PATH = os.path.join(THIRD_PARTY_PATH, 'libsrtp')
FFMPEG_PATH = os.path.join(THIRD_PARTY_PATH, 'ffmpeg')
LIBVPX_PATH = os.path.join(THIRD_PARTY_PATH, 'libvpx')
LIBJPEG_TURBO_PATH = os.path.join(THIRD_PARTY_PATH, 'libjpeg_turbo')
LIBVPX_SOURCE_PATH = os.path.join(LIBVPX_PATH, 'source/libvpx')
WEBRTC_OVERRIDES_PATH = os.path.join(THIRD_PARTY_PATH, 'webrtc_overrides')
BUILD_PATH = os.path.join(HOME_PATH, 'build')
Expand All @@ -45,7 +46,8 @@
('0014-Fix-missing-ffmpeg-configure-item-for-msvc-build.patch', FFMPEG_PATH),
('0015-Remove-custom-d8-dependency.patch', BUILD_PATH),
('0016-Remove-deprecated-create_srcjar-property.patch', THIRD_PARTY_PATH),
('0017-Build-libvpx-with-RTC-rate-control-impl-included.patch', THIRD_PARTY_PATH)
('0017-Build-libvpx-with-RTC-rate-control-impl-included.patch', THIRD_PARTY_PATH),
('0018-Support-wasm-build.patch', LIBJPEG_TURBO_PATH)
]

def _patch(ignoreFailures=False):
Expand Down
25 changes: 25 additions & 0 deletions talk/owt/patches/0018-Support-wasm-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From e4850e5a4ae4eb73f7a3625b332241d7cd941c3a Mon Sep 17 00:00:00 2001
From: Jianjun Zhu <[email protected]>
Date: Thu, 9 Jun 2022 18:38:00 +0800
Subject: [PATCH] Support wasm build.

---
BUILD.gn | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BUILD.gn b/BUILD.gn
index f9c483e..e18123d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -277,7 +277,7 @@ static_library("libjpeg") {

# MemorySanitizer doesn't support assembly code, so keep it disabled in
# MSan builds for now.
- if (is_msan) {
+ if (is_msan || is_wasm) {
sources += [ "jsimd_none.c" ]
} else {
public_deps += [ ":simd" ]
--
2.36.1

0 comments on commit 3c07da4

Please sign in to comment.