Tom Callaway
8 years ago
parent
2fd8ecc863
commit
0df9641b97
@ -0,0 +1,11 @@
|
|||||||
|
diff -up chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c.timefix chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c
|
||||||
|
--- chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c.timefix 2016-09-06 15:20:06.094396255 -0400
|
||||||
|
+++ chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c 2016-09-06 15:20:16.893187930 -0400
|
||||||
|
@@ -56,6 +56,7 @@
|
||||||
|
* [including the GNU Public Licence.] */
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
+#include <time.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
@ -0,0 +1,252 @@
|
|||||||
|
diff -up chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn
|
||||||
|
--- chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn.gnsystem 2016-09-06 13:27:56.018365168 -0400
|
||||||
|
+++ chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn 2016-09-06 13:27:56.018365168 -0400
|
||||||
|
@@ -0,0 +1,9 @@
|
||||||
|
+# Copyright 2016 The Chromium Authors. All rights reserved.
|
||||||
|
+# Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+# found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+source_set("libjpeg") {
|
||||||
|
+ libs = [
|
||||||
|
+ "jpeg",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff -up chromium-53.0.2785.92/build/linux/unbundle/libpng.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libpng.gn
|
||||||
|
--- chromium-53.0.2785.92/build/linux/unbundle/libpng.gn.gnsystem 2016-09-06 13:27:56.018365168 -0400
|
||||||
|
+++ chromium-53.0.2785.92/build/linux/unbundle/libpng.gn 2016-09-06 13:27:56.018365168 -0400
|
||||||
|
@@ -0,0 +1,25 @@
|
||||||
|
+# Copyright 2016 The Chromium Authors. All rights reserved.
|
||||||
|
+# Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+# found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+import("//build/config/linux/pkg_config.gni")
|
||||||
|
+import("//build/shim_headers.gni")
|
||||||
|
+
|
||||||
|
+pkg_config("system_libpng") {
|
||||||
|
+ packages = [ "libpng" ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+shim_headers("libpng_shim") {
|
||||||
|
+ root_path = "include"
|
||||||
|
+ headers = [
|
||||||
|
+ "png.h",
|
||||||
|
+ "pngconf.h",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+source_set("libpng") {
|
||||||
|
+ deps = [
|
||||||
|
+ ":libpng_shim",
|
||||||
|
+ ]
|
||||||
|
+ public_configs = [ ":system_libpng" ]
|
||||||
|
+}
|
||||||
|
diff -up chromium-53.0.2785.92/build/linux/unbundle/libusb.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libusb.gn
|
||||||
|
--- chromium-53.0.2785.92/build/linux/unbundle/libusb.gn.gnsystem 2016-09-06 13:27:56.019365149 -0400
|
||||||
|
+++ chromium-53.0.2785.92/build/linux/unbundle/libusb.gn 2016-09-06 13:27:56.018365168 -0400
|
||||||
|
@@ -0,0 +1,24 @@
|
||||||
|
+# Copyright 2016 The Chromium Authors. All rights reserved.
|
||||||
|
+# Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+# found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+import("//build/config/linux/pkg_config.gni")
|
||||||
|
+import("//build/shim_headers.gni")
|
||||||
|
+
|
||||||
|
+pkg_config("system_libusb") {
|
||||||
|
+ packages = [ "libusb-1.0" ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+shim_headers("libusb_shim") {
|
||||||
|
+ root_path = "src/libusb"
|
||||||
|
+ headers = [
|
||||||
|
+ "libusb.h",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+source_set("libusb") {
|
||||||
|
+ deps = [
|
||||||
|
+ ":libusb_shim",
|
||||||
|
+ ]
|
||||||
|
+ public_configs = [ ":system_libusb" ]
|
||||||
|
+}
|
||||||
|
diff -up chromium-53.0.2785.92/build/linux/unbundle/opus.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/opus.gn
|
||||||
|
--- chromium-53.0.2785.92/build/linux/unbundle/opus.gn.gnsystem 2016-09-06 13:27:56.019365149 -0400
|
||||||
|
+++ chromium-53.0.2785.92/build/linux/unbundle/opus.gn 2016-09-06 13:31:11.546589545 -0400
|
||||||
|
@@ -0,0 +1,161 @@
|
||||||
|
+# Copyright 2016 The Chromium Authors. All rights reserved.
|
||||||
|
+# Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+# found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+import("//build/config/linux/pkg_config.gni")
|
||||||
|
+import("//build/shim_headers.gni")
|
||||||
|
+import("//testing/test.gni")
|
||||||
|
+
|
||||||
|
+pkg_config("system_opus") {
|
||||||
|
+ packages = [ "opus" ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+shim_headers("opus_shim") {
|
||||||
|
+ root_path = "src/include"
|
||||||
|
+ headers = [
|
||||||
|
+ "opus_custom.h",
|
||||||
|
+ "opus_defines.h",
|
||||||
|
+ "opus_multistream.h",
|
||||||
|
+ "opus_types.h",
|
||||||
|
+ "opus.h",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+source_set("opus") {
|
||||||
|
+ deps = [
|
||||||
|
+ ":opus_shim",
|
||||||
|
+ ]
|
||||||
|
+ public_configs = [ ":system_opus" ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+config("opus_test_config") {
|
||||||
|
+ include_dirs = [
|
||||||
|
+ "src/celt",
|
||||||
|
+ "src/silk",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ if (is_win) {
|
||||||
|
+ defines = [ "inline=__inline" ]
|
||||||
|
+ }
|
||||||
|
+ if (is_android) {
|
||||||
|
+ libs = [ "log" ]
|
||||||
|
+ }
|
||||||
|
+ if (is_clang) {
|
||||||
|
+ cflags = [ "-Wno-absolute-value" ]
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+executable("opus_compare") {
|
||||||
|
+ sources = [
|
||||||
|
+ "src/src/opus_compare.c",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ configs -= [ "//build/config/compiler:chromium_code" ]
|
||||||
|
+ configs += [
|
||||||
|
+ "//build/config/compiler:no_chromium_code",
|
||||||
|
+ ":opus_test_config",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ deps = [
|
||||||
|
+ ":opus",
|
||||||
|
+ "//build/config/sanitizers:deps",
|
||||||
|
+ "//build/win:default_exe_manifest",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+executable("opus_demo") {
|
||||||
|
+ sources = [
|
||||||
|
+ "src/src/opus_demo.c",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ configs -= [ "//build/config/compiler:chromium_code" ]
|
||||||
|
+ configs += [
|
||||||
|
+ "//build/config/compiler:no_chromium_code",
|
||||||
|
+ ":opus_test_config",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ deps = [
|
||||||
|
+ ":opus",
|
||||||
|
+ "//build/config/sanitizers:deps",
|
||||||
|
+ "//build/win:default_exe_manifest",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+test("test_opus_api") {
|
||||||
|
+ sources = [
|
||||||
|
+ "src/tests/test_opus_api.c",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ configs -= [ "//build/config/compiler:chromium_code" ]
|
||||||
|
+ configs += [
|
||||||
|
+ "//build/config/compiler:no_chromium_code",
|
||||||
|
+ ":opus_test_config",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ deps = [
|
||||||
|
+ ":opus",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+test("test_opus_encode") {
|
||||||
|
+ sources = [
|
||||||
|
+ "src/tests/test_opus_encode.c",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ configs -= [ "//build/config/compiler:chromium_code" ]
|
||||||
|
+ configs += [
|
||||||
|
+ "//build/config/compiler:no_chromium_code",
|
||||||
|
+ ":opus_test_config",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ deps = [
|
||||||
|
+ ":opus",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+# GN orders flags on a target before flags from configs. The default config
|
||||||
|
+# adds -Wall, and this flag have to be after -Wall -- so they need to
|
||||||
|
+# come from a config and can't be on the target directly.
|
||||||
|
+config("test_opus_decode_config") {
|
||||||
|
+ # test_opus_decode passes a null pointer to opus_decode() for an argument
|
||||||
|
+ # marked as requiring a non-null value by the nonnull function attribute,
|
||||||
|
+ # and expects opus_decode() to fail. Disable the -Wnonnull option to avoid
|
||||||
|
+ # a compilation error if -Werror is specified.
|
||||||
|
+ if (is_posix) {
|
||||||
|
+ cflags = [ "-Wno-nonnull" ]
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+test("test_opus_decode") {
|
||||||
|
+ sources = [
|
||||||
|
+ "src/tests/test_opus_decode.c",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ configs -= [ "//build/config/compiler:chromium_code" ]
|
||||||
|
+ configs += [
|
||||||
|
+ "//build/config/compiler:no_chromium_code",
|
||||||
|
+ ":opus_test_config",
|
||||||
|
+ ":test_opus_decode_config",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ deps = [
|
||||||
|
+ ":opus",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+test("test_opus_padding") {
|
||||||
|
+ sources = [
|
||||||
|
+ "src/tests/test_opus_padding.c",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ configs -= [ "//build/config/compiler:chromium_code" ]
|
||||||
|
+ configs += [
|
||||||
|
+ "//build/config/compiler:no_chromium_code",
|
||||||
|
+ ":opus_test_config",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ deps = [
|
||||||
|
+ ":opus",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
diff -up chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py
|
||||||
|
--- chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py.gnsystem 2016-09-02 15:02:02.000000000 -0400
|
||||||
|
+++ chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py 2016-09-06 13:27:56.020365130 -0400
|
||||||
|
@@ -21,9 +21,13 @@ REPLACEMENTS = {
|
||||||
|
'flac': 'third_party/flac/BUILD.gn',
|
||||||
|
'harfbuzz-ng': 'third_party/harfbuzz-ng/BUILD.gn',
|
||||||
|
'libevent': 'base/third_party/libevent/BUILD.gn',
|
||||||
|
+ 'libjpeg': 'third_party/libjpeg/BUILD.gn',
|
||||||
|
+ 'libpng': 'third_party/libpng/BUILD.gn',
|
||||||
|
+ 'libusb': 'third_party/libusb/BUILD.gn',
|
||||||
|
'libwebp': 'third_party/libwebp/BUILD.gn',
|
||||||
|
'libxml': 'third_party/libxml/BUILD.gn',
|
||||||
|
'libxslt': 'third_party/libxslt/BUILD.gn',
|
||||||
|
+ 'opus': 'third_party/opus/BUILD.gn',
|
||||||
|
'snappy': 'third_party/snappy/BUILD.gn',
|
||||||
|
'yasm': 'third_party/yasm/yasm_assemble.gni',
|
||||||
|
'zlib': 'third_party/zlib/BUILD.gn',
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
diff -up chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix chromium-53.0.2785.92/tools/gn/BUILD.gn
|
||||||
|
--- chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix 2016-09-06 13:50:17.540459136 -0400
|
||||||
|
+++ chromium-53.0.2785.92/tools/gn/BUILD.gn 2016-09-06 13:50:27.380269110 -0400
|
||||||
|
@@ -259,7 +259,6 @@ executable("gn") {
|
||||||
|
|
||||||
|
deps = [
|
||||||
|
":gn_lib",
|
||||||
|
- ":last_commit_position",
|
||||||
|
"//base",
|
||||||
|
"//build/config/sanitizers:deps",
|
||||||
|
"//build/win:default_exe_manifest",
|
||||||
|
diff -up chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix chromium-53.0.2785.92/tools/gn/gn_main.cc
|
||||||
|
--- chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix 2016-09-06 13:49:34.620288177 -0400
|
||||||
|
+++ chromium-53.0.2785.92/tools/gn/gn_main.cc 2016-09-06 13:49:47.316042652 -0400
|
||||||
|
@@ -12,13 +12,7 @@
|
||||||
|
#include "tools/gn/standard_out.h"
|
||||||
|
#include "tools/gn/switches.h"
|
||||||
|
|
||||||
|
-// Only the GN-generated build makes this header for now.
|
||||||
|
-// TODO(brettw) consider adding this if we need it in GYP.
|
||||||
|
-#if defined(GN_BUILD)
|
||||||
|
-#include "tools/gn/last_commit_position.h"
|
||||||
|
-#else
|
||||||
|
#define LAST_COMMIT_POSITION "UNKNOWN"
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
@ -1,3 +1,3 @@
|
|||||||
49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
|
49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
|
||||||
5d68885e80dec938f68f033a51639e57 chromium-52.0.2743.116-clean.tar.xz
|
8280c0644492bac9f59f4e25ed11d309 policy_templates.zip
|
||||||
c0a1a388c4fb32be8e4afb5ace9e801a policy_templates.zip
|
40aa0cc4407dc8a198aedc29532abeee chromium-53.0.2785.92-clean.tar.xz
|
||||||
|
|||||||
Loading…
Reference in new issue