corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1951376 - adapt 00_fix_build_errors.patch;r=chunmin

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D242260
This commit is contained in:
Nico Grunbaum
2025-04-10 03:10:59 +00:00
parent 67af658841
commit 35b53fa890
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
media/libyuv/00_fix_build_errors.patch
View File

@@ -1,27 +1,23 @@
diff --git a/include/libyuv/row.h b/include/libyuv/row.h diff --git a/include/libyuv/row.h b/include/libyuv/row.h
--- a/include/libyuv/row.h --- a/include/libyuv/row.h
+++ b/include/libyuv/row.h +++ b/include/libyuv/row.h
@@ -176,8 +176,9 @@ extern "C" { @@ -116,7 +116,8 @@ extern "C" {
// The following functions fail on gcc/clang 32 bit with fpic and framepointer. // The following functions fail on gcc/clang 32 bit with fpic and framepointer.
// caveat: clangcl uses row_win.cc which works. // caveat: clangcl uses row_win.cc which works.
-#if defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \ -#if (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
- defined(_MSC_VER)
+#if !defined(MOZ_PROFILING) && \ +#if !defined(MOZ_PROFILING) && \
+ (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \ + (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
+ defined(_MSC_VER)) defined(_MSC_VER)) && \
!defined(LIBYUV_ENABLE_ROWWIN)
// TODO(fbarchard): fix build error on android_full_debug=1 // TODO(fbarchard): fix build error on android_full_debug=1
// https://code.google.com/p/libyuv/issues/detail?id=517 @@ -124,7 +125,8 @@ extern "C" {
#define HAS_I422ALPHATOARGBROW_SSSE3 #define HAS_I422ALPHATOARGBROW_SSSE3
@@ -246,8 +247,9 @@ extern "C" { #define HAS_I444ALPHATOARGBROW_SSSE3
#define HAS_ARGBATTENUATEROW_AVX2
#endif #endif
-#if (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
-#if defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
- defined(_MSC_VER)
+#if !defined(MOZ_PROFILING) && \ +#if !defined(MOZ_PROFILING) && \
+ (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \ + (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
+ defined(_MSC_VER)) defined(_MSC_VER)) && \
// TODO(fbarchard): fix build error on android_full_debug=1 !defined(LIBYUV_ENABLE_ROWWIN)
// https://code.google.com/p/libyuv/issues/detail?id=517 // TODO(fbarchard): fix build error on android_full_debug=1
#define HAS_I422ALPHATOARGBROW_AVX2

6
media/libyuv/libyuv/include/libyuv/row.h
View File

@@ -116,7 +116,8 @@ extern "C" {
// The following functions fail on gcc/clang 32 bit with fpic and framepointer. // The following functions fail on gcc/clang 32 bit with fpic and framepointer.
// caveat: clangcl uses row_win.cc which works. // caveat: clangcl uses row_win.cc which works.
#if (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \ #if !defined(MOZ_PROFILING) && \
(defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
defined(_MSC_VER)) && \ defined(_MSC_VER)) && \
!defined(LIBYUV_ENABLE_ROWWIN) !defined(LIBYUV_ENABLE_ROWWIN)
// TODO(fbarchard): fix build error on android_full_debug=1 // TODO(fbarchard): fix build error on android_full_debug=1
@@ -124,7 +125,8 @@ extern "C" {
#define HAS_I422ALPHATOARGBROW_SSSE3 #define HAS_I422ALPHATOARGBROW_SSSE3
#define HAS_I444ALPHATOARGBROW_SSSE3 #define HAS_I444ALPHATOARGBROW_SSSE3
#endif #endif
#if (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \ #if !defined(MOZ_PROFILING) && \
(defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
defined(_MSC_VER)) && \ defined(_MSC_VER)) && \
!defined(LIBYUV_ENABLE_ROWWIN) !defined(LIBYUV_ENABLE_ROWWIN)
// TODO(fbarchard): fix build error on android_full_debug=1 // TODO(fbarchard): fix build error on android_full_debug=1