Djam/chromium-browser-stable-test
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-test.git synced 2025-02-24 18:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
chromium-browser-stable-test/chromium-52-pdfium-system-libtiff-libpng.patch

520 lines
17 KiB
Diff
Raw Normal View History

New version 54.0.2840.100 Switch to GN to build
2016-11-17 23:12:20 +10:00
diff -up chromium-54.0.2840.16/third_party/pdfium/BUILD.gn.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/BUILD.gn
--- chromium-54.0.2840.16/third_party/pdfium/BUILD.gn.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/BUILD.gn 2016-09-12 13:47:03.205588975 +0200
@@ -14,7 +14,6 @@ config("pdfium_common_config") {
"third_party/freetype/include/freetype",
]
defines = [
- "OPJ_STATIC",
"PNG_PREFIX",
"PNG_USE_READ_MACROS",
]
@@ -553,7 +552,7 @@ static_library("fxcodec") {
deps = [
"third_party:fx_lcms2",
"third_party:fx_libopenjpeg",
- "third_party:fx_zlib",
+ "//third_party/zlib:zlib",
# This is a generic JPEG library dependency.
"//third_party:jpeg",
diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/codec_int.h
--- chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/codec_int.h 2016-09-12 13:47:03.205588975 +0200
@@ -16,7 +16,7 @@
#include "core/fxcodec/include/fx_codec.h"
#include "core/fxcodec/jbig2/JBig2_Context.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg.h>
class CPDF_ColorSpace;
diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp
--- chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp 2016-09-12 13:47:03.205588975 +0200
@@ -11,7 +11,7 @@
#include "core/fxcodec/include/fx_codec.h"
#include "core/fxcrt/include/fx_ext.h"
-#include "third_party/zlib_v128/zlib.h"
+#include <zlib.h>
extern "C" {
static void* my_alloc_func(void* opaque,
diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
--- chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp 2016-09-12 13:47:03.206588962 +0200
@@ -13,7 +13,7 @@
#include "core/fxcodec/include/fx_codec.h"
#include "core/fxcrt/include/fx_safe_types.h"
#include "third_party/lcms2-2.6/include/lcms2.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg.h>
static void fx_error_callback(const char* msg, void* client_data) {
(void)client_data;
@@ -752,7 +752,7 @@ FX_BOOL CJPX_Decoder::Init(const unsigne
image = nullptr;
return FALSE;
}
- image->pdfium_use_colorspace = !!m_ColorSpace;
+// image->pdfium_use_colorspace = !!m_ColorSpace;
if (!parameters.nb_tile_to_decode) {
if (!opj_set_decode_area(l_codec, image, parameters.DA_x0, parameters.DA_y0,
diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp
--- chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp 2016-09-12 13:47:03.207588950 +0200
@@ -10,10 +10,7 @@
#include "core/fxcodec/include/fx_codec.h"
#include "core/fxge/include/fx_dib.h"
-extern "C" {
-#undef FAR
-#include "third_party/libpng16/png.h"
-}
+#include <png.h>
static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) {
if (png_get_error_ptr(png_ptr)) {
diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp
--- chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp 2016-09-12 13:47:03.206588962 +0200
@@ -9,7 +9,7 @@
#include "core/fxge/include/fx_dib.h"
extern "C" {
-#include "third_party/libtiff/tiffiop.h"
+#include <tiffio.h>
}
class CCodec_TiffContext {
@@ -139,7 +139,7 @@ TIFF* tiff_open(void* context, const cha
tiff_write, tiff_seek, tiff_close, tiff_get_size,
tiff_map, tiff_unmap);
if (tif) {
- tif->tif_fd = (int)(intptr_t)context;
+ (void)TIFFSetFileno(tif, (int)(intptr_t)context);
}
return tif;
}
diff -up chromium-54.0.2840.16/third_party/pdfium/skia/BUILD.gn.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/skia/BUILD.gn
--- chromium-54.0.2840.16/third_party/pdfium/skia/BUILD.gn.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/skia/BUILD.gn 2016-09-12 13:47:03.206588962 +0200
@@ -355,7 +355,7 @@ component("skia") {
deps = [
":skia_opts",
- "../third_party:fx_zlib",
+ "//third_party/zlib:zlib",
]
if (is_linux) {
diff -up chromium-54.0.2840.16/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/third_party/BUILD.gn
--- chromium-54.0.2840.16/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng 2016-09-12 13:47:03.207588950 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/third_party/BUILD.gn 2016-09-12 13:56:06.995752607 +0200
@@ -5,6 +5,7 @@
import("//build/config/arm.gni")
import("//build_overrides/build.gni")
import("../pdfium.gni")
+import("//build/config/linux/pkg_config.gni")
group("third_party") {
deps = [
@@ -267,197 +267,34 @@ static_library("jpeg") {
]
}
-config("fx_libopenjpeg_warnings") {
- visibility = [ ":*" ]
- if (is_win) {
- cflags = [
- # Signed/unsigned comparisons.
- "/wd4018",
- ]
- }
+pkg_config("openjpeg_config") {
+ packages = [
+ "libopenjp2",
+ ]
}
-static_library("fx_libopenjpeg") {
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- "//build/config/compiler:no_chromium_code",
- ":pdfium_third_party_config",
-
- # Must be after no_chromium_code for warning flags to be ordered correctly.
- ":fx_libopenjpeg_warnings",
- ]
- sources = [
- "libopenjpeg20/bio.c",
- "libopenjpeg20/cio.c",
- "libopenjpeg20/dwt.c",
- "libopenjpeg20/event.c",
- "libopenjpeg20/function_list.c",
- "libopenjpeg20/image.c",
- "libopenjpeg20/invert.c",
- "libopenjpeg20/j2k.c",
- "libopenjpeg20/jp2.c",
- "libopenjpeg20/mct.c",
- "libopenjpeg20/mqc.c",
- "libopenjpeg20/openjpeg.c",
- "libopenjpeg20/opj_clock.c",
- "libopenjpeg20/pi.c",
- "libopenjpeg20/raw.c",
- "libopenjpeg20/t1.c",
- "libopenjpeg20/t2.c",
- "libopenjpeg20/tcd.c",
- "libopenjpeg20/tgt.c",
- ]
+source_set("fx_libopenjpeg") {
+ public_configs = [ ":openjpeg_config" ]
}
-static_library("fx_lpng") {
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- "//build/config/compiler:no_chromium_code",
- ":pdfium_third_party_config",
+pkg_config("fx_libpng_config") {
+ packages = [
+ "libpng",
]
- sources = [
- "libpng16/png.c",
- "libpng16/png.h",
- "libpng16/pngconf.h",
- "libpng16/pngdebug.h",
- "libpng16/pngerror.c",
- "libpng16/pngget.c",
- "libpng16/pnginfo.h",
- "libpng16/pnglibconf.h",
- "libpng16/pngmem.c",
- "libpng16/pngpread.c",
- "libpng16/pngprefix.h",
- "libpng16/pngpriv.h",
- "libpng16/pngread.c",
- "libpng16/pngrio.c",
- "libpng16/pngrtran.c",
- "libpng16/pngrutil.c",
- "libpng16/pngset.c",
- "libpng16/pngstruct.h",
- "libpng16/pngtrans.c",
- "libpng16/pngwio.c",
- "libpng16/pngwrite.c",
- "libpng16/pngwtran.c",
- "libpng16/pngwutil.c",
- ]
-
- defines = []
- cflags = []
-
- if (current_cpu == "x86" || current_cpu == "x64") {
- sources += [
- "libpng16/contrib/intel/filter_sse2_intrinsics.c",
- "libpng16/contrib/intel/intel_init.c",
- ]
- defines += [ "PNG_INTEL_SSE_OPT=1" ]
- } else if ((current_cpu == "arm" || current_cpu == "arm64") && arm_use_neon) {
- sources += [
- "libpng16/arm/arm_init.c",
- "libpng16/arm/filter_neon_intrinsics.c",
- ]
- defines += [
- "PNG_ARM_NEON_OPT=2",
- "PNG_ARM_NEON_IMPLEMENTATION=1",
- ]
- }
-
- if (is_win) {
- # Unary minus applied to unsigned type.
- cflags += [ "/wd4146" ]
- }
}
-if (pdf_enable_xfa) {
- static_library("fx_tiff") {
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- "//build/config/compiler:no_chromium_code",
- ":pdfium_third_party_config",
- ]
- if (is_win) {
- # Need to undefine the macro since it is redefined in
- # tif_ojpeg.c and tif_jpeg.c.
- configs -= [ "//build/config/win:lean_and_mean" ]
- }
- deps = [
- "//third_party:jpeg",
- ]
- sources = [
- "libtiff/tif_aux.c",
- "libtiff/tif_close.c",
- "libtiff/tif_codec.c",
- "libtiff/tif_color.c",
- "libtiff/tif_compress.c",
- "libtiff/tif_dir.c",
- "libtiff/tif_dirinfo.c",
- "libtiff/tif_dirread.c",
- "libtiff/tif_dirwrite.c",
- "libtiff/tif_dumpmode.c",
- "libtiff/tif_error.c",
- "libtiff/tif_extension.c",
- "libtiff/tif_fax3.c",
- "libtiff/tif_fax3sm.c",
- "libtiff/tif_flush.c",
- "libtiff/tif_getimage.c",
- "libtiff/tif_jpeg.c",
- "libtiff/tif_luv.c",
- "libtiff/tif_lzw.c",
- "libtiff/tif_next.c",
- "libtiff/tif_ojpeg.c",
- "libtiff/tif_open.c",
- "libtiff/tif_packbits.c",
- "libtiff/tif_pixarlog.c",
- "libtiff/tif_predict.c",
- "libtiff/tif_print.c",
- "libtiff/tif_read.c",
- "libtiff/tif_strip.c",
- "libtiff/tif_swab.c",
- "libtiff/tif_thunder.c",
- "libtiff/tif_tile.c",
- "libtiff/tif_version.c",
- "libtiff/tif_warning.c",
- "libtiff/tif_write.c",
- "libtiff/tif_zip.c",
- "libtiff/tiffiop.h",
- "libtiff/tiffvers.h",
- ]
- }
+source_set("fx_lpng") {
+ public_configs = [ ":fx_libpng_config" ]
}
-# TODO(dsinclair): Remove if fixed upstream. https://crbug.com/507712
-config("fx_zlib_warnings") {
- visibility = [ ":*" ]
- if (is_clang) {
- cflags = [ "-Wno-shift-negative-value" ]
- }
+config("fx_tiff_config") {
+ libs = [ "tiff" ]
}
-static_library("fx_zlib") {
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- "//build/config/compiler:no_chromium_code",
- ":pdfium_third_party_config",
-
- # Must be after no_chromium_code for warning flags to be ordered correctly.
- ":fx_zlib_warnings",
- ]
- sources = [
- "zlib_v128/adler32.c",
- "zlib_v128/compress.c",
- "zlib_v128/crc32.c",
- "zlib_v128/deflate.c",
- "zlib_v128/gzclose.c",
- "zlib_v128/gzlib.c",
- "zlib_v128/gzread.c",
- "zlib_v128/gzwrite.c",
- "zlib_v128/infback.c",
- "zlib_v128/inffast.c",
- "zlib_v128/inflate.c",
- "zlib_v128/inftrees.c",
- "zlib_v128/trees.c",
- "zlib_v128/uncompr.c",
- "zlib_v128/zutil.c",
- ]
+if (pdf_enable_xfa) {
+ source_set("fx_tiff") {
+ public_configs = [ ":fx_tiff_config" ]
+ }
}
# Can not be a static library due to lack of .cc files.
diff -up chromium-54.0.2840.16/third_party/pdfium/third_party/third_party.gyp.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/third_party/third_party.gyp
--- chromium-54.0.2840.16/third_party/pdfium/third_party/third_party.gyp.pdfium-system-libtiff-libpng 2016-09-09 00:03:49.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/third_party/third_party.gyp 2016-09-12 13:57:09.603965515 +0200
@@ -156,6 +156,47 @@
},
},
{
+ 'target_name': 'fx_lpng',
+ 'type': 'none',
+ 'dependencies': [
+ '../../zlib/zlib.gyp:zlib',
+ ],
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags libpng)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other libpng)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l libpng)',
+ ],
+ },
+ },
+ {
+ 'target_name': 'fx_tiff',
+ 'type': 'none',
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'USE_SYSTEM_LIBTIFF',
+ ],
+ 'conditions': [
+ ['os_bsd==1', {
+ 'include_dirs': [
+ '/usr/local/include',
+ ],
+ }],
+ ],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '-ltiff',
+ ],
+ },
+ },
+ {
'target_name': 'libjpeg',
'type': 'static_library',
'sources': [
@@ -265,65 +306,6 @@
],
},
{
- 'target_name': 'fx_lpng',
- 'type': 'static_library',
- 'sources': [
- 'libpng16/png.c',
- 'libpng16/png.h',
- 'libpng16/pngconf.h',
- 'libpng16/pngdebug.h',
- 'libpng16/pngerror.c',
- 'libpng16/pngget.c',
- 'libpng16/pnginfo.h',
- 'libpng16/pnglibconf.h',
- 'libpng16/pngmem.c',
- 'libpng16/pngpread.c',
- 'libpng16/pngprefix.h',
- 'libpng16/pngpriv.h',
- 'libpng16/pngread.c',
- 'libpng16/pngrio.c',
- 'libpng16/pngrtran.c',
- 'libpng16/pngrutil.c',
- 'libpng16/pngset.c',
- 'libpng16/pngstruct.h',
- 'libpng16/pngtrans.c',
- 'libpng16/pngwio.c',
- 'libpng16/pngwrite.c',
- 'libpng16/pngwtran.c',
- 'libpng16/pngwutil.c',
- ],
- 'msvs_disabled_warnings': [
- 4146, # Unary minus applied to unsigned type.
- # Warnings about conversion from 'size_t' to 'long', possible loss of
- # data.
- 4267,
- ],
- 'conditions': [
- # SSE optimizations
- [ 'target_arch=="ia32" or target_arch=="x64"', {
- 'defines': [
- 'PNG_INTEL_SSE_OPT=1',
- ],
- 'sources': [
- 'libpng16/contrib/intel/intel_init.c',
- 'libpng16/contrib/intel/filter_sse2_intrinsics.c',
- ],
- }],
-
- # ARM optimizations
- [ '(target_arch=="arm" or target_arch=="arm64") and OS!="ios" and arm_neon==1', {
- 'defines': [
- 'PNG_ARM_NEON_OPT=2',
- 'PNG_ARM_NEON_IMPLEMENTATION=1',
- ],
- 'sources': [
- 'libpng16/arm/arm_init.c',
- 'libpng16/arm/filter_neon_intrinsics.c',
- ],
- }],
- ],
- },
- {
'target_name': 'fx_zlib',
'type': 'static_library',
'sources': [
@@ -380,62 +362,6 @@
},
],
'conditions': [
- ['pdf_enable_xfa==1', {
- 'targets': [
- {
- 'target_name': 'fx_tiff',
- 'type': 'static_library',
- 'sources': [
- 'libtiff/tiffiop.h',
- 'libtiff/tiffvers.h',
- 'libtiff/tif_aux.c',
- 'libtiff/tif_close.c',
- 'libtiff/tif_codec.c',
- 'libtiff/tif_color.c',
- 'libtiff/tif_compress.c',
- 'libtiff/tif_dir.c',
- 'libtiff/tif_dirinfo.c',
- 'libtiff/tif_dirread.c',
- 'libtiff/tif_dirwrite.c',
- 'libtiff/tif_dumpmode.c',
- 'libtiff/tif_error.c',
- 'libtiff/tif_extension.c',
- 'libtiff/tif_fax3.c',
- 'libtiff/tif_fax3sm.c',
- 'libtiff/tif_flush.c',
- 'libtiff/tif_getimage.c',
- 'libtiff/tif_jpeg.c',
- 'libtiff/tif_luv.c',
- 'libtiff/tif_lzw.c',
- 'libtiff/tif_next.c',
- 'libtiff/tif_ojpeg.c',
- 'libtiff/tif_open.c',
- 'libtiff/tif_packbits.c',
- 'libtiff/tif_pixarlog.c',
- 'libtiff/tif_predict.c',
- 'libtiff/tif_print.c',
- 'libtiff/tif_read.c',
- 'libtiff/tif_strip.c',
- 'libtiff/tif_swab.c',
- 'libtiff/tif_thunder.c',
- 'libtiff/tif_tile.c',
- 'libtiff/tif_version.c',
- 'libtiff/tif_warning.c',
- 'libtiff/tif_write.c',
- 'libtiff/tif_zip.c',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'defines!': [
- # Need to undefine the macro since it is redefined in
- # tif_ojpeg.c and tif_jpeg.c.
- 'WIN32_LEAN_AND_MEAN',
- ],
- }],
- ],
- },
- ],
- }],
['pdf_use_skia!=1', {
'targets': [
{
Reference in a new issue Copy permalink