diff --git a/tensorflow/contrib/cmake/external/png.cmake b/tensorflow/contrib/cmake/external/png.cmake index 174f7d1d47f..c102b327dce 100644 --- a/tensorflow/contrib/cmake/external/png.cmake +++ b/tensorflow/contrib/cmake/external/png.cmake @@ -16,8 +16,8 @@ include (ExternalProject) include (GNUInstallDirs) set(png_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/png_archive) -set(png_URL https://mirror.bazel.build/github.com/glennrp/libpng/archive/v1.6.35.tar.gz) -set(png_HASH SHA256=6d59d6a154ccbb772ec11772cb8f8beb0d382b61e7ccc62435bf7311c9f4b210) +set(png_URL https://mirror.bazel.build/github.com/glennrp/libpng/archive/v1.6.37.tar.gz) +set(png_HASH SHA256=ca74a0dace179a8422187671aee97dd3892b53e168627145271cad5b5ac81307) set(png_BUILD ${CMAKE_BINARY_DIR}/png/src/png) set(png_INSTALL ${CMAKE_BINARY_DIR}/png/install) diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 28132dcf757..caf48eb1c99 100755 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -241,12 +241,12 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): name = "png_archive", build_file = clean_dep("//third_party:png.BUILD"), patch_file = clean_dep("//third_party:png_fix_rpi.patch"), - sha256 = "6d59d6a154ccbb772ec11772cb8f8beb0d382b61e7ccc62435bf7311c9f4b210", - strip_prefix = "libpng-1.6.35", + sha256 = "ca74a0dace179a8422187671aee97dd3892b53e168627145271cad5b5ac81307", + strip_prefix = "libpng-1.6.37", system_build_file = clean_dep("//third_party/systemlibs:png.BUILD"), urls = [ - "http://mirror.tensorflow.org/github.com/glennrp/libpng/archive/v1.6.35.tar.gz", - "https://github.com/glennrp/libpng/archive/v1.6.35.tar.gz", + "http://mirror.tensorflow.org/github.com/glennrp/libpng/archive/v1.6.37.tar.gz", + "https://github.com/glennrp/libpng/archive/v1.6.37.tar.gz", ], ) diff --git a/third_party/png_fix_rpi.patch b/third_party/png_fix_rpi.patch index 80da7b3c064..e07eb2f6c1b 100644 --- a/third_party/png_fix_rpi.patch +++ b/third_party/png_fix_rpi.patch @@ -1,7 +1,7 @@ -diff -r -u /tmp/libpng-1.6.34/scripts/pnglibconf.h.prebuilt ./scripts/pnglibconf.h.prebuilt ---- /tmp/libpng-1.6.34/scripts/pnglibconf.h.prebuilt 2017-09-29 01:42:33.000000000 -0700 -+++ ./scripts/pnglibconf.h.prebuilt 2018-05-01 09:51:24.719318242 -0700 -@@ -20,6 +20,12 @@ +diff -r -u /tmp/libpng-1.6.37/scripts/pnglibconf.h.prebuilt ./scripts/pnglibconf.h.prebuilt +--- /tmp/libpng-1.6.37/scripts/pnglibconf.h.prebuilt 2019-04-14 11:10:32.000000000 -0700 ++++ ./scripts/pnglibconf.h.prebuilt 2019-05-21 09:40:52.138528512 -0700 +@@ -19,6 +19,12 @@ #define PNG_ALIGNED_MEMORY_SUPPORTED /*#undef PNG_ARM_NEON_API_SUPPORTED*/ /*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/ @@ -11,6 +11,6 @@ diff -r -u /tmp/libpng-1.6.34/scripts/pnglibconf.h.prebuilt ./scripts/pnglibconf +#define PNG_ARM_NEON_OPT 0 + + - /*#undef PNG_POWERPC_VSX_API_SUPPORTED*/ - /*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/ #define PNG_BENIGN_ERRORS_SUPPORTED + #define PNG_BENIGN_READ_ERRORS_SUPPORTED + /*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/