AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
54ef59188b
skia2/third_party/libpng/BUILD.gn

60 lines
1.6 KiB
Plaintext
Raw Normal View History

GN: fixes for Mac - Make fiddle build on Mac (skipping GL). - Now that we're building in SkCodec, we depend on libpng and libjpeg-turbo unconditionally, not just on Linux. - Re-arrange third_party a bit so that our targets are Fuchsia/Chrome compatible. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184133002 NOTREECHECKS=true This doesn't affect Chrome/Blink, so landing through the closed tree. Review-Url: https://codereview.chromium.org/2184133002
2016-07-27 18:17:18 +00:00
# Copyright 2016 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
declare_args() {
Reland "Build CanvasKit using GN/Ninja" This is a reland of ecac712bec70710a28db544a33096c5b2ee78979 Changes (best viewed comparing PS1 to latest) - Use emsdk 3.1.3 which includes important bug fixes - Remove unnecessary steps in compile.sh - Fix use of various gn args. - Avoid conflicts with Flutter's GN symbols - Add/update docs - Make activate-emsdk script compatible with our infra. Original change's description: > Build CanvasKit using GN/Ninja > > Build with > > ./bin/gn gen out/wasm_debug '--args=target_cpu="wasm"' > > or > > ./bin/gn gen out/wasm_release '--args=target_cpu="wasm" is_debug=false' > > Change-Id: Ib74586bf8397d57064a3899eaa6da76f9bce9049 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502036 > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Reviewed-by: Ben Wagner <bungeman@google.com> Change-Id: I601712a8953c2799fa029e782e097905b95e6b59 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507717 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
2022-02-14 20:08:12 +00:00
skia_use_system_libpng = is_official_build && !is_wasm
GN: fixes for Mac - Make fiddle build on Mac (skipping GL). - Now that we're building in SkCodec, we depend on libpng and libjpeg-turbo unconditionally, not just on Linux. - Re-arrange third_party a bit so that our targets are Fuchsia/Chrome compatible. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184133002 NOTREECHECKS=true This doesn't affect Chrome/Blink, so landing through the closed tree. Review-Url: https://codereview.chromium.org/2184133002
2016-07-27 18:17:18 +00:00
}
import("../third_party.gni")
Allow most third_party targets to use system libraries if asked. This extends the pattern in freetype2 to expat, icu, libjpeg-turbo, libpng, libwebp, and zlib, and gives all these an arg to control which to use. Homebrew doesn't have dng_sdk, piex, or sftnly, or I'd have done the same for them too. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4260 DOCS_PREVIEW= https://skia.org/?cl=4260 Change-Id: I82e780502bf2217336e791787f172a6fc8f55460 Reviewed-on: https://skia-review.googlesource.com/4260 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Hal Canary <halcanary@google.com>
2016-11-01 15:46:10 +00:00
if (skia_use_system_libpng) {
system("libpng") {
libs = [ "png" ]
}
} else {
third_party("libpng") {
libpng: update to 1.6.32, pull using DEPS I'd have done this as two steps, but we didn't have a pure copy of libpng to start with. The patches we did have, though, have been upstreamed and are now unneeded. Change-Id: I884b9bc47afe5000f5a521f66a3bb95c0411b39a Reviewed-on: https://skia-review.googlesource.com/48620 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-09-19 17:30:58 +00:00
public_include_dirs = [
".",
"../externals/libpng",
]
GN: Android Once you have downloaded an android NDK, you can set the ndk GN arg to use it. E.g. my gn.args looks like: is_debug = false ndk = "/opt/android-ndk" This should be enough to get you going for an arm64 build. You ought to be able to tweak that to other architectures by changing target_cpu to "arm", "x86", "x86-64", etc. That won't quite work until I follow this up a bit, but the skeleton is there. This is enough to get me compiled, linked, and running to completion on my N5x. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2275983004 Review-Url: https://codereview.chromium.org/2275983004
2016-08-25 21:50:44 +00:00
Support pngs with incorrect CMF bytes Bug: chromium:807324 Though these pngs are technically incorrect, many such PNGs exist, and they are supported in Chromium. Ensure that users of SkCodec (e.g. Android, Flutter) display them as well. Change-Id: I2f1e573b4b7039cea81f96397cc0aa4cbc9461c3 Reviewed-on: https://skia-review.googlesource.com/111082 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com>
2018-02-28 21:24:18 +00:00
defines = [ "PNG_SET_OPTION_SUPPORTED" ]
reformat GN files Change-Id: I2d19c4f0ff1439dcd923a3064eb3ba78432a5113 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/281043 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
2020-04-01 18:47:34 +00:00
deps = [ "//third_party/zlib" ]
Allow most third_party targets to use system libraries if asked. This extends the pattern in freetype2 to expat, icu, libjpeg-turbo, libpng, libwebp, and zlib, and gives all these an arg to control which to use. Homebrew doesn't have dng_sdk, piex, or sftnly, or I'd have done the same for them too. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4260 DOCS_PREVIEW= https://skia.org/?cl=4260 Change-Id: I82e780502bf2217336e791787f172a6fc8f55460 Reviewed-on: https://skia-review.googlesource.com/4260 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Hal Canary <halcanary@google.com>
2016-11-01 15:46:10 +00:00
sources = [
libpng: update to 1.6.32, pull using DEPS I'd have done this as two steps, but we didn't have a pure copy of libpng to start with. The patches we did have, though, have been upstreamed and are now unneeded. Change-Id: I884b9bc47afe5000f5a521f66a3bb95c0411b39a Reviewed-on: https://skia-review.googlesource.com/48620 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-09-19 17:30:58 +00:00
"../externals/libpng/png.c",
"../externals/libpng/pngerror.c",
"../externals/libpng/pngget.c",
"../externals/libpng/pngmem.c",
"../externals/libpng/pngpread.c",
"../externals/libpng/pngread.c",
"../externals/libpng/pngrio.c",
"../externals/libpng/pngrtran.c",
"../externals/libpng/pngrutil.c",
"../externals/libpng/pngset.c",
"../externals/libpng/pngtrans.c",
"../externals/libpng/pngwio.c",
"../externals/libpng/pngwrite.c",
"../externals/libpng/pngwtran.c",
"../externals/libpng/pngwutil.c",
Allow most third_party targets to use system libraries if asked. This extends the pattern in freetype2 to expat, icu, libjpeg-turbo, libpng, libwebp, and zlib, and gives all these an arg to control which to use. Homebrew doesn't have dng_sdk, piex, or sftnly, or I'd have done the same for them too. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4260 DOCS_PREVIEW= https://skia.org/?cl=4260 Change-Id: I82e780502bf2217336e791787f172a6fc8f55460 Reviewed-on: https://skia-review.googlesource.com/4260 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Hal Canary <halcanary@google.com>
2016-11-01 15:46:10 +00:00
]
if (current_cpu == "arm" || current_cpu == "arm64") {
sources += [
libpng: update to 1.6.32, pull using DEPS I'd have done this as two steps, but we didn't have a pure copy of libpng to start with. The patches we did have, though, have been upstreamed and are now unneeded. Change-Id: I884b9bc47afe5000f5a521f66a3bb95c0411b39a Reviewed-on: https://skia-review.googlesource.com/48620 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-09-19 17:30:58 +00:00
"../externals/libpng/arm/arm_init.c",
"../externals/libpng/arm/filter_neon_intrinsics.c",
roll libpng to 1.6.37 Adds NEON accelerated palette expansion. Change-Id: I8a1378c58175c2343541a69b2bd7a1f476931a99 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208580 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Auto-Submit: Mike Klein <mtklein@google.com>
2019-04-16 14:49:07 +00:00
"../externals/libpng/arm/palette_neon_intrinsics.c",
Allow most third_party targets to use system libraries if asked. This extends the pattern in freetype2 to expat, icu, libjpeg-turbo, libpng, libwebp, and zlib, and gives all these an arg to control which to use. Homebrew doesn't have dng_sdk, piex, or sftnly, or I'd have done the same for them too. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4260 DOCS_PREVIEW= https://skia.org/?cl=4260 Change-Id: I82e780502bf2217336e791787f172a6fc8f55460 Reviewed-on: https://skia-review.googlesource.com/4260 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Hal Canary <halcanary@google.com>
2016-11-01 15:46:10 +00:00
]
}
GN: turn on libpng SSE2 filters I was profiling and remembered GN hasn't turned on much CPU-specific code. I looked at zlib, then libpng, then libjpeg-turbo: - zlib was easy but not useful. No routine we use in decoding changes significantly. - libpng was easy and useful, and we were already using NEON filters on ARM. - libjpeg-turbo requires yasm and is annoying. BUG=skia:5875 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4531 Change-Id: Ie072a457da41ee6538eebacb5eb5dbe5a6eb585e Reviewed-on: https://skia-review.googlesource.com/4531 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Matt Sarett <msarett@google.com>
2016-11-07 21:56:53 +00:00
if (current_cpu == "x86" || current_cpu == "x64") {
defines += [ "PNG_INTEL_SSE" ]
sources += [
libpng: update to 1.6.32, pull using DEPS I'd have done this as two steps, but we didn't have a pure copy of libpng to start with. The patches we did have, though, have been upstreamed and are now unneeded. Change-Id: I884b9bc47afe5000f5a521f66a3bb95c0411b39a Reviewed-on: https://skia-review.googlesource.com/48620 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-09-19 17:30:58 +00:00
"../externals/libpng/intel/filter_sse2_intrinsics.c",
"../externals/libpng/intel/intel_init.c",
GN: turn on libpng SSE2 filters I was profiling and remembered GN hasn't turned on much CPU-specific code. I looked at zlib, then libpng, then libjpeg-turbo: - zlib was easy but not useful. No routine we use in decoding changes significantly. - libpng was easy and useful, and we were already using NEON filters on ARM. - libjpeg-turbo requires yasm and is annoying. BUG=skia:5875 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4531 Change-Id: Ie072a457da41ee6538eebacb5eb5dbe5a6eb585e Reviewed-on: https://skia-review.googlesource.com/4531 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Matt Sarett <msarett@google.com>
2016-11-07 21:56:53 +00:00
]
}
GN: Android Once you have downloaded an android NDK, you can set the ndk GN arg to use it. E.g. my gn.args looks like: is_debug = false ndk = "/opt/android-ndk" This should be enough to get you going for an arm64 build. You ought to be able to tweak that to other architectures by changing target_cpu to "arm", "x86", "x86-64", etc. That won't quite work until I follow this up a bit, but the skeleton is there. This is enough to get me compiled, linked, and running to completion on my N5x. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2275983004 Review-Url: https://codereview.chromium.org/2275983004
2016-08-25 21:50:44 +00:00
}
GN: fixes for Mac - Make fiddle build on Mac (skipping GL). - Now that we're building in SkCodec, we depend on libpng and libjpeg-turbo unconditionally, not just on Linux. - Re-arrange third_party a bit so that our targets are Fuchsia/Chrome compatible. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184133002 NOTREECHECKS=true This doesn't affect Chrome/Blink, so landing through the closed tree. Review-Url: https://codereview.chromium.org/2184133002
2016-07-27 18:17:18 +00:00
}
Reference in New Issue Copy Permalink