Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ports/libyuv/nacl.patch

Issue 1729913003: Update libyuv port (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ports/libyuv/build.sh ('k') | ports/libyuv/pkg_info » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/CMakeLists.txt b/CMakeLists.txt 1 diff --git a/include/libyuv/compare_row.h b/include/libyuv/compare_row.h
2 --- a/CMakeLists.txt 2 --- a/include/libyuv/compare_row.h
3 +++ b/CMakeLists.txt 3 +++ b/include/libyuv/compare_row.h
4 @@ -102,12 +102,13 @@ endif() 4 @@ -18,8 +18,8 @@ namespace libyuv {
5 if(TEST) 5 extern "C" {
6 find_library(GTEST_LIBRARY gtest) 6 #endif
7 if(GTEST_LIBRARY STREQUAL "GTEST_LIBRARY-NOTFOUND") 7
8 - set(GTEST_SRC_DIR /usr/src/gtest) 8 -#if defined(__pnacl__) || defined(__CLR_VER) || \
9 + set(GTEST_SRC_DIR /usr/src/gtest CACHE STRING "Location of gtest sources") 9 - (defined(__i386__) && !defined(__SSE2__))
10 if(EXISTS ${GTEST_SRC_DIR}/src/gtest-all.cc) 10 +#if defined(__CLR_VER) || (defined(__i386__) && !defined(__SSE2__)) || \
11 message(STATUS "building gtest from sources in ${GTEST_SRC_DIR}") 11 + (defined(__native_client__) && defined(__x86_64__))
12 set(gtest_sources ${GTEST_SRC_DIR}/src/gtest-all.cc) 12 #define LIBYUV_DISABLE_X86
13 add_library(gtest STATIC ${gtest_sources}) 13 #endif
14 include_directories(${GTEST_SRC_DIR}) 14
15 + include_directories(${GTEST_SRC_DIR}/include) 15 diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions .h
16 set(GTEST_LIBRARY gtest) 16 --- a/include/libyuv/planar_functions.h
17 else() 17 +++ b/include/libyuv/planar_functions.h
18 message(FATAL_ERROR "TEST is set but unable to find gtest library") 18 @@ -443,8 +443,8 @@ int I420Interpolate(const uint8* src0_y, int src0_stride_y,
19 uint8* dst_v, int dst_stride_v,
20 int width, int height, int interpolation);
21
22 -#if defined(__pnacl__) || defined(__CLR_VER) || \
23 - (defined(__i386__) && !defined(__SSE2__))
24 +#if defined(__CLR_VER) || (defined(__i386__) && !defined(__SSE2__)) || \
25 + (defined(__native_client__) && defined(__x86_64__))
26 #define LIBYUV_DISABLE_X86
27 #endif
28 // The following are available on all x86 platforms:
29 diff --git a/include/libyuv/rotate_row.h b/include/libyuv/rotate_row.h
30 --- a/include/libyuv/rotate_row.h
31 +++ b/include/libyuv/rotate_row.h
32 @@ -18,8 +18,8 @@ namespace libyuv {
33 extern "C" {
34 #endif
35
36 -#if defined(__pnacl__) || defined(__CLR_VER) || \
37 - (defined(__i386__) && !defined(__SSE2__))
38 +#if defined(__CLR_VER) || (defined(__i386__) && !defined(__SSE2__)) || \
39 + (defined(__native_client__) && defined(__x86_64__))
40 #define LIBYUV_DISABLE_X86
41 #endif
42
43 diff --git a/include/libyuv/row.h b/include/libyuv/row.h
44 --- a/include/libyuv/row.h
45 +++ b/include/libyuv/row.h
46 @@ -37,8 +37,8 @@ extern "C" {
47 free(var##_mem); \
48 var = 0
49
50 -#if defined(__pnacl__) || defined(__CLR_VER) || \
51 - (defined(__i386__) && !defined(__SSE2__))
52 +#if defined(__CLR_VER) || (defined(__i386__) && !defined(__SSE2__)) || \
53 + (defined(__native_client__) && defined(__x86_64__))
54 #define LIBYUV_DISABLE_X86
55 #endif
56 // True if compiling for SSSE3 as a requirement.
57 @@ -173,8 +173,8 @@ extern "C" {
58
59 // The following functions fail on gcc/clang 32 bit with fpic and framepointer.
60 // caveat: clangcl uses row_win.cc which works.
61 -#if defined(NDEBUG) || !(defined(_DEBUG) && defined(__i386__)) || \
62 - !defined(__i386__) || defined(_MSC_VER)
63 +#if (defined(NDEBUG) || !(defined(_DEBUG) && defined(__i386__)) || \
64 + !defined(__i386__) || defined(_MSC_VER)) && !defined(__native_client__)
65 // TODO(fbarchard): fix build error on x86 debug
66 // https://code.google.com/p/libyuv/issues/detail?id=524
67 #define HAS_I411TOARGBROW_SSSE3
68 @@ -201,7 +201,7 @@ extern "C" {
69 #define HAS_COPYROW_AVX
70 #define HAS_H422TOARGBROW_AVX2
71 #define HAS_I400TOARGBROW_AVX2
72 -#if !(defined(_DEBUG) && defined(__i386__))
73 +#if !(defined(_DEBUG) && defined(__i386__)) && !defined(__native_client__)
74 // TODO(fbarchard): fix build error on android_full_debug=1
75 // https://code.google.com/p/libyuv/issues/detail?id=517
76 #define HAS_I422ALPHATOARGBROW_AVX2
77 @@ -255,7 +255,7 @@ extern "C" {
78
79 // The following are also available on x64 Visual C.
80 #if !defined(LIBYUV_DISABLE_X86) && defined (_M_X64) && \
81 - (!defined(__clang__) || defined(__SSSE3__))
82 + (!defined(__clang__) || defined(__SSSE3__)) && !defined(__native_client__)
83 #define HAS_I422ALPHATOARGBROW_SSSE3
84 #define HAS_I422TOARGBROW_SSSE3
85 #endif
86 diff --git a/include/libyuv/scale_row.h b/include/libyuv/scale_row.h
87 --- a/include/libyuv/scale_row.h
88 +++ b/include/libyuv/scale_row.h
89 @@ -19,8 +19,8 @@ namespace libyuv {
90 extern "C" {
91 #endif
92
93 -#if defined(__pnacl__) || defined(__CLR_VER) || \
94 - (defined(__i386__) && !defined(__SSE2__))
95 +#if defined(__CLR_VER) || (defined(__i386__) && !defined(__SSE2__)) || \
96 + (defined(__native_client__) && defined(__x86_64__))
97 #define LIBYUV_DISABLE_X86
98 #endif
99
OLDNEW
« no previous file with comments | « ports/libyuv/build.sh ('k') | ports/libyuv/pkg_info » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698