diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-11-08 14:58:12 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-11-08 14:58:12 +0800 |
| commit | 5fd7931f657e7dc09c918884823a6157bb1b9f81 (patch) | |
| tree | f7e0f1b09fb23dc7eff1615e9818a33090f1964c /mail | |
| parent | 02a65e0672451ebaa17e9ef2c8e0e786ff0d631a (diff) | |
| download | freebsd-ports-gnome-5fd7931f657e7dc09c918884823a6157bb1b9f81.tar.gz freebsd-ports-gnome-5fd7931f657e7dc09c918884823a6157bb1b9f81.tar.zst freebsd-ports-gnome-5fd7931f657e7dc09c918884823a6157bb1b9f81.zip | |
gecko: sync libyuv fix with upstream version
MFH: 2017Q4 (r453437 + r453446 followup)
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/thunderbird/files/patch-bug1414440 | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/mail/thunderbird/files/patch-bug1414440 b/mail/thunderbird/files/patch-bug1414440 index fcb9e74b2823..f3d8e52056ee 100644 --- a/mail/thunderbird/files/patch-bug1414440 +++ b/mail/thunderbird/files/patch-bug1414440 @@ -1,7 +1,7 @@ Always build libyuv x86 optimizations with Clang. diff --git media/libyuv/include/libyuv/compare_row.h media/libyuv/include/libyuv/compare_row.h -index 7abc2d4aef8f..fcf942c660a2 100644 +index 38a957b2ce33..59ec4b30c238 100644 --- mozilla/media/libyuv/include/libyuv/compare_row.h +++ mozilla/media/libyuv/include/libyuv/compare_row.h @@ -19,7 +19,7 @@ extern "C" { @@ -9,25 +9,25 @@ index 7abc2d4aef8f..fcf942c660a2 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/planar_functions.h media/libyuv/include/libyuv/planar_functions.h -index 040839c211b1..e99cb47d472f 100644 +index 881b0c5c6473..491c022bfe8f 100644 --- mozilla/media/libyuv/include/libyuv/planar_functions.h +++ mozilla/media/libyuv/include/libyuv/planar_functions.h -@@ -720,7 +720,7 @@ int I420Interpolate(const uint8* src0_y, - int interpolation); +@@ -450,7 +450,7 @@ int I420Interpolate(const uint8* src0_y, int src0_stride_y, + int width, int height, int interpolation); #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/rotate_row.h media/libyuv/include/libyuv/rotate_row.h -index 2c51584eee8b..762ca4ba3ab9 100644 +index ebc487f9abf4..59fbd10b573c 100644 --- mozilla/media/libyuv/include/libyuv/rotate_row.h +++ mozilla/media/libyuv/include/libyuv/rotate_row.h @@ -19,7 +19,7 @@ extern "C" { @@ -35,25 +35,25 @@ index 2c51584eee8b..762ca4ba3ab9 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/row.h media/libyuv/include/libyuv/row.h -index f74bd9f7d17a..b52d6d1fcee0 100644 +index 069d73bd3f2e..3616ecd81c3d 100644 --- mozilla/media/libyuv/include/libyuv/row.h +++ mozilla/media/libyuv/include/libyuv/row.h -@@ -31,7 +31,7 @@ extern "C" { +@@ -38,7 +38,7 @@ extern "C" { var = 0 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/scale_row.h media/libyuv/include/libyuv/scale_row.h -index edb46cc8c647..59017260b16d 100644 +index df699e6c2282..242f025b1e6e 100644 --- mozilla/media/libyuv/include/libyuv/scale_row.h +++ mozilla/media/libyuv/include/libyuv/scale_row.h @@ -20,7 +20,7 @@ extern "C" { @@ -61,7 +61,17 @@ index edb46cc8c647..59017260b16d 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/linux.mk media/libyuv/linux.mk +index ee5a3a70705a..c1a45173c9ab 100644 +--- mozilla/media/libyuv/linux.mk ++++ mozilla/media/libyuv/linux.mk +@@ -78,4 +78,4 @@ cpuid: util/cpuid.c libyuv.a + $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a + + clean: +- /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr ++ /bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr |