diff options
author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2014-02-20 17:46:08 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-28 13:39:48 +0100 |
commit | 0fb2109e9a14857f76d12c45beaac7fc9640487e (patch) | |
tree | 1c6473398cf06173c646b1dc82218113fd0c23b5 /patches/chromium | |
parent | 9b4a0e619229d5cb426814056a4e8a569bad39a7 (diff) |
Extend search path in libvpx to enable build with QtWebEngine
Paths are paritally hardcoded for Windows in libvpx.
Change-Id: Ic1c537bcc8b988c9803326709e38f44cb0943ee3
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'patches/chromium')
-rw-r--r-- | patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch b/patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch new file mode 100644 index 000000000..85d52a4a6 --- /dev/null +++ b/patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch @@ -0,0 +1,33 @@ +From b7fe7f56307823e3d028bcca94c3f1cb6981dc5f Mon Sep 17 00:00:00 2001 +From: Zoltan Arvai <zarvai@inf.u-szeged.hu> +Date: Mon, 24 Feb 2014 07:29:32 -0800 +Subject: LIBVPX: Add path for QtWebEngine build in Windows specific actions + +--- + libvpx.gyp | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/libvpx.gyp b/libvpx.gyp +index 392ccde..7f1a18d 100644 +--- a/libvpx.gyp ++++ b/libvpx.gyp +@@ -402,6 +402,7 @@ + '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vp8/vp8_asm_enc_offsets.obj', + '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj', + '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj', ++ '-s', '<(qtwe_chromium_obj_dir)/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj', + ], + 'process_output_as_sources': 1, + 'msvs_cygwin_shell': 1, +@@ -500,6 +501,7 @@ + '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vpx_scale/vpx_scale_asm_offsets.obj', + '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj', + '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vpx_scale/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj', ++ '-s', '<(qtwe_chromium_obj_dir)/third_party/libvpx/<(libvpx_source)/vpx_scale/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj', + ], + 'process_output_as_sources': 1, + 'msvs_cygwin_shell': 1, +-- +1.7.9 + + |