Commit Graph

260 Commits

Author SHA1 Message Date
Mike Klein
5a69707396 Tidy up DEPS
- Sort alphabetically and align on ':'.
 - Remove yasm deps.  They're unused since we switched to GN.
 - Remove fetch-gn hook.  git-sync-deps does this now.
 - Remove comments about why DEPS are needed.
   They're all pretty obvious if you grep for the dependency name.

Change-Id: Iefd1a14560f227e957a206e51db8c8ba5520f57b
Reviewed-on: https://skia-review.googlesource.com/9197
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-03-04 21:54:08 +00:00
scroggo
1e532d3ad3 Update libwebp to 0.6.0
Corresponds with Android change
https://android-review.googlesource.com/#/c/326439/

"this version includes encoder and performance improvements"

Update build file
* Many files have been renamed from
    src/<subdir>/<name>.c
      to
    src/<subdir>/<name>_<subdir>.c

* Build new files (*_msa.c, *_neon.c, predictor_enc.c)

This should fix issue 5876, which was caused by a compiler bug.
With the added NEON implementation, we will no longer trigger
the bug.

BUG=skia:5876

CQ_INCLUDE_TRYBOTS=skia.primary:Build-Mac-Clang-arm-Debug-iOS

Review-Url: https://codereview.chromium.org/2689283007
2017-02-16 05:57:41 -08:00
Matt Sarett
9119de64aa Update libjpeg-turbo to 1.5.1, enable arithmetic decoding
BUG=skia:4710

Change-Id: Idac44f7bdf140f1288bc1538f28ab1a4e1ccaae6
Reviewed-on: https://skia-review.googlesource.com/8274
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
2017-02-13 15:36:42 +00:00
Brian Osman
79086b94ed Integrate the ImGui library with viewer
Code and docs are at: https://github.com/ocornut/imgui

ImGui is an open source immediate mode GUI library that's
lightweight and fairly simply to integrate. Widget functions
return their state, and the library emits vertex and index
data to render everything. It's got a huge set of built-in
widgets and really robust layout control.

For the initial integration, I had to fix up event handling
in the viewer's app framework (to get mouse wheel and more
keys, etc...).

The new viewer 'Debug' window is toggled with the space bar.
For this change, I've added one feature to that window: the
slide picker. It's got a list of all slides, with filtering
support, and the ability to click to switch slides.

I also included the ImGui 'Demo' window (toggled with 'g').
This is nicely laid out, and includes examples of pretty
much everything the library can do. It also serves as good
documentation - find something that looks like what you want,
and then go look at the corresponding code (all of it is in
imgui_demo.cpp).

I have other CLs with other features (like directly editing
the primaries of the working color space), but I wanted to
land this chunk first, then start adding more features.

Other than adding new debugging features, there are few
more outstanding work items:

1) Raster doesn't render the GUI correctly, due to non-
invertible pos -> UV matrices. Florin is working on that.
2) Touch inputs aren't being routed yet, so the GUI isn't
usable on Android yet. Might also be tough to work with,
given the size.
3) ImGui has clipboard integration (that's why it wants
the C, X, and V keys), but we need to wire it up to the
OS' clipboard functions.
4) Draw commands can carry a void* payload to support
drawing images (using whatever mechanism the engine has).
I'd like to set that up (probably using SkImage*), which
makes it really easy to add visualization of off-screen
images in GMs, etc...

BUG=skia:

Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1
Reviewed-on: https://skia-review.googlesource.com/7702
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 19:17:03 +00:00
Hal Canary
6d75d119dc harfbuzz 1.3.0 → 1.4.2
Change-Id: I0c2f050c70755523abfbe98c17e90a90ecbedff5
Reviewed-on: https://skia-review.googlesource.com/8113
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-02-07 16:01:57 +00:00
Mike Klein
160907f8de Clean up more references to GYP.
Delete files only used by GYP, and files that used GYP.  Neither can
possibly be actively used.  Beyond that, just a couple doc tweaks.

Change-Id: I0220d7226e7bb9ed7c54a7d8f2906a718313c521
Reviewed-on: https://skia-review.googlesource.com/8062
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Hal Canary <halcanary@google.com>
2017-02-06 17:55:35 +00:00
Ethan Nicholas
ab23acf4fa Revert "Update libwebp to 0.6.0-pre"
This reverts commit e2f6ffbf49.

Reason for revert:

iOS build failures, see https://luci-milo.appspot.com/swarming/task/33e5e02cf8419d10/steps/build_iOSShell/0/stdout

Original change's description:
> Update libwebp to 0.6.0-pre
> 
> Corresponds with Android change
> https://android-review.googlesource.com/#/c/326439/
> 
> "this prerelease snapshot includes encoder and performance
> improvements"
> 
> Update build file
> * Many files have been renamed from
>     src/<subdir>/<name>.c
>       to
>     src/<subdir>/<name>_<subdir>.c
> 
> * Build new files (*_msa.c, *_neon.c, predictor_enc.c)
> 
> This should fix issue 5876, which was caused by a compiler bug.
> With the added NEON implementation, we will no longer trigger
> the bug.
> 
> BUG=skia:5876
> 
> Change-Id: I0fcce4362ee70138547b1d23aa9ef537a4126e73
> Reviewed-on: https://skia-review.googlesource.com/7376
> Reviewed-by: Matt Sarett <msarett@google.com>
> Commit-Queue: Leon Scroggins <scroggo@google.com>
> 

TBR=msarett@google.com,scroggo@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:5876

Change-Id: Ib81f63861d9f1c6936bd7f790b5e16a9544a4df0
Reviewed-on: https://skia-review.googlesource.com/7420
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2017-01-23 20:47:46 +00:00
Leon Scroggins III
e2f6ffbf49 Update libwebp to 0.6.0-pre
Corresponds with Android change
https://android-review.googlesource.com/#/c/326439/

"this prerelease snapshot includes encoder and performance
improvements"

Update build file
* Many files have been renamed from
    src/<subdir>/<name>.c
      to
    src/<subdir>/<name>_<subdir>.c

* Build new files (*_msa.c, *_neon.c, predictor_enc.c)

This should fix issue 5876, which was caused by a compiler bug.
With the added NEON implementation, we will no longer trigger
the bug.

BUG=skia:5876

Change-Id: I0fcce4362ee70138547b1d23aa9ef537a4126e73
Reviewed-on: https://skia-review.googlesource.com/7376
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
2017-01-23 20:23:59 +00:00
Brian Osman
21d742dbaf Get latest ANGLE as of January 6, 2017
Also add ANGLE ES3 predefined configs.

BUG=skia:
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE

Change-Id: Ib7394afa961da1afe91c6dfefe08528273d3087c
Reviewed-on: https://skia-review.googlesource.com/6698
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-01-11 15:12:40 +00:00
Mike Klein
c0a7a08359 remove xbyak experiment
SkSplicer is better.

CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD

Change-Id: I014ec0e9fb00a8a4694d442e672c65402621dc67
Reviewed-on: https://skia-review.googlesource.com/6830
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-01-10 16:25:10 +00:00
Ben Wagner
a55ffa2f06 Roll FreeType past 2.7.1.
ffd8f62236..08fd250e1a

This picks up a number of fixes and an implementation of
FT_Get_Var_Design_Coordinates.

Change-Id: Idac2b3b5d2b0684fa2c13f4f2484c09f39a4eced
Reviewed-on: https://skia-review.googlesource.com/6815
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
2017-01-09 20:48:19 +00:00
Mike Klein
9a34b8c779 xbyak -> skia mirror, pin version
xbyak hasn't changed in a couple weeks, so this pinned version is likely the version all bots are already on.

Change-Id: I050e508f601838015edcb9890214bd7ee1ac1e59
Reviewed-on: https://skia-review.googlesource.com/6737
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-01-09 14:08:30 +00:00
Mike Klein
7f71d8845c SkXbyak basics
A little JIT proof of concept for SkRasterPipeline, using xbyak, which is a header-only assembler.  It's x86-only, but supports x86 very thoroughly, and it's very user friendly (at least as far as assembler libraries go...).

CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD

Change-Id: Ie17e562b0f3fff5914041badfb2c1fe4f86efab8
Reviewed-on: https://skia-review.googlesource.com/5730
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Heather Miller <hcm@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-01-06 17:45:41 +00:00
Mike Klein
c4bb2b9721 Revert "Get latest ANGLE as of January 6, 2017"
This reverts commit 151d3b18fa.

Reason for revert: broken bots

Original change's description:
> Get latest ANGLE as of January 6, 2017
> 
> Also add ANGLE ES3 predefined configs.
> 
> BUG=skia:
> 
> Change-Id: I28d87b0676395d047e49bbb926db330f76cf17bd
> Reviewed-on: https://skia-review.googlesource.com/6683
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
> 

TBR=bsalomon@google.com,brianosman@google.com,reviews@skia.org
BUG=skia:
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I8e893761308044abbeabf52fc8f0fc83d84b98b1
Reviewed-on: https://skia-review.googlesource.com/6687
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-01-06 17:22:07 +00:00
Brian Osman
151d3b18fa Get latest ANGLE as of January 6, 2017
Also add ANGLE ES3 predefined configs.

BUG=skia:

Change-Id: I28d87b0676395d047e49bbb926db330f76cf17bd
Reviewed-on: https://skia-review.googlesource.com/6683
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2017-01-06 16:58:35 +00:00
Leon Scroggins III
58f100c02c Update libwebp to v0.5.2-rc2
This matches the version used by Chromium (crbug.com/675306) and
Android (https://android-review.googlesource.com/#/c/316352/).

Update our test. In the new version, we successfully decode a subset
from incomplete input that we previously did not.

Change-Id: I3442bf59ffdf223a723d8aa75f5b9b816b9e9c3c
Reviewed-on: https://skia-review.googlesource.com/6320
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
2016-12-20 15:27:27 +00:00
Mike Klein
feda468155 Run bin/fetch-gn as a gclient hook.
Seems like the bots don't run hooks.  That's okay, even ideal.
They'll keep getting GN via recipes.

DOCS_PREVIEW= https://skia.org/?cl=5725

Change-Id: I000bad3390dddaeb4548972f29c96b8b3288ea6c
Reviewed-on: https://skia-review.googlesource.com/5725
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
2016-12-09 17:06:21 +00:00
Mike Klein
374e04acfa Roll GN
Mostly to get
    5d7f4ce [GN] Fix generate Xcode project for macOS to work with Xcode 8.

After this lands, gclient sync && python bin/fetch-gn to get the new GN.

Change-Id: I3e1a186996b1db69ef767922a5b9efff173b950c
Reviewed-on: https://skia-review.googlesource.com/5723
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-12-09 14:30:12 +00:00
Ben Wagner
ee6c368a6d Roll third_party/externals/freetype 4d3f7ca8cedb..ffd8f622360
4d3f7ca8ce..ffd8f62236

Change-Id: Ia9d8af09253d0aff343c2310f5eb8c934b2ebbda
Reviewed-on: https://skia-review.googlesource.com/5685
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
2016-12-08 15:22:37 +00:00
Yujie Qin
d1bd30515a Update PIEX
BUG=32591644

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5240

Change-Id: I0ff3e24ed154a2338808d29ed91536eb6bf98641
Reviewed-on: https://skia-review.googlesource.com/5240
Reviewed-by: Anton Daubert <adaubert@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
2016-11-28 13:55:48 +00:00
scroggo
6fe16d3f58 Remove SkMovie and giflib
SkMovie is not used in any of our tests or by Chromium. It is also not
supported by GN. It is being moved into Android, its only client, so we
can delete it here.

giflib is only used by SkMovie, so stop pulling/building it.

TBR=reed@google.com

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3945

Change-Id: I28a8155fd59e139bb21ec2295cc22fdced034284
Review-Url: https://codereview.chromium.org/2449213004
2016-10-27 12:24:43 -07:00
borenet
b979933e48 Roll common DEPS
BUG=skia:
NOTRY=true
NOTREECHECKS=true
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2435333002

Review-Url: https://chromiumcodereview.appspot.com/2435333002
2016-10-21 12:01:12 -07:00
Mike Klein
12b2193fcc Remove shaderc DEPS.
Was just perusing DEPS and I realized shaderc is probably no longer needed.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3561

Change-Id: I054a424b26e51dbfee77dbe79e1e175399627902
Reviewed-on: https://skia-review.googlesource.com/3561
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Greg Daniel <egdaniel@google.com>
2016-10-19 16:51:02 +00:00
Mike Klein
f3c874a984 There are no more cmake bots, so clean up their old scripts.
BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2854

Change-Id: Ieb94788182b35d8fd3197ce090d5f28a65903204
Reviewed-on: https://skia-review.googlesource.com/2854
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-09-30 22:19:20 +00:00
brianosman
f8d2c8df47 Latest ANGLE as of September 27, 2016
Includes a fix for ES3 texture reuse that solves many of the problems
we saw using ES3. (There are still issues with some YUV planes).

Also includes a fix for anglebug.com/1478, so half-float formats are
allowed again.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2302993004

Review-Url: https://codereview.chromium.org/2302993004
2016-09-28 14:01:51 -07:00
Ben Wagner
2384cfaa5d Roll buildtools adb8bf4e8fc..5fd66957f08bb7
adb8bf4e8f..5fd66957f0

Primarily to pick up
https://chromium.googlesource.com/chromium/src/+/d51d3527da33

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2749

Change-Id: I3f9ac18c8946fa28effcf8c8cff3bbd1120a86df
Reviewed-on: https://skia-review.googlesource.com/2749
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <bungeman@google.com>
2016-09-28 18:42:53 +00:00
mtklein
e19c179281 Clean up target_os=llvm now that it does nothing.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2317373004

Review-Url: https://codereview.chromium.org/2317373004
2016-09-08 09:19:00 -07:00
mtklein
2b3c2a3ff9 GN: add sanitize arg
Attempt to take over all *SAN builds.

MSAN has a lot of coordination required between gn/BUILD.gn and gn_flavor.py.
I'd like to follow up to move more of this into gn/BUILD.gn, to make it easier
to use locally.

The compile steps should be much faster now.  We no longer build CMake
and Clang for every run, instead using the clang_linux CIPD package.  This
removes the need for all the third_party/externals/llvm/... dependencies.

Similarly, since we're using the clang_linux package, we no longer depend
on Chrome's Clang, and thus no longer need to sync chromium on these bots.

Instead of packaging up MSAN libraries and llvm-symbolizer in the compile
output, I have the test / perf bots also depend on the clang_linux package.
These do not vary from build to build.

No more need for the xsan.blacklist -include hack: Clang, GN, and Ninja
all track changes to xsan.blacklist without our help.

This has the incidental effect of upgrading the compiler used by *SAN
bots from Clang 3.8 to Clang 3.9.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2289343002

Review-Url: https://codereview.chromium.org/2289343002
2016-09-08 08:39:34 -07:00
bungeman
41a8f323f7 Update FreeType dependency from 2.6.1 to 2.6.5.
- 6a19a7d332c5446542196e5aeda0ede109ef097b
+ 4d3f7ca8cedbddad40b9e93a82926618e3fb4265

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2302493002

Review-Url: https://codereview.chromium.org/2302493002
2016-08-31 12:48:18 -07:00
mtklein
a28e263d42 Roll GN
This picks up efc976e502, which means we don't need to create a link_pool any more.  The default behavior is unlimited linking, what we were asking for explicitly.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288253002

Review-Url: https://codereview.chromium.org/2288253002
2016-08-29 07:14:28 -07:00
mtklein
cdc8942fd6 cleanup dead nanomsg and build_overrides
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2287013003
TBR=

Review-Url: https://codereview.chromium.org/2287013003
2016-08-27 06:50:11 -07:00
brianosman
e3031b607c Update ANGLE to latest as of August 25, 2016
With this version, it's now exposing GL_EXT_color_buffer_half_float, but
it's (incorrectly) using GL_HALF_FLOAT rather than GL_HALF_FLOAT_OES.
In addition, release builds were crashing in EGLImageTest due to an
apparent disagreement about calling convention on function-pointer to
exported symbol. There is a proper typedef for that in one of their
headers, but I can't seem to include it without creating more problems,
so I just fixed the decoration on our local typedef.

With those changes, all tests pass, and (on my Windows machine), all
GMs and SKPs produce identical results vs. master in angle and angle-gl.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2282733003

Review-Url: https://codereview.chromium.org/2282733003
2016-08-26 10:37:57 -07:00
mtklein
d434b01c7e Roll GN: gn format is --in-place by default
As usual, might as well roll, and this new behavior is a small convenience.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2231833002

Review-Url: https://codereview.chromium.org/2231833002
2016-08-10 07:30:58 -07:00
mtklein
8e522e4fa1 Roll GN
No major new features... just good to keep up.

60f7f9a..9c6ad6f

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2218063002

Review-Url: https://codereview.chromium.org/2218063002
2016-08-05 08:40:03 -07:00
halcanary
95860ad400 DEPS: sfntly 468cad5 → b18b09b
SfntlyWrapper::SubsetFont now takes TTC index, needed for SkPDF.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2186103002

Review-Url: https://codereview.chromium.org/2186103002
2016-07-27 12:28:56 -07:00
halcanary
89da693035 DEPS: ICU c291cde → ec9c113
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2189643003

Review-Url: https://codereview.chromium.org/2189643003
2016-07-27 10:13:25 -07:00
halcanary
aa7f67c76b DEPS: harfbuzz 1.2.7 → 1.3.0
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2179963005

Review-Url: https://codereview.chromium.org/2179963005
2016-07-27 10:08:39 -07:00
halcanary
81a9ce1944 DEPS: sfntly 130f832 → 468cad5
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2189643002

Review-Url: https://codereview.chromium.org/2189643002
2016-07-27 10:08:18 -07:00
mtklein
901257a3ba GN: remove hooks again
NOTRY=true

TBR=jcgregorio@google.com

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2168933004

Review-Url: https://codereview.chromium.org/2168933004
2016-07-21 13:54:39 -07:00
mtklein
43d707ca93 No symlink. The bots are not running hooks anyway.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2170663003

Review-Url: https://codereview.chromium.org/2170663003
2016-07-21 13:43:48 -07:00
mtklein
4eaa320d57 GN: add missing .exe
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2168763005

NOTRY=true

Review-Url: https://codereview.chromium.org/2168763005
2016-07-21 13:01:08 -07:00
mtklein
7fbfbbe8f4 Basic standalone GN configs.
This sketches out what a world without Chrome's GN configs would look like.

Instead of DEPSing in build/, we now host our own gypi_to_gn.py.

The symlink from skia/ to . lets us run gclient hooks when the .gclient file is in the directory above skia/ or inside skia/.  That means we don't need gn.py anymore.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2167163002

Review-Url: https://codereview.chromium.org/2167163002
2016-07-21 12:25:45 -07:00
mtklein
9b43094bf2 Roll buildtools for latest GN binary.
This GN binary has a JSON backend that's meant to be parsed to seed other
build configurations (e.g. CMake, Android, Google3).

You will need to re-run ./gn.py to fetch the newest binary.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2164263002

Review-Url: https://codereview.chromium.org/2164263002
2016-07-21 06:29:01 -07:00
fmalita
771a190a00 Build Expat on all platforms
* bump version to @android-6.0.1_r55 (2.1.1)

* add as a dependency to the 'xml' target (for upcoming http://crrev.com/2142893006)

* tweak build for Mac, Win:

  - define HAVE_EXPAT_CONFIG_H (same as in Android.mk)
  - use -Wno-missing-field-initializers (same as in Android.mk)
  - suppress MSVS warning 4244 (same as ..cmake/Utilities/cmexpat/expatConfig.h.in)

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150603004
R=mtklein@google.com

Review-Url: https://codereview.chromium.org/2150603004
2016-07-14 14:02:24 -07:00
mtklein
e4a712b665 GN: just new deps
These just are the DEPS changes from the previous GN CL, each rolled up to head.

I've removed the hooks to fetch GN and Clang... will have to figure out how to
deal with .gclient files in different places later.

BUG=skia:5452
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2087403002

Review-Url: https://codereview.chromium.org/2087403002
2016-06-23 05:56:18 -07:00
mtklein
3917cf4ef7 Revert of GN (patchset #12 id:220001 of https://codereview.chromium.org/2087593002/ )
Reason for revert:
gclient not happy on some bots

Original issue's description:
> GN
>
> What we've got here is a little GN MVP.  It's lacking any knobs and doesn't yet build anything but libskia, zlib, libpng, and libjpeg-turbo.  I've been hopping back and forth between Linux at work and Mac at home.  These seem to be at least partially working, enough to build and run cmake/example.cpp.
>
> The xcode backend seems to work.  From here, we can start exploring how to handle other backends (cmake,Android make, Google3).  There are a couple things I want to try:
>   - add another backend like vs or xcode to GN directly
>   - intercept via a custom toolchain
>   - reverse from ninja -t commands
> That last option seems kind of fun.
>
> This tries to piggyback on Chrome's GN setup as much as possible.  Chrome's got quite a lot figured out, and we're basically required to do this if we want to have a single GN build system shareable by Chrome, our bots, and other clients.
>
> This pulls in some new DEPS:
>    - build: Chrome's GN configuration, and much more
>    - buildtools: hashes for gn binary, pulled via hooks
>    - tools/clang: hashes for Chrome's clang, pulled via hooks into third_party/llvm-build
> It additionally symlinks tools/gyp to third_party/externals/gyp.  GN pulls some stuff from tools/gyp on Mac.
>
> Have not yet tried building for Windows, Android, or iOS.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2087593002
>
> Committed: https://skia.googlesource.com/skia/+/1d8de594f126b9a80bd8f8fa2005e90faf3b5b17

TBR=bsalomon@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review-Url: https://codereview.chromium.org/2088253002
2016-06-22 10:07:07 -07:00
mtklein
1d8de594f1 GN
What we've got here is a little GN MVP.  It's lacking any knobs and doesn't yet build anything but libskia, zlib, libpng, and libjpeg-turbo.  I've been hopping back and forth between Linux at work and Mac at home.  These seem to be at least partially working, enough to build and run cmake/example.cpp.

The xcode backend seems to work.  From here, we can start exploring how to handle other backends (cmake,Android make, Google3).  There are a couple things I want to try:
  - add another backend like vs or xcode to GN directly
  - intercept via a custom toolchain
  - reverse from ninja -t commands
That last option seems kind of fun.

This tries to piggyback on Chrome's GN setup as much as possible.  Chrome's got quite a lot figured out, and we're basically required to do this if we want to have a single GN build system shareable by Chrome, our bots, and other clients.

This pulls in some new DEPS:
   - build: Chrome's GN configuration, and much more
   - buildtools: hashes for gn binary, pulled via hooks
   - tools/clang: hashes for Chrome's clang, pulled via hooks into third_party/llvm-build
It additionally symlinks tools/gyp to third_party/externals/gyp.  GN pulls some stuff from tools/gyp on Mac.

Have not yet tried building for Windows, Android, or iOS.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2087593002

Review-Url: https://codereview.chromium.org/2087593002
2016-06-22 09:52:13 -07:00
scroggo
3965825b97 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

Review-Url: https://codereview.chromium.org/2033063003
2016-06-02 12:59:59 -07:00
halcanary
3d5942e8a4 gyp: clean up warnings with clang-3.8
Also: update zlib DEPS.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002233002

Review-Url: https://codereview.chromium.org/2002233002
2016-05-23 14:02:54 -07:00
msarett
8fe89ab9b2 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
2016-05-17 09:31:04 -07:00