Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b51cf9b4e2869bad330003b9550494065ea0f580
commit b51cf9b4e2869bad330003b9550494065ea0f580 Author: DeX77 <[email protected]> Date: Thu Jul 27 12:04:12 2017 +0200 chromium-browser-60.0.3112.78-1-x86_64 * version bump diff --git a/source/xapps-extra/chromium-browser/FrugalBuild b/source/xapps-extra/chromium-browser/FrugalBuild index 8162ce5..c048283 100644 --- a/source/xapps-extra/chromium-browser/FrugalBuild +++ b/source/xapps-extra/chromium-browser/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Marius Cirsta <[email protected]> pkgname=chromium-browser -pkgver=59.0.3071.86 -pkgrel=4 +pkgver=60.0.3112.78 +pkgrel=1 pkgdesc='Development version of Chromium browser' url='http://www.chromium.org/' depends=('nss>=3.21-3' 'libxscrnsaver>=1.2.2-2' 'libpulse>=7.1-4' 'snappy>=1.1.6' 'libcups' \ 'speech-dispatcher>=0.7.1-4' 'libxtst>=1.2.2-2' 'pango' 'ffmpeg>=3.3.2' 'atk' 'libxkbcommon' \ - 'libatomic' 'pciutils>=3.5' 'gtk+3' 'libxslt' 'libwebp' 'icu4c>=58.1' 'libwebp>=0.6.0' 'libdrm') + 'libatomic' 'pciutils>=3.5' 'gtk+3' 'libxslt' 'icu4c>=58.1' 'libwebp>=0.6.0-3' 'libdrm') #using the built in ones for now #depends+=('libevent>=2.0.22-3' 'libjpeg>=9a') makedepends=('ninja' 'clang>=3.7.0-3' 'yasm' 'libexif' 'gperf' 'libpthread-stubs' 'x11-protos' 'krb5' 'cups' 'gtk+2'\ @@ -25,28 +25,22 @@ up2date="lynx -dump 'http://chromium.woolyss.com/#stable-chromium-version' | \ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${pkgver}.tar.xz \ $pkgname.desktop \ $pkgname.sh \ - chromium-gn-bootstrap-r2.patch \ - chromium-system-ffmpeg-r6.patch \ + chromium-gn-bootstrap-r8.patch \ chromium-last-commit-position-r1.patch \ gcc6-no-delete-null-pointer-checks.patch \ chromium-46.0.2490.86-use_system_opus.patch \ chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch \ chromium-58.0.3029.81-use_system_harfbuzz.patch \ - chromium-54.0.2840.59-nullfix.patch \ - fix-compile-error-linux-dma-buf-has-no-such-defines-2.patch \ chromium-widevine.patch ) -sha1sums=('b700714b7830ca4133616d51a77a30430133b341' \ +sha1sums=('10e6a8036ee90193480b27d2c08a0513abb613a4' \ '264b8e7c4e3273263d504e041e5e4d152677922c' \ '4c41d59b4d85a9f0443d6ca1dec456e50059dab5' \ - 'b25a672de974efc34429ce6f7ec14b8ed9d250f8' \ - 'c5ffc64e60004c2e87ba0869b02ae5cf9a8f0c55' \ + '5df4ceb98525444542a96d5456157d76381f6b64' \ 'd03e6465cd5a84580f9dad5d45f24ccd42bb71e6' \ '0fa01f6ac92d4616cdc74073952ada2259be1d70' \ 'd6d09996ff5ff4d796cf26f239eb2b688e017d25' \ 'af663b4b7a7a9e6f0075c4f60f0b4310a77d2d89' \ '38b79bdb506d7b186b1c909ffd9f7366e1f56cd7' \ - 'a3e76fd3e890eabab86d14fc41ca9b17b03317e4' \ - '0b811a212fb9ed67b7e3e27a76dca9932699640f' \ 'c5719d06e0b39dfd3ca74f9f42684f4ee7584ade') chromium_path="chromium" @@ -205,6 +199,14 @@ build() { 'third_party/swiftshader/third_party/llvm-subzero' \ 'native_client/src/third_party/dlmalloc' \ 'native_client_sdk/src/libraries/third_party/newlib-extras' \ + 'third_party/googletest' \ + 'third_party/skia/third_party/vulkan' \ + 'third_party/vulkan' \ + 'third_party/vulkan-validation-layers' \ + 'third_party/glslang-angle' \ + 'third_party/spirv-tools-angle' \ + 'third_party/spirv-headers' \ + 'third_party/catapult/tracing/third_party/oboe' \ --do-remove diff --git a/source/xapps-extra/chromium-browser/chromium-54.0.2840.59-nullfix.patch b/source/xapps-extra/chromium-browser/chromium-54.0.2840.59-nullfix.patch deleted file mode 100644 index 53e2db1..0000000 --- a/source/xapps-extra/chromium-browser/chromium-54.0.2840.59-nullfix.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.nullfix chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn ---- chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.nullfix 2016-10-13 16:49:26.844221023 -0400 -+++ chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn 2016-10-13 16:50:49.882605484 -0400 -@@ -31,6 +31,7 @@ gcc_toolchain("arm") { - ld = cxx - readelf = "${toolprefix}readelf" - nm = "${toolprefix}nm" -+ extra_cppflags = "-fno-delete-null-pointer-checks" - - toolchain_args = { - current_cpu = "arm" -@@ -70,6 +71,7 @@ gcc_toolchain("x86") { - nm = "nm" - ar = "ar" - ld = cxx -+ extra_cppflags = "-fno-delete-null-pointer-checks" - - toolchain_args = { - current_cpu = "x86" -@@ -109,6 +111,7 @@ gcc_toolchain("x64") { - nm = "nm" - ar = "ar" - ld = cxx -+ extra_cppflags = "-fno-delete-null-pointer-checks" - - toolchain_args = { - current_cpu = "x64" -@@ -131,6 +134,7 @@ gcc_toolchain("mipsel") { - ld = cxx - readelf = "mipsel-linux-gnu-readelf" - nm = "mipsel-linux-gnu-nm" -+ extra_cppflags = "-fno-delete-null-pointer-checks" - - toolchain_args = { - cc_wrapper = "" diff --git a/source/xapps-extra/chromium-browser/chromium-gn-bootstrap-r2.patch b/source/xapps-extra/chromium-browser/chromium-gn-bootstrap-r2.patch deleted file mode 100644 index 76287e1..0000000 --- a/source/xapps-extra/chromium-browser/chromium-gn-bootstrap-r2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tools/gn/bootstrap/bootstrap.py -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 38cfb117d29c3895291379f00d8dc8c8b0727474..679170e610f8292bcbeb76508fd247d322a69c79 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/base_switches.cc', - 'base/build_time.cc', - 'base/callback_internal.cc', -+ 'base/callback_helpers.cc', - 'base/command_line.cc', - 'base/debug/activity_tracker.cc', - 'base/debug/alias.cc', diff --git a/source/xapps-extra/chromium-browser/chromium-gn-bootstrap-r8.patch b/source/xapps-extra/chromium-browser/chromium-gn-bootstrap-r8.patch new file mode 100644 index 0000000..d9f389a --- /dev/null +++ b/source/xapps-extra/chromium-browser/chromium-gn-bootstrap-r8.patch @@ -0,0 +1,13 @@ +Index: tools/gn/bootstrap/bootstrap.py +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/sys_info.cc', + 'base/task_runner.cc', + 'base/task_scheduler/delayed_task_manager.cc', ++ 'base/task_scheduler/environment_config.cc', + 'base/task_scheduler/post_task.cc', + 'base/task_scheduler/priority_queue.cc', + 'base/task_scheduler/scheduler_lock_impl.cc', diff --git a/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r6.patch b/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r6.patch deleted file mode 100644 index d2e0157..0000000 --- a/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r6.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/media/ffmpeg/ffmpeg_common.h.orig 2017-04-07 18:17:22.623538889 +0000 -+++ b/media/ffmpeg/ffmpeg_common.h 2017-04-07 18:18:16.780656283 +0000 -@@ -23,10 +23,12 @@ - - // Include FFmpeg header files. - extern "C" { -+#if !defined(USE_SYSTEM_FFMPEG) - // Disable deprecated features which result in spammy compile warnings. This - // list of defines must mirror those in the 'defines' section of FFmpeg's - // BUILD.gn file or the headers below will generate different structures! - #define FF_API_CONVERGENCE_DURATION 0 -+#endif // !defined(USE_SYSTEM_FFMPEG) - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, -@@ -40,7 +42,9 @@ - MSVC_PUSH_DISABLE_WARNING(4244); - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> -+#if !defined(USE_SYSTEM_FFMPEG) - #include <libavformat/internal.h> -+#endif // !defined(USE_SYSTEM_FFMPEG) - #include <libavformat/avio.h> - #include <libavutil/avutil.h> - #include <libavutil/imgutils.h> ---- a/media/filters/ffmpeg_demuxer.cc.orig 2017-04-07 18:15:14.776901183 +0000 -+++ b/media/filters/ffmpeg_demuxer.cc 2017-04-07 18:15:54.813727201 +0000 -@@ -1223,6 +1223,7 @@ - // If no estimate is found, the stream entry will be kInfiniteDuration. - std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, - kInfiniteDuration); -+#if !defined(USE_SYSTEM_FFMPEG) - const AVFormatInternal* internal = format_context->internal; - if (internal && internal->packet_buffer && - format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { -@@ -1246,6 +1247,7 @@ - packet_buffer = packet_buffer->next; - } - } -+#endif // !defined(USE_SYSTEM_FFMPEG) - - std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); - diff --git a/source/xapps-extra/chromium-browser/fix-compile-error-linux-dma-buf-has-no-such-defines-2.patch b/source/xapps-extra/chromium-browser/fix-compile-error-linux-dma-buf-has-no-such-defines-2.patch deleted file mode 100644 index bcfc9ee..0000000 --- a/source/xapps-extra/chromium-browser/fix-compile-error-linux-dma-buf-has-no-such-defines-2.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -Naur chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc chromium-59.0.3071.86-p/ui/gfx/linux/client_native_pixmap_dmabuf.cc ---- chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc 2017-06-05 21:03:30.000000000 +0200 -+++ chromium-59.0.3071.86-p/ui/gfx/linux/client_native_pixmap_dmabuf.cc 2017-06-07 12:47:05.469069729 +0200 -@@ -24,16 +24,16 @@ - __u64 flags; - }; - --#define LOCAL_DMA_BUF_SYNC_READ (1 << 0) --#define LOCAL_DMA_BUF_SYNC_WRITE (2 << 0) --#define LOCAL_DMA_BUF_SYNC_RW \ -- (LOCAL_DMA_BUF_SYNC_READ | LOCAL_DMA_BUF_SYNC_WRITE) --#define LOCAL_DMA_BUF_SYNC_START (0 << 2) --#define LOCAL_DMA_BUF_SYNC_END (1 << 2) -- --#define LOCAL_DMA_BUF_BASE 'b' --#define LOCAL_DMA_BUF_IOCTL_SYNC \ -- _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync) -+#define DMA_BUF_SYNC_READ (1 << 0) -+#define DMA_BUF_SYNC_WRITE (2 << 0) -+#define DMA_BUF_SYNC_RW \ -+ (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE) -+#define DMA_BUF_SYNC_START (0 << 2) -+#define DMA_BUF_SYNC_END (1 << 2) -+ -+#define DMA_BUF_BASE 'b' -+#define DMA_BUF_IOCTL_SYNC \ -+ _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) - - #else - #include <linux/dma-buf.h> -@@ -44,24 +44,24 @@ - namespace { - - void PrimeSyncStart(int dmabuf_fd) { -- struct local_dma_buf_sync sync_start = {0}; -+ struct dma_buf_sync sync_start = {0}; - -- sync_start.flags = LOCAL_DMA_BUF_SYNC_START | LOCAL_DMA_BUF_SYNC_RW; -+ sync_start.flags = DMA_BUF_SYNC_START | DMA_BUF_SYNC_RW; - #if DCHECK_IS_ON() - int rv = - #endif -- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_start); -+ drmIoctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_start); - DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START"; - } - - void PrimeSyncEnd(int dmabuf_fd) { -- struct local_dma_buf_sync sync_end = {0}; -+ struct dma_buf_sync sync_end = {0}; - -- sync_end.flags = LOCAL_DMA_BUF_SYNC_END | LOCAL_DMA_BUF_SYNC_RW; -+ sync_end.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_RW; - #if DCHECK_IS_ON() - int rv = - #endif -- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_end); -+ drmIoctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_end); - DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END"; - } - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
