experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #38407 from tensorflow/mm-cherrypick-libjpeg-turbo-on-r2.0

Browse Source 
Cherrypick libjpeg-turbo version update
This commit is contained in:
Mihai Maruseac 2020-05-10 17:03:40 +00:00 committed by GitHub
commit b64d5ed6ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
third_party/jpeg/BUILD.bazel vendored
View File

@ -524,30 +524,30 @@ JCONFIG_NOWIN_COMMON_SUBSTITUTIONS = {
"@JPEG_LIB_VERSION@": "62",
"@VERSION@": "2.0.0",
"@LIBJPEG_TURBO_VERSION_NUMBER@": "2000000",
"#cmakedefine C_ARITH_CODING_SUPPORTED": "#define C_ARITH_CODING_SUPPORTED",
"#cmakedefine D_ARITH_CODING_SUPPORTED": "#define D_ARITH_CODING_SUPPORTED",
"#cmakedefine MEM_SRCDST_SUPPORTED": "#define MEM_SRCDST_SUPPORTED",
"#cmakedefine C_ARITH_CODING_SUPPORTED 1": "#define C_ARITH_CODING_SUPPORTED 1",
"#cmakedefine D_ARITH_CODING_SUPPORTED 1": "#define D_ARITH_CODING_SUPPORTED 1",
"#cmakedefine MEM_SRCDST_SUPPORTED 1": "#define MEM_SRCDST_SUPPORTED 1",
"@BITS_IN_JSAMPLE@": "8",
"#cmakedefine HAVE_LOCALE_H": "#define HAVE_LOCALE_H 1",
"#cmakedefine HAVE_STDDEF_H": "#define HAVE_STDDEF_H 1",
"#cmakedefine HAVE_STDLIB_H": "#define HAVE_STDLIB_H 1",
"#cmakedefine NEED_SYS_TYPES_H": "#define NEED_SYS_TYPES_H",
"#cmakedefine NEED_BSD_STRINGS": "",
"#cmakedefine HAVE_UNSIGNED_CHAR": "#define HAVE_UNSIGNED_CHAR 1",
"#cmakedefine HAVE_UNSIGNED_SHORT": "#define HAVE_UNSIGNED_SHORT 1",
"#cmakedefine INCOMPLETE_TYPES_BROKEN": "",
"#cmakedefine RIGHT_SHIFT_IS_UNSIGNED": "",
"#cmakedefine __CHAR_UNSIGNED__": "",
"#cmakedefine HAVE_LOCALE_H 1": "#define HAVE_LOCALE_H 1",
"#cmakedefine HAVE_STDDEF_H 1": "#define HAVE_STDDEF_H 1",
"#cmakedefine HAVE_STDLIB_H 1": "#define HAVE_STDLIB_H 1",
"#cmakedefine NEED_SYS_TYPES_H 1": "#define NEED_SYS_TYPES_H 1",
"#cmakedefine NEED_BSD_STRINGS 1": "",
"#cmakedefine HAVE_UNSIGNED_CHAR 1": "#define HAVE_UNSIGNED_CHAR 1",
"#cmakedefine HAVE_UNSIGNED_SHORT 1": "#define HAVE_UNSIGNED_SHORT 1",
"#cmakedefine INCOMPLETE_TYPES_BROKEN 1": "",
"#cmakedefine RIGHT_SHIFT_IS_UNSIGNED 1": "",
"#cmakedefine __CHAR_UNSIGNED__ 1": "",
"#undef const": "",
"#undef size_t": "",
}
JCONFIG_NOWIN_SIMD_SUBSTITUTIONS = {
"#cmakedefine WITH_SIMD": "#define WITH_SIMD",
"#cmakedefine WITH_SIMD 1": "#define WITH_SIMD 1",
}
JCONFIG_NOWIN_NOSIMD_SUBSTITUTIONS = {
"#cmakedefine WITH_SIMD": "",
"#cmakedefine WITH_SIMD 1": "",
}
JCONFIG_NOWIN_SIMD_SUBSTITUTIONS.update(JCONFIG_NOWIN_COMMON_SUBSTITUTIONS)

8
third_party/jpeg/workspace.bzl vendored
View File

@ -6,11 +6,11 @@ def repo():
third_party_http_archive(
name = "jpeg",
urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.0.tar.gz",
"https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.0.tar.gz",
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.4.tar.gz",
"https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.4.tar.gz",
],
sha256 = "f892fff427ab3adffc289363eac26d197ce3ccacefe5f5822377348a8166069b",
strip_prefix = "libjpeg-turbo-2.0.0",
sha256 = "7777c3c19762940cff42b3ba4d7cd5c52d1671b39a79532050c85efb99079064",
strip_prefix = "libjpeg-turbo-2.0.4",
build_file = "//third_party/jpeg:BUILD.bazel",
system_build_file = "//third_party/jpeg:BUILD.system",
)