Check libpng directly into third_party/

Check libpng directly into third_party/

With this change, the CMake build, which does not use DEPS to sync
external projects, is able to build and use the same version of libpng
that is used in other builds.

This will allow all platforms (including Google3 CMake build) to test on
the same version of libpng, so we do not need to make SkPngCodec support
all versions of libpng.

- Update CMakeLists.txt to use the checked in libpng.
- Check in libpng version 1.6.22rc01
- Update README.google
- Replace our old LICENSE file with the latest one from libpng
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2033063003
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Committed: https://skia.googlesource.com/skia/+/3965825b97a5809454f5810f7e603cbd02daa036

[scroggo, 2016-06-02 16:15:06]

scroggo@google.com changed reviewers:
+ halcanary@google.com, msarett@google.com, scroggo@google.com

[scroggo, 2016-06-02 16:15:10]

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt
File cmake/CMakeLists.txt (right):

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt#newcode38
cmake/CMakeLists.txt:38: list (APPEND private_includes ../third_party/libpng)
I know very little of CMake, and I'm still working on setting it up. Does this
look right? It is based on the code around it. I also skipped the intel
optimizations for now; do I need to set PNG_ARM_NEON_OPT?

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt#newcod...
cmake/CMakeLists.txt:197: add_definitions(-DPNG_SKIP_SETJMP_CHECK)
I did not see this or PNG_SKIP_SKIA_OPTS anywhere in libpng or Skia. (Actually,
this one is mentioned in a change-log, so I'm guessing it got removed.) Safe to
delete?

https://codereview.chromium.org/2033063003/diff/1/third_party/libpng/README.g...
File third_party/libpng/README.google (right):

https://codereview.chromium.org/2033063003/diff/1/third_party/libpng/README.g...
third_party/libpng/README.google:2: Version: 1.6.22rc01
Besides this file, the rest of the files in this directory were just copied
over.

[scroggo, 2016-06-02 16:16:01]

The CQ bit was checked by scroggo@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-02 16:16:08]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2033063003/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2033063003/1

[commit-bot: I haz the power, 2016-06-02 16:17:55]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-02 16:17:58]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)

[msarett, 2016-06-02 16:35:33]

I know that I've been against this in the past, but what do you think about
stripping the unneeded files?  There's a lot of unused stuff that we don't
necessarily need to check in.

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt
File cmake/CMakeLists.txt (right):

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt#newcode38
cmake/CMakeLists.txt:38: list (APPEND private_includes ../third_party/libpng)
On 2016/06/02 16:15:10, scroggo wrote:
> I know very little of CMake, and I'm still working on setting it up. Does this
> look right? It is based on the code around it. I also skipped the intel
> optimizations for now; do I need to set PNG_ARM_NEON_OPT?

Looks right, I think, though I haven't done too much with CMake either.

Looks like you're skipping arm and intel opts (arm opts are in a arm/
directory).  I think that's right thing to do right now.

You might actually want to set PNG_ARM_NEON_OPT to 0, so it doesn't try to
automatically detect arm support (and then fail when we fail to compile the
files).

If you have any issues setting up CMake, the trybots may be useful for testing.

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt#newcod...
cmake/CMakeLists.txt:197: add_definitions(-DPNG_SKIP_SETJMP_CHECK)
On 2016/06/02 16:15:10, scroggo wrote:
> I did not see this or PNG_SKIP_SKIA_OPTS anywhere in libpng or Skia.
(Actually,
> this one is mentioned in a change-log, so I'm guessing it got removed.) Safe
to
> delete?

I believe that they are both safe to delete.

nit: outdent this text

https://codereview.chromium.org/2033063003/diff/1/third_party/libpng/CMakeLis...
File third_party/libpng/CMakeLists.txt (right):

https://codereview.chromium.org/2033063003/diff/1/third_party/libpng/CMakeLis...
third_party/libpng/CMakeLists.txt:1: # CMakeLists.txt
Just noticing that this file exists...not sure it is at all useful to us, but I
guess it's an example of how to build libpng with CMake.

https://codereview.chromium.org/2033063003/diff/1/third_party/libpng/README.g...
File third_party/libpng/README.google (right):

https://codereview.chromium.org/2033063003/diff/1/third_party/libpng/README.g...
third_party/libpng/README.google:2: Version: 1.6.22rc01
On 2016/06/02 16:15:10, scroggo wrote:
> Besides this file, the rest of the files in this directory were just copied
> over.

Acknowledged.

[msarett, 2016-06-02 16:37:23]

I think you'll also need to update the Google3 build file public.bzl.

[scroggo_chromium, 2016-06-02 16:53:14]

Description was changed from

==========
Check libpng directly into third_party/

With this change, the CMake build, which does not use DEPS to sync
external projects, is able to build and use the same version of libpng
that is used in other builds.

This will allow all platforms (including Google3 CMake build) to test on
the same version of libpng, so we do not need to make SkPngCodec support
all versions of libpng.

- Update CMakeLists.txt to use the checked in libpng.
- Check in libpng version 1.6.22rc01
- Update README.google
- Replace our old LICENSE file with the latest one from libpng
==========

to

==========
Check libpng directly into third_party/

With this change, the CMake build, which does not use DEPS to sync
external projects, is able to build and use the same version of libpng
that is used in other builds.

This will allow all platforms (including Google3 CMake build) to test on
the same version of libpng, so we do not need to make SkPngCodec support
all versions of libpng.

- Update CMakeLists.txt to use the checked in libpng.
- Check in libpng version 1.6.22rc01
- Update README.google
- Replace our old LICENSE file with the latest one from libpng
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2033063003
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
==========

[scroggo, 2016-06-02 17:01:23]

The CQ bit was checked by scroggo@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-02 17:01:30]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2033063003/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2033063003/20001

[scroggo, 2016-06-02 17:03:27]

On 2016/06/02 16:35:33, msarett wrote:
> I know that I've been against this in the past, but what do you think about
> stripping the unneeded files?  There's a lot of unused stuff that we don't
> necessarily need to check in.

I'm still against it. That puts an extra burden on us when updating.

On 2016/06/02 16:37:23, msarett wrote:
> I think you'll also need to update the Google3 build file public.bzl.

Done. Is there a trybot for that?

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt
File cmake/CMakeLists.txt (right):

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt#newcode38
cmake/CMakeLists.txt:38: list (APPEND private_includes ../third_party/libpng)
On 2016/06/02 16:35:33, msarett wrote:
> On 2016/06/02 16:15:10, scroggo wrote:
> > I know very little of CMake, and I'm still working on setting it up. Does
this
> > look right? It is based on the code around it. I also skipped the intel
> > optimizations for now; do I need to set PNG_ARM_NEON_OPT?
> 
> Looks right, I think, though I haven't done too much with CMake either.
> 
> Looks like you're skipping arm and intel opts (arm opts are in a arm/
> directory).  I think that's right thing to do right now.
> 
> You might actually want to set PNG_ARM_NEON_OPT to 0, so it doesn't try to
> automatically detect arm support (and then fail when we fail to compile the
> files).

Done.

> 
> If you have any issues setting up CMake, the trybots may be useful for
testing.

Which trybot? I don't see one for CMake.

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt#newcod...
cmake/CMakeLists.txt:197: add_definitions(-DPNG_SKIP_SETJMP_CHECK)
On 2016/06/02 16:35:33, msarett wrote:
> On 2016/06/02 16:15:10, scroggo wrote:
> > I did not see this or PNG_SKIP_SKIA_OPTS anywhere in libpng or Skia.
> (Actually,
> > this one is mentioned in a change-log, so I'm guessing it got removed.) Safe
> to
> > delete?
> 
> I believe that they are both safe to delete.

Removed.

> 
> nit: outdent this text

Done.

[commit-bot: I haz the power, 2016-06-02 17:03:38]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-02 17:03:41]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot on client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU...)

[scroggo, 2016-06-02 17:06:01]

On 2016/06/02 17:03:27, scroggo wrote:
> On 2016/06/02 16:35:33, msarett wrote:
> > I know that I've been against this in the past, but what do you think about
> > stripping the unneeded files?  There's a lot of unused stuff that we don't
> > necessarily need to check in.
> 
> I'm still against it. That puts an extra burden on us when updating.

On the other hand, I think I'm running into problems applying the patch because
it's so large...

[msarett, 2016-06-02 17:10:36]

> > I think you'll also need to update the Google3 build file public.bzl.

> Done. Is there a trybot for that?

There are presubmit instructions here:
https://sites.google.com/a/google.com/skia-infrastructure/docs/google3-autoro...

I generally prefer committing and seeing if the bot turns red.

lgtm

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt
File cmake/CMakeLists.txt (right):

https://codereview.chromium.org/2033063003/diff/1/cmake/CMakeLists.txt#newcode38
cmake/CMakeLists.txt:38: list (APPEND private_includes ../third_party/libpng)
On 2016/06/02 17:03:27, scroggo wrote:
> On 2016/06/02 16:35:33, msarett wrote:
> > On 2016/06/02 16:15:10, scroggo wrote:
> > > I know very little of CMake, and I'm still working on setting it up. Does
> this
> > > look right? It is based on the code around it. I also skipped the intel
> > > optimizations for now; do I need to set PNG_ARM_NEON_OPT?
> > 
> > Looks right, I think, though I haven't done too much with CMake either.
> > 
> > Looks like you're skipping arm and intel opts (arm opts are in a arm/
> > directory).  I think that's right thing to do right now.
> > 
> > You might actually want to set PNG_ARM_NEON_OPT to 0, so it doesn't try to
> > automatically detect arm support (and then fail when we fail to compile the
> > files).
> 
> Done.
> 
> > 
> > If you have any issues setting up CMake, the trybots may be useful for
> testing.
> 
> Which trybot? I don't see one for CMake.

The CMake trybots actually run automatically in the commit queue when you modify
this file.  They are:
Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot
Build-Mac-Clang-x86_64-Release-Trybot

https://codereview.chromium.org/2033063003/diff/20001/public.bzl
File public.bzl (right):

https://codereview.chromium.org/2033063003/diff/20001/public.bzl#newcode84
public.bzl:84: "third_party/libpng/*.h",
Not sure, but you might possibly want to set PNG_ARM_NEON_OPT=0 in this file as
well.

[scroggo, 2016-06-02 19:07:36]

The CQ bit was checked by scroggo@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-02 19:07:44]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2033063003/30001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2033063003/30001

[commit-bot: I haz the power, 2016-06-02 19:10:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-02 19:10:16]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Build-Win-MSVC-x86-Debug-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Win-MSVC-x86-D...)
  Build-Win-MSVC-x86_64-Debug-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Win-MSVC-x86_6...)

[scroggo, 2016-06-02 19:38:53]

The CQ bit was checked by scroggo@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-02 19:39:03]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2033063003/50001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2033063003/50001

[commit-bot: I haz the power, 2016-06-02 19:55:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-02 19:55:50]

Dry run: This issue passed the CQ dry run.

[scroggo, 2016-06-02 19:58:53]

The CQ bit was checked by scroggo@google.com

[scroggo, 2016-06-02 19:58:54]

The patchset sent to the CQ was uploaded after l-g-t-m from msarett@google.com
Link to the patchset: https://codereview.chromium.org/2033063003/#ps50001
(title: "Trim more files")

[commit-bot: I haz the power, 2016-06-02 19:58:59]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2033063003/50001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2033063003/50001

[commit-bot: I haz the power, 2016-06-02 20:00:02]

Description was changed from

==========
Check libpng directly into third_party/

With this change, the CMake build, which does not use DEPS to sync
external projects, is able to build and use the same version of libpng
that is used in other builds.

This will allow all platforms (including Google3 CMake build) to test on
the same version of libpng, so we do not need to make SkPngCodec support
all versions of libpng.

- Update CMakeLists.txt to use the checked in libpng.
- Check in libpng version 1.6.22rc01
- Update README.google
- Replace our old LICENSE file with the latest one from libpng
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2033063003
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
==========

to

==========
Check libpng directly into third_party/

With this change, the CMake build, which does not use DEPS to sync
external projects, is able to build and use the same version of libpng
that is used in other builds.

This will allow all platforms (including Google3 CMake build) to test on
the same version of libpng, so we do not need to make SkPngCodec support
all versions of libpng.

- Update CMakeLists.txt to use the checked in libpng.
- Check in libpng version 1.6.22rc01
- Update README.google
- Replace our old LICENSE file with the latest one from libpng
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2033063003
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Committed:
https://skia.googlesource.com/skia/+/3965825b97a5809454f5810f7e603cbd02daa036
==========

[commit-bot: I haz the power, 2016-06-02 20:00:04]

Committed patchset #6 (id:50001) as
https://skia.googlesource.com/skia/+/3965825b97a5809454f5810f7e603cbd02daa036