зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1776141 - P1 - update patch files to work with updatebots -p1 path requirement;r=mjf
Depends on D150726 Differential Revision: https://phabricator.services.mozilla.com/D150727
This commit is contained in:
Родитель
cd888262a7
Коммит
fb976153d8
|
@ -1,37 +1,22 @@
|
|||
# HG changeset patch
|
||||
# User Randell Jesup <rjesup@jesup.org>
|
||||
# Parent 260ab5c93e30a3d90f10ac30a15edf36fb0f03e9
|
||||
|
||||
diff --git a/media/libyuv/libyuv/include/libyuv/row.h b/media/libyuv/libyuv/include/libyuv/row.h
|
||||
--- a/media/libyuv/libyuv/include/libyuv/row.h
|
||||
+++ b/media/libyuv/libyuv/include/libyuv/row.h
|
||||
@@ -174,19 +174,20 @@ extern "C" {
|
||||
#define HAS_SOBELROW_SSE2
|
||||
#define HAS_SOBELTOPLANEROW_SSE2
|
||||
#define HAS_SOBELXROW_SSE2
|
||||
#define HAS_SOBELXYROW_SSE2
|
||||
#define HAS_SOBELYROW_SSE2
|
||||
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
|
||||
--- a/include/libyuv/row.h
|
||||
+++ b/include/libyuv/row.h
|
||||
@@ -176,8 +176,9 @@ extern "C" {
|
||||
|
||||
// The following functions fail on gcc/clang 32 bit with fpic and framepointer.
|
||||
// caveat: clangcl uses row_win.cc which works.
|
||||
-#if defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
|
||||
- defined(_MSC_VER)
|
||||
+#if !defined(MOZ_PROFILING) && \
|
||||
+ (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
|
||||
+ defined(_MSC_VER))
|
||||
+ (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
|
||||
+ defined(_MSC_VER))
|
||||
// TODO(fbarchard): fix build error on android_full_debug=1
|
||||
// https://code.google.com/p/libyuv/issues/detail?id=517
|
||||
#define HAS_I422ALPHATOARGBROW_SSSE3
|
||||
#define HAS_I444ALPHATOARGBROW_SSSE3
|
||||
#endif
|
||||
@@ -246,8 +247,9 @@ extern "C" {
|
||||
#define HAS_ARGBATTENUATEROW_AVX2
|
||||
#endif
|
||||
|
||||
// The following are available on all x86 platforms, but
|
||||
// require VS2012, clang 3.4 or gcc 4.7.
|
||||
@@ -248,8 +249,9 @@ extern "C" {
|
||||
#define HAS_ARGBUNATTENUATEROW_AVX2
|
||||
#define HAS_BLENDPLANEROW_AVX2
|
||||
|
||||
-#if defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
|
||||
- defined(_MSC_VER)
|
||||
+#if !defined(MOZ_PROFILING) && \
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
# User Randell Jesup <rjesup@jesup.org>
|
||||
# Parent 5d4d728adccff4539e44f697b8011fb2eb1a1ad5
|
||||
|
||||
diff --git a/media/libyuv/libyuv/source/mjpeg_decoder.cc b/media/libyuv/libyuv/source/mjpeg_decoder.cc
|
||||
--- a/media/libyuv/libyuv/source/mjpeg_decoder.cc
|
||||
+++ b/media/libyuv/libyuv/source/mjpeg_decoder.cc
|
||||
diff --git a/source/mjpeg_decoder.cc b/source/mjpeg_decoder.cc
|
||||
--- a/source/mjpeg_decoder.cc
|
||||
+++ b/source/mjpeg_decoder.cc
|
||||
@@ -73,18 +73,20 @@ MJpegDecoder::MJpegDecoder()
|
||||
databuf_strides_(NULL) {
|
||||
decompress_struct_ = new jpeg_decompress_struct;
|
||||
|
|
|
@ -56,7 +56,7 @@ def apply_patches(base):
|
|||
for patch in patches:
|
||||
print('\nApplying patch %s' % patch)
|
||||
with open(os.path.join(base, patch)) as f:
|
||||
Popen(["patch", "-p3"], stdin=f, cwd=base).wait()
|
||||
Popen(["patch", "-p1"], stdin=f, cwd=os.path.join(base, 'libyuv')).wait()
|
||||
|
||||
|
||||
def update_moz_yaml(base, commit, commitdate):
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
# Parent 034c99a4c2010c8d60ff52daf0a183ac1fd05777
|
||||
Bug 1341543: Update libyuv gyp file with mozilla changes r=sotaro
|
||||
|
||||
diff --git a/media/libyuv/libyuv/libyuv.gyp b/media/libyuv/libyuv/libyuv.gyp
|
||||
--- a/media/libyuv/libyuv/libyuv.gyp
|
||||
+++ b/media/libyuv/libyuv/libyuv.gyp
|
||||
diff --git a/libyuv.gyp b/libyuv.gyp
|
||||
--- a/libyuv.gyp
|
||||
+++ b/libyuv.gyp
|
||||
@@ -47,17 +47,17 @@
|
||||
{
|
||||
'target_name': 'libyuv',
|
||||
|
|
Загрузка…
Ссылка в новой задаче