Skip to content

Commit a4ffdb6

Browse files
committed
Fix nwjs#6108: move ffmpeg library to parent folder for macOS 10.9
xpcd in 10.9 will scan NW XPC service twice and report false duplication error
1 parent baac03f commit a4ffdb6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ action("commit_id") {
250250
if (is_mac) {
251251
copy("copy_ffmpeg") {
252252
sources = [ "$root_out_dir/libffmpeg.dylib" ]
253-
outputs = [ "$root_out_dir/$chrome_product_full_name.app/Contents/Versions/$chrome_version_full/$chrome_framework_name.framework/libffmpeg.dylib" ]
253+
outputs = [ "$root_out_dir/$chrome_product_full_name.app/Contents/Versions/$chrome_version_full/libffmpeg.dylib" ]
254254
deps = [
255255
"//chrome",
256256
"//third_party/ffmpeg:ffmpeg"

patch/patches/ffmpeg.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ index 42d85c9651..0adeafc712 100755
88

99
+ if (is_mac) {
1010
+ ldflags += [
11-
+ "-Wl,-install_name,@loader_path/libffmpeg.dylib"
11+
+ "-Wl,-install_name,@loader_path/../libffmpeg.dylib"
1212
+ ]
1313
+ }
1414
+

0 commit comments

Comments
 (0)