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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/libjpeg-turbo.gyp

Issue 1468073002: Revert of Switch Skia's libjpeg-turbo to 1.4.2 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/libjpeg-turbo.gyp
diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp
index 407fccaff018ca1d478c4b08b9d79f93fa5a1ec0..7ef744ff8b49692258b5597ce1d5d7a0c85ad1c4 100644
--- a/gyp/libjpeg-turbo.gyp
+++ b/gyp/libjpeg-turbo.gyp
@@ -102,6 +102,7 @@
'../third_party/externals/libjpeg-turbo/jmorecfg.h',
'../third_party/externals/libjpeg-turbo/jpegint.h',
'../third_party/externals/libjpeg-turbo/jpeglib.h',
+ '../third_party/externals/libjpeg-turbo/jpeglibmangler.h',
'../third_party/externals/libjpeg-turbo/jquant1.c',
'../third_party/externals/libjpeg-turbo/jquant2.c',
'../third_party/externals/libjpeg-turbo/jutils.c',
@@ -129,59 +130,59 @@
[ 'skia_arch_type == "x86" and (skia_os != "android" or host_os == "linux")', {
'sources': [
'../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c',
- '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdmerge-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdsample-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctflt-3dn.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctfst-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctint-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-3dn.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctfst-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctint-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctred-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jccolmmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jccolss2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcgrammx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcgrass2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcqnt3dn.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcqntmmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcqnts2f.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcqnts2i.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcqntsse.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcsammmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcsamss2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdcolmmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdcolss2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdmermmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdmerss2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdsammmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdsamss2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jf3dnflt.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfmmxfst.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfmmxint.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfss2fst.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfss2int.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfsseflt.asm',
+ '../third_party/externals/libjpeg-turbo/simd/ji3dnflt.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jimmxfst.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jimmxint.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jimmxred.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jiss2flt.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jiss2fst.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jiss2int.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jiss2red.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jisseflt.asm',
'../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm',
],
}],
[ 'skia_arch_type == "x86_64" and (skia_os != "android" or host_os == "linux")', {
'sources': [
'../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c',
- '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jccolss2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcgrass2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcqnts2f-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcqnts2i-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcsamss2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdcolss2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdmerss2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdsamss2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfss2fst-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfss2int-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfsseflt-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jiss2flt-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jiss2fst-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jiss2int-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jiss2red-64.asm',
],
}],
[ 'skia_arch_type == "arm64"', {
@@ -220,9 +221,6 @@
'dependencies': [
'yasm-win',
],
- 'defines': [
- 'TURBO_FOR_WINDOWS',
- ],
'variables': {
'yasm_path': '<(PRODUCT_DIR)/yasm.exe',
'conditions': [
@@ -232,6 +230,7 @@
'-D__x86__',
'-DWIN32',
'-DMSVC',
+ '-I../third_party/externals/libjpeg-turbo/win/'
],
}, {
'yasm_format': '-fwin64',
@@ -239,6 +238,7 @@
'-D__x86_64__',
'-DWIN64',
'-DMSVC',
+ '-I../third_party/externals/libjpeg-turbo/win/'
],
}],
],
@@ -257,12 +257,14 @@
'yasm_flags': [
'-D__x86__',
'-DELF',
+ '-I../third_party/externals/libjpeg-turbo/linux/'
],
}, {
'yasm_format': '-felf64',
'yasm_flags': [
'-D__x86_64__',
'-DELF',
+ '-I../third_party/externals/libjpeg-turbo/linux/'
],
}],
],
@@ -281,12 +283,14 @@
'yasm_flags': [
'-D__x86__',
'-DMACHO',
+ '-I../third_party/externals/libjpeg-turbo/mac/'
],
}, {
'yasm_format': '-fmacho64',
'yasm_flags': [
'-D__x86_64__',
'-DMACHO',
+ '-I../third_party/externals/libjpeg-turbo/mac/'
],
}],
],
@@ -305,12 +309,14 @@
'yasm_flags': [
'-D__x86__',
'-DELF',
+ '-I../third_party/externals/libjpeg-turbo/linux/'
],
}, {
'yasm_format': '-felf64',
'yasm_flags': [
'-D__x86_64__',
'-DELF',
+ '-I../third_party/externals/libjpeg-turbo/linux/'
],
}],
],
@@ -334,7 +340,6 @@
'<@(yasm_flags)',
'-DRGBX_FILLER_0XFF',
'-DSTRICT_MEMORY_ACCESS',
- '-Isimd/',
'-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix)',
'<(RULE_INPUT_PATH)',
],
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698