diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 6b454c5..33cdee6 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -73,6 +73,11 @@ Patch5: qtwebengine-opensource-src-5.7.0-system-icu-utf.patch # with some custom fixes and improvements # also build V8 shared and twice on i686 (once for x87, once for SSE2) Patch6: qtwebengine-opensource-src-5.7.0-no-sse2.patch +# fix ARM NEON handling in webrtc gyp files +# For now, fix video_processing.gypi to only build NEON files when actually +# requested (i.e., not if arm_neon=0 arm_neon_optional=0). +# We still need to figure out why the flag tweaks from arm_neon.gypi don't work. +Patch7: qtwebengine-opensource-src-5.7.0-webrtc-neon.patch # the architectures theoretically supported by the version of V8 used (#1298011) # You may need some minor patching to build on one of the secondary @@ -299,6 +304,7 @@ BuildArch: noarch %patch4 -p1 -b .system-nspr-prtime %patch5 -p1 -b .system-icu-utf %patch6 -p1 -b .no-sse2 +%patch7 -p1 -b .webrtc-neon # fix // in #include in content/renderer/gpu to avoid debugedit failure sed -i -e 's!gpu//!gpu/!g' \ src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc @@ -444,13 +450,14 @@ popd %changelog -* Sun Jul 17 2016 Kevin Kofler - 5.7.0-1 +* Mon Jul 18 2016 Kevin Kofler - 5.7.0-1 - Update to 5.7.0 - Update version numbers of bundled stuff - Update system libvpx/libwebp version requirements (now F24+ only) - Drop no-format patch, fixed upstream (they stopped passing -Wno-format) - Rebase linux-pri patch (use_system_protobuf is now a qmake flag) - Rebase system-nspr-prtime, system-icu-utf and no-sse2 patches +- Fix ARM NEON handling in webrtc gyp files (honor arm_neon=0) * Tue Jun 14 2016 Rex Dieter - 5.6.1-3 - rebuild (glibc) diff --git a/qtwebengine-opensource-src-5.7.0-webrtc-neon.patch b/qtwebengine-opensource-src-5.7.0-webrtc-neon.patch new file mode 100644 index 0000000..33e0df9 --- /dev/null +++ b/qtwebengine-opensource-src-5.7.0-webrtc-neon.patch @@ -0,0 +1,21 @@ +diff -ur qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/webrtc/modules/video_processing/video_processing.gypi qtwebengine-opensource-src-5.7.0-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/video_processing/video_processing.gypi +--- qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/webrtc/modules/video_processing/video_processing.gypi 2016-05-26 15:53:47.000000000 +0200 ++++ qtwebengine-opensource-src-5.7.0-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/video_processing/video_processing.gypi 2016-07-18 14:29:24.841980563 +0200 +@@ -47,7 +47,7 @@ + ['target_arch=="ia32" or target_arch=="x64"', { + 'dependencies': [ 'video_processing_sse2', ], + }], +- ['target_arch=="arm" or target_arch == "arm64"', { ++ ['build_with_neon==1', { + 'dependencies': [ 'video_processing_neon', ], + }], + ], +@@ -77,7 +77,7 @@ + }, + ], + }], +- ['target_arch=="arm" or target_arch == "arm64"', { ++ ['build_with_neon==1', { + 'targets': [ + { + 'target_name': 'video_processing_neon',