aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2016-05-17 09:31:04 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-17 09:31:04 -0700
commit8fe89ab9b2c0089451d373c9ea76245fc8ef5a45 (patch)
tree78b49af411c82ccb1960a3f3fc5adaa33704573b
parentb1be46b1d938c21eafa7ded5560bcc10b71cd471 (diff)
Update libpng to 1.6.22rc01
If there are no issues, this version will be released May 26. Let's start testing with it, so we are ready to update Chrome when it is available. BUG=skia:4710 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1983853002 Review-Url: https://codereview.chromium.org/1983853002
-rw-r--r--DEPS3
-rw-r--r--third_party/libpng/README.google12
2 files changed, 10 insertions, 5 deletions
diff --git a/DEPS b/DEPS
index 8015846567..a8a11e7d5c 100644
--- a/DEPS
+++ b/DEPS
@@ -18,7 +18,8 @@ deps = {
"third_party/externals/nanomsg" : "https://skia.googlesource.com/third_party/nanomsg.git@0.4-beta",
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@c4e33043fb071b6ea0a153845da625d7ed633d3d",
# NOTE: If we update libpng, we may need to update the generated file at third_party/libpng/pnglibconf.h
- "third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@5765a2224946b953ec6702bd01205af475f8c80a",
+ # skbug.com/4710: We'd prefer to mirror AOSP or Chrome.
+ "third_party/externals/libpng" : "https://github.com/mattsarett/libpng.git@91d2a9e56ea83f7bce091b1606ae4d04ddfc547a",
"third_party/externals/giflib" : "https://android.googlesource.com/platform/external/giflib.git@ab10e256df4f684260ca239905b1cec727181f6c",
"third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae",
diff --git a/third_party/libpng/README.google b/third_party/libpng/README.google
index c40482c43e..3ca42b0378 100644
--- a/third_party/libpng/README.google
+++ b/third_party/libpng/README.google
@@ -3,11 +3,15 @@ Version: 1.6.16
License: libpng license
License File: LICENSE, pulled out of png.h
Description: png compression/decompression library
-Local Modifications: (1) Created pnglibconf.h from pnglibconf.h.prebuilt (a
- rename with a few additional settings enabled). (2) Copied LICENSE into
- this directory. (Originally it was pulled from png.h, but libpng has
- now provided a separate LICENSE file for convenience, which we use
+Local Modifications:
+ (1) Created pnglibconf.h from pnglibconf.h.prebuilt (a
+ rename with a few additional settings enabled).
+ (2) Copied LICENSE into this directory. (Originally it
+ was pulled from png.h, but libpng has now provided a
+ separate LICENSE file for convenience, which we use
directly.)
+ (3) Included Intel optimizations by running:
+ "patch -i contrib/intel/intel_sse.patch -p1"
FAQ:
Q: Why does this directory exist?