AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
40c47e113d
skia2/third_party/libjpeg-turbo/BUILD.gn

88 lines
3.0 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() {
Strengthen is_official_build, update docs. This makes is_official_build turn off all development targets and features in Skia, including building third-party dependencies from source. This will intentionally break some external users, who will find themselves no longer able to find third-party headers or link against third-party libraries. These users have been building with our testing third-party dependencies unknowingly. They'll need to either explicitly turn back on building each dependency from source (skia_use_system_foo=false) or disable that dependency entirely (skia_use_foo=false). is_skia_standalone is now basically !is_official_build, so I've propagated that through, removing is_skia_standalone. In a few places we were using it as a stand-in for defined(ndk), so I've just written defined(ndk) there. Duh. gn_to_bp: is_offical_build's new strength also makes gn_to_bp.py simpler to write. In spirit, Android builds are official Skia builds that also build DM and nanobench. It seems that SkJumper (src/jumper/*) is (unintentionally) enabled on Android. Switching to an is_official_build would have disabled that. But as that accidental launch seems to have gone fine, I've kept it explicitly enabled. In the end, no changes to Android.bp or its SkUserConfig.h. The -Mini builder no longer needs to explicitly disable tools. CQ_INCLUDE_TRYBOTS=skia.primary:Build-Ubuntu-Clang-x86_64-Release-Mini Change-Id: Id06e53268a5caf55c6046ada354a0863c3031c73 Reviewed-on: https://skia-review.googlesource.com/9190 Reviewed-by: Leon Scroggins <scroggo@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-03-03 14:21:30 +00:00
skia_use_system_libjpeg_turbo = is_official_build
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_libjpeg_turbo) {
system("libjpeg") {
libs = [ "jpeg" ]
}
} else {
third_party("libjpeg") {
Update to the latest version of libjpeg-turbo Bug: b/70203010 From https://github.com/libjpeg-turbo/libjpeg-turbo/commit/c308d434. This commit fixes a bug in BitmapRegionDecoder, and is the tip of tree. Rather than using our mirror, just pull in upstream directly. Move our config files into third_party/libjpeg-turbo, so we can just DEPS to upstream. These files are unchanged, except jconfig.h, where I added a comment regarding arithmetic coding. Add a test image which demonstrates the bug. Change-Id: I00f8f961f69e407dc31ca6d15c66518aa0acbafd Reviewed-on: https://skia-review.googlesource.com/81442 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Leon Scroggins <scroggo@google.com>
2017-12-06 21:21:01 +00:00
public_include_dirs = [
".",
"../externals/libjpeg-turbo",
]
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
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
defines = [ "TURBO_FOR_WINDOWS" ]
spin off easy stuff from Herb's windows GN CL BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2209533004 No public API changes. TBR=reed@google.com Review-Url: https://codereview.chromium.org/2209533004
2016-08-04 13:19:33 +00:00
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 = [
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-10 22:47:51 +00:00
"../externals/libjpeg-turbo/jaricom.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
"../externals/libjpeg-turbo/jcapimin.c",
"../externals/libjpeg-turbo/jcapistd.c",
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-10 22:47:51 +00:00
"../externals/libjpeg-turbo/jcarith.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
"../externals/libjpeg-turbo/jccoefct.c",
"../externals/libjpeg-turbo/jccolor.c",
"../externals/libjpeg-turbo/jcdctmgr.c",
"../externals/libjpeg-turbo/jchuff.c",
"../externals/libjpeg-turbo/jcinit.c",
"../externals/libjpeg-turbo/jcmainct.c",
"../externals/libjpeg-turbo/jcmarker.c",
"../externals/libjpeg-turbo/jcmaster.c",
"../externals/libjpeg-turbo/jcomapi.c",
"../externals/libjpeg-turbo/jcparam.c",
"../externals/libjpeg-turbo/jcphuff.c",
"../externals/libjpeg-turbo/jcprepct.c",
"../externals/libjpeg-turbo/jcsample.c",
"../externals/libjpeg-turbo/jdapimin.c",
"../externals/libjpeg-turbo/jdapistd.c",
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-10 22:47:51 +00:00
"../externals/libjpeg-turbo/jdarith.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
"../externals/libjpeg-turbo/jdcoefct.c",
"../externals/libjpeg-turbo/jdcolor.c",
"../externals/libjpeg-turbo/jddctmgr.c",
"../externals/libjpeg-turbo/jdhuff.c",
"../externals/libjpeg-turbo/jdinput.c",
"../externals/libjpeg-turbo/jdmainct.c",
"../externals/libjpeg-turbo/jdmarker.c",
"../externals/libjpeg-turbo/jdmaster.c",
"../externals/libjpeg-turbo/jdmerge.c",
"../externals/libjpeg-turbo/jdphuff.c",
"../externals/libjpeg-turbo/jdpostct.c",
"../externals/libjpeg-turbo/jdsample.c",
"../externals/libjpeg-turbo/jerror.c",
"../externals/libjpeg-turbo/jfdctflt.c",
"../externals/libjpeg-turbo/jfdctfst.c",
"../externals/libjpeg-turbo/jfdctint.c",
"../externals/libjpeg-turbo/jidctflt.c",
"../externals/libjpeg-turbo/jidctfst.c",
"../externals/libjpeg-turbo/jidctint.c",
"../externals/libjpeg-turbo/jidctred.c",
"../externals/libjpeg-turbo/jmemmgr.c",
"../externals/libjpeg-turbo/jmemnobs.c",
"../externals/libjpeg-turbo/jquant1.c",
"../externals/libjpeg-turbo/jquant2.c",
"../externals/libjpeg-turbo/jutils.c",
]
GN: turn on easy libjpeg-turbo SIMD backends (ARMv7 and ARMv8) These are so easy we might as well... I did a quick check of relevant-looking defines: - GYP defined WITH_SIMD, but it looks like that's already defined (by jconfig.h?); - GYP defined RGBX_FILLER_0XFF, but that affects only x86/x86-64; - GYP defined STRICT_MEMORY_ACCESS, which does nothing; - GYP defined MOTION_JPEG_SUPPORTED, which does nothing (and we'd probably not care anyway). BUG=skia:5875 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4745 Change-Id: Ib1f28d354630be472c4d9648d5ade74a452a9e24 Reviewed-on: https://skia-review.googlesource.com/4745 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-11-13 13:52:07 +00:00
Don't try to use NEON ASM files on Windows Bug: skia:8569 Change-Id: Ie869cad26cbb07d92553a756372b218debc5d373 Reviewed-on: https://skia-review.googlesource.com/c/175589 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-12-07 17:58:04 +00:00
if (current_cpu == "arm" && !is_ios && !is_win) {
GN: turn on easy libjpeg-turbo SIMD backends (ARMv7 and ARMv8) These are so easy we might as well... I did a quick check of relevant-looking defines: - GYP defined WITH_SIMD, but it looks like that's already defined (by jconfig.h?); - GYP defined RGBX_FILLER_0XFF, but that affects only x86/x86-64; - GYP defined STRICT_MEMORY_ACCESS, which does nothing; - GYP defined MOTION_JPEG_SUPPORTED, which does nothing (and we'd probably not care anyway). BUG=skia:5875 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4745 Change-Id: Ib1f28d354630be472c4d9648d5ade74a452a9e24 Reviewed-on: https://skia-review.googlesource.com/4745 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-11-13 13:52:07 +00:00
sources += [
Update libjpeg-turbo to pre-2.0.0 (from 1.5.3) jpeg_skip_scanlines was incorrectly incrementing an internal counter, resulting in an infinite loop. (This only occurs for certain types of progressive images, using certain sample sizes.) The fix is at https://github.com/libjpeg-turbo/libjpeg-turbo/commit/26f109290dc4ffc9c522d9f5d5a7d5d1ee2c0e0a. This is included in tip-of-tree, which is unofficially 2.0.0, so go ahead and update to it. Add a test based on the original bug. Bug: b/78329453 Change-Id: I5ade9924812324d58668c26f71cd622ef93f40a7 Reviewed-on: https://skia-review.googlesource.com/129459 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-06-26 14:49:42 +00:00
"../externals/libjpeg-turbo/simd/arm/jsimd.c",
"../externals/libjpeg-turbo/simd/arm/jsimd_neon.S",
GN: turn on easy libjpeg-turbo SIMD backends (ARMv7 and ARMv8) These are so easy we might as well... I did a quick check of relevant-looking defines: - GYP defined WITH_SIMD, but it looks like that's already defined (by jconfig.h?); - GYP defined RGBX_FILLER_0XFF, but that affects only x86/x86-64; - GYP defined STRICT_MEMORY_ACCESS, which does nothing; - GYP defined MOTION_JPEG_SUPPORTED, which does nothing (and we'd probably not care anyway). BUG=skia:5875 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4745 Change-Id: Ib1f28d354630be472c4d9648d5ade74a452a9e24 Reviewed-on: https://skia-review.googlesource.com/4745 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-11-13 13:52:07 +00:00
]
Don't try to use NEON ASM files on Windows Bug: skia:8569 Change-Id: Ie869cad26cbb07d92553a756372b218debc5d373 Reviewed-on: https://skia-review.googlesource.com/c/175589 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-12-07 17:58:04 +00:00
} else if (current_cpu == "arm64" && !is_ios && !is_win) {
GN: turn on easy libjpeg-turbo SIMD backends (ARMv7 and ARMv8) These are so easy we might as well... I did a quick check of relevant-looking defines: - GYP defined WITH_SIMD, but it looks like that's already defined (by jconfig.h?); - GYP defined RGBX_FILLER_0XFF, but that affects only x86/x86-64; - GYP defined STRICT_MEMORY_ACCESS, which does nothing; - GYP defined MOTION_JPEG_SUPPORTED, which does nothing (and we'd probably not care anyway). BUG=skia:5875 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4745 Change-Id: Ib1f28d354630be472c4d9648d5ade74a452a9e24 Reviewed-on: https://skia-review.googlesource.com/4745 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-11-13 13:52:07 +00:00
sources += [
Update libjpeg-turbo to pre-2.0.0 (from 1.5.3) jpeg_skip_scanlines was incorrectly incrementing an internal counter, resulting in an infinite loop. (This only occurs for certain types of progressive images, using certain sample sizes.) The fix is at https://github.com/libjpeg-turbo/libjpeg-turbo/commit/26f109290dc4ffc9c522d9f5d5a7d5d1ee2c0e0a. This is included in tip-of-tree, which is unofficially 2.0.0, so go ahead and update to it. Add a test based on the original bug. Bug: b/78329453 Change-Id: I5ade9924812324d58668c26f71cd622ef93f40a7 Reviewed-on: https://skia-review.googlesource.com/129459 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-06-26 14:49:42 +00:00
"../externals/libjpeg-turbo/simd/arm64/jsimd.c",
"../externals/libjpeg-turbo/simd/arm64/jsimd_neon.S",
GN: turn on easy libjpeg-turbo SIMD backends (ARMv7 and ARMv8) These are so easy we might as well... I did a quick check of relevant-looking defines: - GYP defined WITH_SIMD, but it looks like that's already defined (by jconfig.h?); - GYP defined RGBX_FILLER_0XFF, but that affects only x86/x86-64; - GYP defined STRICT_MEMORY_ACCESS, which does nothing; - GYP defined MOTION_JPEG_SUPPORTED, which does nothing (and we'd probably not care anyway). BUG=skia:5875 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4745 Change-Id: Ib1f28d354630be472c4d9648d5ade74a452a9e24 Reviewed-on: https://skia-review.googlesource.com/4745 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-11-13 13:52:07 +00:00
]
} else {
sources += [ "../externals/libjpeg-turbo/jsimd_none.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: 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