summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch33
-rwxr-xr-xpatches/patch-chromium.sh1
-rw-r--r--src/core/gyp_run.pro6
3 files changed, 40 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 00000000..85d52a4a
--- /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
+
+
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index c3a33aa2..0f204fed 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -55,6 +55,7 @@ for MODULE in \
/ \
/third_party/WebKit \
/third_party/libjingle/source/talk \
+ /third_party/libvpx \
/tools/gyp \
/tools/grit
do
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 9ab8ff6f..78285981 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -58,6 +58,12 @@ cross_compile {
GYP_ARGS += "-D CXX=\"$$which($$QMAKE_CXX)\""
}
+win32 {
+# Libvpx build needs additional search path on Windows.
+git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir")
+GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$getOutDir()/$$getConfigDir()/obj/$$git_chromium_src_dir\""
+}
+
!build_pass {
message(Running gyp_qtwebengine $${GYP_ARGS}...)
!system("python $$QTWEBENGINE_ROOT/tools/buildscripts/gyp_qtwebengine $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --")