Date: Thu, 18 Jul 2013 22:06:21 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323258 - in head/www/chromium: . files Message-ID: <201307182206.r6IM6LCe088706@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Thu Jul 18 22:06:21 2013 New Revision: 323258 URL: http://svnweb.freebsd.org/changeset/ports/323258 Log: - Update to 28.0.1500.71 [1] - Limit to python 2.X [2] - Convert to USES=gmake - Drop dependency on libspeechd, enable webrtc [3] - Use GCC 4.6+ again [4] Submitted by: George Liaskos [1,3] eadler [2] Discussed with: George Liaskos [4] Security: http://vuxml.org/freebsd/3b80104f-e96c-11e2-8bac-00262d5ed8ee.html [1] Added: head/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc (contents, props changed) head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc (contents, props changed) head/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h (contents, props changed) head/www/chromium/files/patch-net__third_party__nss__ssl__bodge__secitem_array.c (contents, props changed) head/www/chromium/files/patch-ppapi__proxy__pdf_resource.cc (contents, props changed) head/www/chromium/files/patch-third_party__WebKit__Source__WebKit__chromium__WebKit.gyp (contents, props changed) head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp__core.gyp (contents, props changed) head/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi (contents, props changed) head/www/chromium/files/patch-third_party__WebKit__Source__wtf__NumberOfCores.cpp (contents, props changed) head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp (contents, props changed) head/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc (contents, props changed) head/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc (contents, props changed) head/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h (contents, props changed) head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__build__common.gypi (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h (contents, props changed) head/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp (contents, props changed) head/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp (contents, props changed) head/www/chromium/files/patch-ui__gl__gl.gyp (contents, props changed) Deleted: head/www/chromium/files/patch-chrome__common__omaha_query_params.cc head/www/chromium/files/patch-skia__ext__SkThread_chrome.cc head/www/chromium/files/patch-third_party__WebKit__Source__ThirdParty__gyp__test__additional-targets__src__dir1__actions.gyp head/www/chromium/files/patch-third_party__WebKit__Source__ThirdParty__gyp__test__library__src__library.gyp head/www/chromium/files/patch-third_party__WebKit__Source__WTF__wtf__NumberOfCores.cpp head/www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h head/www/chromium/files/patch-third_party__libyuv__source__row_posix.cc head/www/chromium/files/patch-ui__surface__transport_dib_linux.cc Modified: head/www/chromium/Makefile head/www/chromium/distinfo head/www/chromium/files/extra-patch-gcc head/www/chromium/files/patch-chrome__chrome_browser.gypi head/www/chromium/files/patch-content__app__content_main_runner.cc head/www/chromium/files/patch-content__content_gpu.gypi head/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc head/www/chromium/files/patch-third_party__libusb__libusb.gyp head/www/chromium/pkg-plist Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Thu Jul 18 21:52:19 2013 (r323257) +++ head/www/chromium/Makefile Thu Jul 18 22:06:21 2013 (r323258) @@ -1,9 +1,11 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> # $FreeBSD$ +#TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 + PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 27.0.1453.116 +DISTVERSION= 28.0.1500.71 CATEGORIES= www MASTER_SITES= http://download.goodking.org/downloads/ \ ftp://rene-ladan.nl/pub/distfiles/ \ @@ -34,7 +36,6 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/ cups:${PORTSDIR}/print/cups-client \ event-1:${PORTSDIR}/devel/libevent \ gcrypt:${PORTSDIR}/security/libgcrypt \ - speechd:${PORTSDIR}/accessibility/speech-dispatcher \ pci:${PORTSDIR}/devel/libpci RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ @@ -42,10 +43,9 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l ONLY_FOR_ARCHS= i386 amd64 USE_XZ= yes -USES= bison pkgconfig desktop-file-utils -USE_GMAKE= yes +USES= bison gmake desktop-file-utils pkgconfig USE_PERL5_BUILD= yes -USE_PYTHON_BUILD= 2.6+ +USE_PYTHON_BUILD= 2.6-2.7 USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= glib20 gtk20 dconf libxslt MAN1= chrome.1 @@ -64,10 +64,10 @@ GYP_DEFINES+= use_cups=1 \ linux_strip_binary=1 \ linux_use_tcmalloc=0 \ linux_use_heapchecker=0 \ - linux_link_libspeechd=1 \ + test_isolation_mode=noop \ clang_use_chrome_plugins=0 \ disable_nacl=1 \ - enable_webrtc=0 \ + enable_webrtc=1 \ enable_openmax=1 \ enable_one_click_signin=1 \ no_gc_sections=1 \ @@ -92,7 +92,7 @@ OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO CODECS_DESC= Compile and enable patented codecs like H.264 CLANG_DESC= Build Chromium with Clang instead of GCC 4.6+ -OPTIONS_DEFAULT= CODECS GCONF CLANG +OPTIONS_DEFAULT= CODECS GCONF .include <bsd.port.options.mk> @@ -145,6 +145,7 @@ MAKE_ENV+= V=1 BUILDTYPE= Debug .else BUILDTYPE= Release +GYP_DEFINES+= buildtype=Official .endif MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ @@ -168,7 +169,6 @@ post-patch: ${WRKSRC}/base/base.gypi \ ${WRKSRC}/build/common.gypi \ ${WRKSRC}/third_party/libvpx/libvpx.gyp \ - ${WRKSRC}/third_party/WebKit/Source/WebCore/plugins/PluginDatabase.cpp \ ${WRKSRC}/crypto/crypto.gyp \ ${WRKSRC}/v8/tools/gyp/v8.gyp \ ${WRKSRC}/v8/build/common.gypi @@ -200,7 +200,7 @@ do-install: .for p in chrome chrome_100_percent content_resources resources ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${DATADIR} .endfor -.for f in chrome libffmpegsumo.so mksnapshot protoc +.for f in chrome libffmpegsumo.so protoc ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${DATADIR} .endfor cd ${WRKSRC}/out/${BUILDTYPE} && \ Modified: head/www/chromium/distinfo ============================================================================== --- head/www/chromium/distinfo Thu Jul 18 21:52:19 2013 (r323257) +++ head/www/chromium/distinfo Thu Jul 18 22:06:21 2013 (r323258) @@ -1,2 +1,2 @@ -SHA256 (chromium-courgette-redacted-27.0.1453.116.tar.xz) = 14ca1fe1011c17ee1f04e4ea8879842261a5f480d69f88e4de1a3f7f155db7c8 -SIZE (chromium-courgette-redacted-27.0.1453.116.tar.xz) = 153169788 +SHA256 (chromium-courgette-redacted-28.0.1500.71.tar.xz) = f09685127415637a1b0fb22797f95039bb97366428e2e2ce3da888cbac7efdec +SIZE (chromium-courgette-redacted-28.0.1500.71.tar.xz) = 156550816 Modified: head/www/chromium/files/extra-patch-gcc ============================================================================== --- head/www/chromium/files/extra-patch-gcc Thu Jul 18 21:52:19 2013 (r323257) +++ head/www/chromium/files/extra-patch-gcc Thu Jul 18 22:06:21 2013 (r323258) @@ -1,5 +1,5 @@ ---- base/shared_memory.h.orig 2011-04-01 21:54:26.066717848 +0300 -+++ base/shared_memory.h 2011-04-01 21:55:14.292717813 +0300 +--- base/memory/shared_memory.h.orig 2011-04-01 21:54:26.066717848 +0300 ++++ base/memory/shared_memory.h 2011-04-01 21:55:14.292717813 +0300 @@ -10,6 +10,7 @@ #if defined(OS_POSIX) Modified: head/www/chromium/files/patch-chrome__chrome_browser.gypi ============================================================================== --- head/www/chromium/files/patch-chrome__chrome_browser.gypi Thu Jul 18 21:52:19 2013 (r323257) +++ head/www/chromium/files/patch-chrome__chrome_browser.gypi Thu Jul 18 22:06:21 2013 (r323258) @@ -1,6 +1,6 @@ ---- chrome/chrome_browser.gypi.orig 2013-04-30 10:22:08.000000000 +0300 -+++ chrome/chrome_browser.gypi 2013-05-07 23:55:10.000000000 +0300 -@@ -2479,7 +2479,7 @@ +--- chrome/chrome_browser.gypi.orig 2013-07-04 06:39:58.000000000 +0300 ++++ chrome/chrome_browser.gypi 2013-07-15 18:45:11.000000000 +0300 +@@ -2470,7 +2470,7 @@ '../device/device.gyp:device_media_transfer_protocol', ], }], @@ -9,7 +9,7 @@ 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -2782,6 +2782,21 @@ +@@ -2803,6 +2803,25 @@ ['exclude', '^browser/usb/'], ], }], @@ -26,6 +26,10 @@ + ['exclude', '^browser/storage_monitor/storage_monitor_linux.h'], + ['exclude', '^browser/storage_monitor/udev_util_linux.cc'], + ['exclude', '^browser/storage_monitor/udev_util_linux.h'], ++ ['exclude', '^browser/storage_monitor/test_media_transfer_protocol_manager_linux.cc'], ++ ['exclude', '^browser/storage_monitor/test_media_transfer_protocol_manager_linux.h'], ++ ['exclude', '^browser/storage_monitor/mtab_watcher_linux.cc'], ++ ['exclude', '^browser/storage_monitor/mtab_watcher_linux.h'], + ], + }], ['OS=="mac"', { Added: head/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,11 @@ +--- chrome/common/omaha_query_params/omaha_query_params.cc.orig 2013-05-07 22:43:58.000000000 +0300 ++++ chrome/common/omaha_query_params/omaha_query_params.cc 2013-05-07 22:44:41.000000000 +0300 +@@ -28,6 +28,8 @@ + "linux"; + #elif defined(OS_OPENBSD) + "openbsd"; ++#elif defined(OS_FREEBSD) ++ "freebsd"; + #else + #error "unknown os" + #endif Added: head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,44 @@ +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2013-07-15 20:44:54.000000000 +0300 ++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc 2013-07-15 20:45:49.000000000 +0300 +@@ -13,7 +13,7 @@ + #include "ppapi/proxy/ppapi_messages.h" + #include "ppapi/proxy/serialized_structs.h" + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "content/public/common/child_process_sandbox_support_linux.h" + #endif + +@@ -28,12 +28,12 @@ + : ResourceHost(host->GetPpapiHost(), instance, resource), + renderer_ppapi_host_(host), + fd_(-1) { +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + fd_ = content::MatchFontWithFallback( + description.face.c_str(), description.weight >= + PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD, + description.italic, charset); +-#endif // defined(OS_LINUX) || defined(OS_OPENBSD) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + PepperFlashFontFileHost::~PepperFlashFontFileHost() { +@@ -54,7 +54,7 @@ + uint32_t table) { + std::string contents; + int32_t result = PP_ERROR_FAILED; +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (fd_ != -1) { + size_t length = 0; + if (content::GetFontTable(fd_, table, 0 /* offset */, NULL, &length)) { +@@ -69,7 +69,7 @@ + } + } + } +-#endif // defined(OS_LINUX) || defined(OS_OPENBSD) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + context->reply_msg = PpapiPluginMsg_FlashFontFile_GetFontTableReply(contents); + return result; Added: head/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,11 @@ +--- chrome/renderer/printing/print_web_view_helper.h.orig 2013-07-15 18:53:40.000000000 +0300 ++++ chrome/renderer/printing/print_web_view_helper.h 2013-07-15 18:54:07.000000000 +0300 +@@ -213,7 +213,7 @@ + void FinishFramePrinting(); + + // Prints the page listed in |params|. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void PrintPageInternal(const PrintMsg_PrintPage_Params& params, + const gfx::Size& canvas_size, + WebKit::WebFrame* frame, Modified: head/www/chromium/files/patch-content__app__content_main_runner.cc ============================================================================== --- head/www/chromium/files/patch-content__app__content_main_runner.cc Thu Jul 18 21:52:19 2013 (r323257) +++ head/www/chromium/files/patch-content__app__content_main_runner.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -1,29 +1,35 @@ ---- content/app/content_main_runner.cc.orig 2012-11-27 10:01:23.000000000 +0200 -+++ content/app/content_main_runner.cc 2012-12-09 16:57:51.000000000 +0200 -@@ -99,7 +99,7 @@ - extern int RendererMain(const content::MainFunctionParams&); - extern int UtilityMain(const MainFunctionParams&); - extern int WorkerMain(const MainFunctionParams&); --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - extern int ZygoteMain(const MainFunctionParams&, - ZygoteForkDelegate* forkdelegate); +--- content/app/content_main_runner.cc.orig 2013-07-15 19:05:22.000000000 +0300 ++++ content/app/content_main_runner.cc 2013-07-15 19:11:30.000000000 +0300 +@@ -78,10 +78,10 @@ + #include "base/posix/global_descriptors.h" + #include "content/public/common/content_descriptors.h" + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + #include "content/public/common/zygote_fork_delegate_linux.h" #endif -@@ -344,7 +344,7 @@ +-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + #include "content/zygote/zygote_main.h" + #endif + +@@ -323,7 +323,8 @@ int (*function)(const MainFunctionParams&); }; -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ ++ !defined(OS_BSD) // On platforms that use the zygote, we have a special subset of // subprocesses that are launched via the zygote. This function // fills in some process-launching bits around ZygoteMain(). -@@ -449,7 +449,7 @@ +@@ -432,7 +433,8 @@ } } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ ++ !defined(OS_BSD) // Zygote startup is special -- see RunZygote comments above // for why we don't use ZygoteMain directly. if (process_type == switches::kZygoteProcess) Modified: head/www/chromium/files/patch-content__content_gpu.gypi ============================================================================== --- head/www/chromium/files/patch-content__content_gpu.gypi Thu Jul 18 21:52:19 2013 (r323257) +++ head/www/chromium/files/patch-content__content_gpu.gypi Thu Jul 18 22:06:21 2013 (r323258) @@ -1,11 +1,11 @@ ---- content/content_gpu.gypi.orig 2012-11-28 04:01:27.000000000 +0200 -+++ content/content_gpu.gypi 2012-12-04 22:06:17.000000000 +0200 -@@ -95,7 +95,7 @@ +--- content/content_gpu.gypi.orig 2013-05-13 01:34:00.000000000 +0000 ++++ content/content_gpu.gypi 2013-05-16 23:23:49.000000000 +0000 +@@ -85,7 +85,7 @@ '../third_party/amd/amd_videocard_info_win.cc', ], }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { +- ['OS=="linux" and use_x11==1', { ++ ['(OS=="linux" and use_x11==1) or os_bsd==1', { 'dependencies': [ + '../build/linux/system.gyp:libpci', '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl', - ], Modified: head/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc ============================================================================== --- head/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc Thu Jul 18 21:52:19 2013 (r323257) +++ head/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -1,11 +1,11 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2012-11-27 10:01:25.000000000 +0200 -+++ content/renderer/renderer_main_platform_delegate_linux.cc 2012-12-10 22:47:50.000000000 +0200 -@@ -42,11 +42,14 @@ +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2013-05-13 01:33:56.000000000 +0000 ++++ content/renderer/renderer_main_platform_delegate_linux.cc 2013-05-16 23:29:28.000000000 +0000 +@@ -41,11 +41,14 @@ + // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox // - // The seccomp sandbox mode 1 (sandbox/linux/seccomp-legacy) and mode 2 - // (sandbox/linux/seccomp-bpf) are started in InitializeSandbox(). + // Anything else is started in InitializeSandbox(). +#if !defined(OS_BSD) - InitializeSandbox(); + LinuxSandbox::InitializeSandbox(); +#endif return true; } @@ -15,7 +15,7 @@ // The LinuxSandbox class requires going through initialization before // GetStatus() and others can be used. When we are not launched through the // Zygote, this initialization will only happen in the renderer process if -@@ -81,6 +84,7 @@ +@@ -80,6 +83,7 @@ CHECK_EQ(errno, EPERM); } #endif // __x86_64__ Added: head/www/chromium/files/patch-net__third_party__nss__ssl__bodge__secitem_array.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-net__third_party__nss__ssl__bodge__secitem_array.c Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,16 @@ +--- net/third_party/nss/ssl/bodge/secitem_array.c.orig 2013-07-16 21:54:03.000000000 +0300 ++++ net/third_party/nss/ssl/bodge/secitem_array.c 2013-07-16 21:54:26.000000000 +0300 +@@ -11,13 +11,6 @@ + #include "secerr.h" + #include "secport.h" + +-typedef struct SECItemArrayStr SECItemArray; +- +-struct SECItemArrayStr { +- SECItem *items; +- unsigned int len; +-}; +- + SECItemArray * + SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len) + { Added: head/www/chromium/files/patch-ppapi__proxy__pdf_resource.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-ppapi__proxy__pdf_resource.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,11 @@ +--- ppapi/proxy/pdf_resource.cc.orig 2013-07-04 21:10:17.289142236 +0000 ++++ ppapi/proxy/pdf_resource.cc 2013-07-04 21:17:42.456142534 +0000 +@@ -189,7 +189,7 @@ + if (!reply_params.TakeSharedMemoryHandleAtIndex(0, &handle)) + return 0; + return (new ImageData(resource, desc, handle))->GetReference(); +-#elif defined(OS_LINUX) ++#elif defined(OS_POSIX) && !defined(OS_MACOSX) + return (new ImageData(resource, desc, fd))->GetReference(); + #else + #error Not implemented. Added: head/www/chromium/files/patch-third_party__WebKit__Source__WebKit__chromium__WebKit.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__WebKit__Source__WebKit__chromium__WebKit.gyp Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,11 @@ +--- third_party/WebKit/Source/WebKit/chromium/WebKit.gyp.orig 2013-07-15 19:48:12.000000000 +0300 ++++ third_party/WebKit/Source/WebKit/chromium/WebKit.gyp 2013-07-15 19:48:46.000000000 +0300 +@@ -646,7 +646,7 @@ + }, + }, + }], +- ['OS == "linux"', { ++ ['OS == "linux" or os_bsd == 1', { + 'dependencies': [ + '<(DEPTH)/build/linux/system.gyp:fontconfig', + ], Added: head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp__core.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp__core.gyp Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,47 @@ +--- third_party/WebKit/Source/core/core.gyp/core.gyp.orig 2013-07-15 19:52:51.000000000 +0300 ++++ third_party/WebKit/Source/core/core.gyp/core.gyp 2013-07-15 19:58:35.000000000 +0300 +@@ -608,7 +608,7 @@ + ['exclude', 'platform/chromium/ScrollbarThemeChromiumDefault.h'], + ], + }], +- ['OS=="linux" or OS=="android"', { ++ ['OS=="linux" or OS=="android" or os_bsd==1', { + 'sources/': [ + # Cherry-pick files excluded by the broader regular expressions above. + ['include', 'platform/graphics/harfbuzz/FontHarfBuzz\\.cpp$'], +@@ -629,7 +629,7 @@ + ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], + ], + }], +- ['OS!="linux"', { ++ ['OS!="linux" and os_bsd!=1', { + 'sources/': [ + ['exclude', 'Linux\\.cpp$'], + ], +@@ -740,7 +740,7 @@ + ['exclude', 'platform/graphics/FontPlatformData\\.cpp$'], + ], + }], +- ['OS != "linux" and OS != "mac"', { ++ ['OS != "linux" and OS != "mac" and os_bsd != 1', { + 'sources/': [ + ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], + ], +@@ -900,7 +900,7 @@ + # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable. + 'cflags': ['-Wno-uninitialized'], + }], +- ['OS != "linux"', { ++ ['OS != "linux" and os_bsd != 1', { + 'sources/': [ + ['exclude', 'Linux\\.cpp$'], + ], +@@ -945,7 +945,7 @@ + ['OS=="win" and buildtype=="Official"', { + 'msvs_shard': 19, + }], +- ['OS != "linux"', { ++ ['OS != "linux" and os_bsd != 1', { + 'sources/': [ + ['exclude', 'Linux\\.cpp$'], + ], Added: head/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,29 @@ +--- third_party/WebKit/Source/core/features.gypi.orig 2013-07-15 19:58:55.000000000 +0300 ++++ third_party/WebKit/Source/core/features.gypi 2013-07-15 20:00:22.000000000 +0300 +@@ -103,7 +103,7 @@ + 'ENABLE_WEB_AUDIO=1', + ], + }], +- ['OS=="linux" or OS=="mac" or OS=="android"', { ++ ['OS=="linux" or OS=="mac" or OS=="android" or os_bsd==1', { + 'feature_defines': [ + # 8Bit text runs should be enabled for all platforms webkit.org/b/111348 + 'ENABLE_8BIT_TEXTRUN=1', +@@ -128,7 +128,7 @@ + 'ENABLE_WEB_AUDIO=1', + ], + }], +- ['OS=="win" or OS=="android" or OS=="linux"', { ++ ['OS=="win" or OS=="android" or OS=="linux" or os_bsd==1', { + 'feature_defines': [ + 'ENABLE_OPENTYPE_VERTICAL=1', + ], +@@ -143,7 +143,7 @@ + 'ENABLE_RUBBER_BANDING=1', + ], + }], +- ['OS=="linux" or OS=="android"', { ++ ['OS=="linux" or OS=="android" or os_bsd==1', { + 'feature_defines': [ + 'WTF_USE_HARFBUZZ=1', + ], Added: head/www/chromium/files/patch-third_party__WebKit__Source__wtf__NumberOfCores.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__WebKit__Source__wtf__NumberOfCores.cpp Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,10 @@ +--- third_party/WebKit/Source/wtf/NumberOfCores.cpp.orig 2012-04-25 10:06:07.000000000 +0300 ++++ third_party/WebKit/Source/wtf/NumberOfCores.cpp 2012-04-29 21:45:39.000000000 +0300 +@@ -29,6 +29,7 @@ + #if OS(DARWIN) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD) + // sys/types.h must come before sys/sysctl.h because the latter uses + // data types defined in the former. See sysctl(3) and style(9). ++#include <unistd.h> + #include <sys/types.h> + #include <sys/sysctl.h> + #elif OS(LINUX) || OS(AIX) || OS(SOLARIS) Added: head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,11 @@ +--- third_party/libjingle/libjingle.gyp.orig 2013-07-16 18:48:40.000000000 +0300 ++++ third_party/libjingle/libjingle.gyp 2013-07-16 18:50:49.000000000 +0300 +@@ -531,7 +531,7 @@ + '<(libjingle_source)/talk/base/unixfilesystem.h', + ], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'sources': [ + '<(libjingle_source)/talk/base/latebindingsymboltable.cc', + '<(libjingle_source)/talk/base/latebindingsymboltable.h', Added: head/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,53 @@ +--- third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2013-07-15 17:23:44.000000000 +0300 ++++ third_party/libjingle/source/talk/base/cpumonitor.cc 2013-07-15 17:34:46.000000000 +0300 +@@ -52,13 +52,13 @@ + #include <mach/task.h> + #endif // defined(IOS) || defined(OSX) + +-#if defined(LINUX) || defined(ANDROID) ++#if defined(LINUX) || defined(ANDROID) || defined(BSD) + #include <sys/resource.h> + #include <errno.h> + #include <stdio.h> + #include "talk/base/fileutils.h" + #include "talk/base/pathutils.h" +-#endif // defined(LINUX) || defined(ANDROID) ++#endif // defined(LINUX) || defined(ANDROID) || defined(BSD) + + #if defined(IOS) || defined(OSX) + static uint64 TimeValueTToInt64(const time_value_t &time_value) { +@@ -281,12 +281,16 @@ + const uint64 cpu_times = nice + system + user; + const uint64 total_times = cpu_times + idle; + #endif // defined(LINUX) || defined(ANDROID) ++#if defined(BSD) ++ return 0.f; ++#else + system_.prev_load_time_ = timenow; + system_.prev_load_ = UpdateCpuLoad(total_times, + cpu_times * cpus_, + &system_.prev_total_times_, + &system_.prev_cpu_times_); + return system_.prev_load_; ++#endif + } + + float CpuSampler::GetProcessLoad() { +@@ -348,7 +352,7 @@ + TimeValueTToInt64(task_term_info.system_time)); + #endif // defined(IOS) || defined(OSX) + +-#if defined(LINUX) || defined(ANDROID) ++#if defined(LINUX) || defined(ANDROID) || defined(BSD) + rusage usage; + if (getrusage(RUSAGE_SELF, &usage) < 0) { + LOG_ERR(LS_ERROR) << "getrusage failed"; +@@ -358,7 +362,7 @@ + const uint64 cpu_times = + (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * kNumMicrosecsPerSec + + usage.ru_utime.tv_usec + usage.ru_stime.tv_usec; +-#endif // defined(LINUX) || defined(ANDROID) ++#endif // defined(LINUX) || defined(ANDROID) || defined(BSD) + process_.prev_load_time_ = timenow; + process_.prev_load_ = UpdateCpuLoad(total_times, + cpu_times, Added: head/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,17 @@ +--- third_party/libjingle/source/talk/base/linux.cc.orig 2013-07-15 17:38:04.000000000 +0300 ++++ third_party/libjingle/source/talk/base/linux.cc 2013-07-15 17:39:04.000000000 +0300 +@@ -25,7 +25,7 @@ + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#if defined(LINUX) || defined(ANDROID) ++#if defined(LINUX) || defined(ANDROID) || defined(BSD) + #include "talk/base/linux.h" + + #include <ctype.h> +@@ -279,4 +279,4 @@ + + } // namespace talk_base + +-#endif // defined(LINUX) || defined(ANDROID) ++#endif // defined(LINUX) || defined(ANDROID) || defined(BSD) Added: head/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,18 @@ +--- third_party/libjingle/source/talk/base/linux.h.orig 2013-07-15 17:36:34.000000000 +0300 ++++ third_party/libjingle/source/talk/base/linux.h 2013-07-15 17:37:47.000000000 +0300 +@@ -28,7 +28,7 @@ + #ifndef TALK_BASE_LINUX_H_ + #define TALK_BASE_LINUX_H_ + +-#if defined(LINUX) || defined(ANDROID) ++#if defined(LINUX) || defined(ANDROID) || defined(BSD) + #include <string> + #include <map> + #include <vector> +@@ -131,5 +131,5 @@ + + } // namespace talk_base + +-#endif // defined(LINUX) || defined(ANDROID) ++#endif // defined(LINUX) || defined(ANDROID) || defined(BSD) + #endif // TALK_BASE_LINUX_H_ Added: head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,11 @@ +--- third_party/libjingle/source/talk/base/systeminfo.cc.orig 2013-07-15 17:40:34.000000000 +0300 ++++ third_party/libjingle/source/talk/base/systeminfo.cc 2013-07-15 17:41:14.000000000 +0300 +@@ -48,7 +48,7 @@ + #include "talk/base/win32.h" + #elif defined(OSX) + #include "talk/base/macconversion.h" +-#elif defined(LINUX) || defined(ANDROID) ++#elif defined(LINUX) || defined(ANDROID) || defined(BSD) + #include "talk/base/linux.h" + #endif + #include "talk/base/common.h" Modified: head/www/chromium/files/patch-third_party__libusb__libusb.gyp ============================================================================== --- head/www/chromium/files/patch-third_party__libusb__libusb.gyp Thu Jul 18 21:52:19 2013 (r323257) +++ head/www/chromium/files/patch-third_party__libusb__libusb.gyp Thu Jul 18 22:06:21 2013 (r323258) @@ -1,69 +1,22 @@ ---- third_party/libusb/libusb.gyp.orig 2013-04-30 10:21:05.000000000 +0300 -+++ third_party/libusb/libusb.gyp 2013-05-08 20:58:00.000000000 +0300 -@@ -10,31 +10,43 @@ - { - 'target_name': 'libusb', - 'conditions': [ -- ['OS == "linux" and use_system_libusb==1', { -- 'type': 'none', -- 'variables': { -- 'headers_root_path': 'src/libusb', -- 'header_filenames': [ -- 'libusb.h', -- ], -- }, -- 'includes': [ -- '../../build/shim_headers.gypi', -- ], -+ ['(OS == "linux" or os_bsd == 1) and use_system_libusb==1', { -+ 'type': 'none', - 'direct_dependent_settings': { -- 'cflags': [ -- '<!@(pkg-config --cflags libusb-1.0)', -+ 'conditions': [ -+ ['OS == "freebsd"', { -+ 'direct_dependent_settings': { -+ 'link_settings': { -+ 'libraries': [ -+ '-lusb', -+ ], -+ }, -+ }, -+ }, { -+ 'variables': { -+ 'headers_root_path': 'src/libusb', -+ 'header_filenames': [ -+ 'libusb.h', -+ ], -+ }, -+ 'includes': [ -+ '../../build/shim_headers.gypi', -+ ], -+ 'cflags': [ -+ '<!@(pkg-config --cflags libusb-1.0)', -+ ], -+ 'link_settings': { -+ 'ldflags': [ -+ '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)', -+ ], -+ 'libraries': [ -+ '<!@(pkg-config --libs-only-l libusb-1.0)', -+ ], -+ }, -+ }], - ], -- 'link_settings': { -- 'ldflags': [ -- '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)', -- ], -- 'libraries': [ -- '<!@(pkg-config --libs-only-l libusb-1.0)', -- ], -- }, -- }, -- }, { -+ }, -+ }, { - 'type': 'static_library', - 'sources': [ - 'src/libusb/core.c', +--- third_party/libusb/libusb.gyp.orig 2013-06-19 01:35:24.000000000 +0000 ++++ third_party/libusb/libusb.gyp 2013-06-24 21:04:31.000000000 +0000 +@@ -67,6 +67,19 @@ + '_GNU_SOURCE=1', + ], + }], ++ ['OS == "freebsd"', { ++ 'type': 'none', ++ 'sources/': [ ++ ['exclude', '^src/libusb/'], ++ ], ++ 'direct_dependent_settings': { ++ 'link_settings': { ++ 'libraries': [ ++ '-lusb', ++ ], ++ }, ++ }, ++ }], + ], + }, + ], Added: head/www/chromium/files/patch-third_party__webrtc__build__common.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__webrtc__build__common.gypi Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,16 @@ +--- third_party/webrtc/build/common.gypi.orig 2013-07-16 16:41:06.000000000 +0300 ++++ third_party/webrtc/build/common.gypi 2013-07-16 17:21:31.000000000 +0300 +@@ -272,6 +272,13 @@ + #'WEBRTC_CLOCK_TYPE_REALTIME', + ], + }], ++ ['os_bsd==1', { ++ 'defines': [ ++ 'WEBRTC_BSD', ++ 'WEBRTC_LINUX', ++ 'WEBRTC_THREAD_RR', ++ ], ++ }], + ['OS=="mac"', { + 'defines': [ + 'WEBRTC_MAC', Added: head/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,20 @@ +--- third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2013-07-16 18:26:35.000000000 +0300 ++++ third_party/webrtc/modules/audio_device/audio_device.gypi 2013-07-16 18:29:22.000000000 +0300 +@@ -45,7 +45,7 @@ + 'dummy/audio_device_utility_dummy.h', + ], + 'conditions': [ +- ['OS=="linux"', { ++ ['OS=="linux" or os_bsd==1', { + 'include_dirs': [ + 'linux', + ], +@@ -133,7 +133,7 @@ + }], + ], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'defines': [ + 'LINUX_ALSA', + ], Added: head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,14 @@ +--- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2013-07-16 17:22:11.000000000 +0300 ++++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2013-07-16 17:23:12.000000000 +0300 +@@ -12,7 +12,11 @@ + + #include <assert.h> + #include <inttypes.h> ++#if defined(WEBRTC_BSD) ++#include <stdlib.h> ++#else + #include <malloc.h> ++#endif + + #include "common_types.h" + Added: head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,34 @@ +--- third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2013-07-16 17:35:36.000000000 +0300 ++++ third_party/webrtc/system_wrappers/source/cpu_info.cc 2013-07-16 17:40:50.000000000 +0300 +@@ -12,7 +12,10 @@ + + #if defined(_WIN32) + #include <Windows.h> +-#elif defined(WEBRTC_MAC) ++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) ++#if defined(WEBRTC_BSD) ++#include <sys/param.h> ++#endif + #include <sys/sysctl.h> + #include <sys/types.h> + #elif defined(WEBRTC_ANDROID) +@@ -37,13 +40,17 @@ + WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, + "Available number of cores:%d", number_of_cores_); + +-#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) ++#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) + number_of_cores_ = get_nprocs(); + WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, + "Available number of cores:%d", number_of_cores_); + +-#elif defined(WEBRTC_MAC) ++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) ++#if defined(WEBRTC_BSD) ++ int name[] = {CTL_HW, HW_NCPU}; ++#else + int name[] = {CTL_HW, HW_AVAILCPU}; ++#endif + int ncpu; + size_t size = sizeof(ncpu); + if (0 == sysctl(name, 2, &ncpu, &size, NULL, 0)) { Added: head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,60 @@ +--- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2013-07-16 17:45:33.000000000 +0300 ++++ third_party/webrtc/system_wrappers/source/thread_posix.cc 2013-07-16 17:58:51.000000000 +0300 +@@ -54,9 +54,13 @@ + #include <sys/types.h> + #include <sched.h> + #include <sys/syscall.h> ++#if defined(WEBRTC_BSD) ++#include <sys/unistd.h> ++#else + #include <linux/unistd.h> + #include <sys/prctl.h> + #endif ++#endif + + #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" + #include "webrtc/system_wrappers/interface/event_wrapper.h" +@@ -136,12 +140,12 @@ + } + + uint32_t ThreadWrapper::GetThreadId() { +-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX) ++#if (defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX)) && !defined(WEBRTC_BSD) + return static_cast<uint32_t>(syscall(__NR_gettid)); + #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) + return pthread_mach_thread_np(pthread_self()); + #else +- return reinterpret_cast<uint32_t>(pthread_self()); ++ return reinterpret_cast<uint64_t>(pthread_self()); + #endif + } + +@@ -171,7 +175,8 @@ + delete crit_state_; + } + +-#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) ++#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) && \ ++ !defined(WEBRTC_BSD) + + bool ThreadPosix::Start(unsigned int& thread_id) + { +@@ -235,7 +240,8 @@ + + // CPU_ZERO and CPU_SET are not available in NDK r7, so disable + // SetAffinity on Android for now. +-#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID))) ++#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID) && \ ++ !defined(WEBRTC_BSD))) + bool ThreadPosix::SetAffinity(const int* processor_numbers, + const unsigned int amount_of_processors) { + if (!processor_numbers || (amount_of_processors == 0)) { +@@ -317,7 +323,7 @@ + event_->Set(); + + if (set_thread_name_) { +-#ifdef WEBRTC_LINUX ++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + prctl(PR_SET_NAME, (unsigned long)name_, 0, 0, 0); + #endif + WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, Added: head/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,11 @@ +--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2013-07-16 18:15:28.000000000 +0300 ++++ third_party/webrtc/voice_engine/voice_engine_defines.h 2013-07-16 18:16:46.000000000 +0300 +@@ -260,7 +260,7 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-#ifndef QNX ++#if !defined(QNX) && !defined(WEBRTC_BSD) + #include <linux/net.h> + #ifndef ANDROID + #include <sys/soundcard.h> Added: head/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,11 @@ +--- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2010-12-16 02:33:31.000000000 +0100 ++++ tools/gyp/test/additional-targets/src/dir1/actions.gyp 2010-12-20 20:15:08.000000000 +0100 +@@ -47,7 +47,7 @@ + }, + ], + 'conditions': [ +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'target_defaults': { + 'cflags': ['-fPIC'], + }, Added: head/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,11 @@ +--- tools/gyp/test/library/src/library.gyp.orig 2010-12-16 02:33:32.000000000 +0100 ++++ tools/gyp/test/library/src/library.gyp 2010-12-20 20:15:08.000000000 +0100 +@@ -48,7 +48,7 @@ + }, + ], + 'conditions': [ +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'target_defaults': { + # Support 64-bit shared libs (also works fine for 32-bit). + 'cflags': ['-fPIC'], Added: head/www/chromium/files/patch-ui__gl__gl.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-ui__gl__gl.gyp Thu Jul 18 22:06:21 2013 (r323258) @@ -0,0 +1,11 @@ +--- ui/gl/gl.gyp.orig 2013-07-04 06:47:11.000000000 +0300 ++++ ui/gl/gl.gyp 2013-07-15 19:31:47.000000000 +0300 +@@ -188,7 +188,7 @@ + }, + ], + 'conditions': [ +- ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', { ++ ['OS in ("win", "android") or ((OS == "linux" or os_bsd == 1) and use_x11 == 1)', { + 'sources': [ + 'async_pixel_transfer_delegate_egl.cc', + 'async_pixel_transfer_delegate_egl.h', Modified: head/www/chromium/pkg-plist ============================================================================== --- head/www/chromium/pkg-plist Thu Jul 18 21:52:19 2013 (r323257) +++ head/www/chromium/pkg-plist Thu Jul 18 22:06:21 2013 (r323258) @@ -59,21 +59,14 @@ share/applications/chromium-browser.desk %%DATADIR%%/locales/vi.pak %%DATADIR%%/locales/zh-CN.pak %%DATADIR%%/locales/zh-TW.pak -%%DATADIR%%/mksnapshot %%DATADIR%%/product_logo_48.png %%DATADIR%%/protoc %%DATADIR%%/resources.pak %%DATADIR%%/resources/extension/demo/library.js -%%DATADIR%%/resources/inspector/AceTextEditor.js -%%DATADIR%%/resources/inspector/acedevtools.css %%DATADIR%%/resources/inspector/breakpointsList.css %%DATADIR%%/resources/inspector/buildSystemOnly.js %%DATADIR%%/resources/inspector/flameChart.css -%%DATADIR%%/resources/inspector/mode_css.js -%%DATADIR%%/resources/inspector/mode_html.js -%%DATADIR%%/resources/inspector/mode_javascript.js %%DATADIR%%/resources/inspector/sidebarPane.css -%%DATADIR%%/resources/inspector/theme_textmate.js %%DATADIR%%/resources/inspector/auditsPanel.css %%DATADIR%%/resources/inspector/AuditsPanel.js %%DATADIR%%/resources/inspector/breadcrumbList.css @@ -83,9 +76,7 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/CodeMirrorTextEditor.js %%DATADIR%%/resources/inspector/cssNamedFlows.css %%DATADIR%%/resources/inspector/dataGrid.css -%%DATADIR%%/resources/inspector/devTools.css %%DATADIR%%/resources/inspector/devtools.html -%%DATADIR%%/resources/inspector/DevTools.js %%DATADIR%%/resources/inspector/devtools_extension_api.js %%DATADIR%%/resources/inspector/elementsPanel.css %%DATADIR%%/resources/inspector/ElementsPanel.js @@ -93,6 +84,8 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/heapProfiler.css %%DATADIR%%/resources/inspector/HeapSnapshotWorker.js %%DATADIR%%/resources/inspector/helpScreen.css +%%DATADIR%%/resources/inspector/inspector.css +%%DATADIR%%/resources/inspector/inspector.js %%DATADIR%%/resources/inspector/Images/addIcon.png %%DATADIR%%/resources/inspector/Images/applicationCache.png %%DATADIR%%/resources/inspector/Images/back.png @@ -100,30 +93,16 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/Images/breakpointConditionalBorder.png %%DATADIR%%/resources/inspector/Images/breakpointConditionalCounterBorder.png %%DATADIR%%/resources/inspector/Images/breakpointCounterBorder.png +%%DATADIR%%/resources/inspector/Images/breakpoint2.png +%%DATADIR%%/resources/inspector/Images/breakpoint2_2x.png +%%DATADIR%%/resources/inspector/Images/breakpointConditional2.png +%%DATADIR%%/resources/inspector/Images/breakpointConditional2_2x.png %%DATADIR%%/resources/inspector/Images/checker.png -%%DATADIR%%/resources/inspector/Images/closeButtons.png %%DATADIR%%/resources/inspector/Images/cookie.png %%DATADIR%%/resources/inspector/Images/database.png %%DATADIR%%/resources/inspector/Images/databaseTable.png -%%DATADIR%%/resources/inspector/Images/debuggerContinue.png -%%DATADIR%%/resources/inspector/Images/debuggerPause.png -%%DATADIR%%/resources/inspector/Images/debuggerStepInto.png -%%DATADIR%%/resources/inspector/Images/debuggerStepOut.png -%%DATADIR%%/resources/inspector/Images/debuggerStepOver.png %%DATADIR%%/resources/inspector/Images/deleteIcon.png -%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallDown.png -%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallDownBlack.png -%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallDownWhite.png -%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRight.png -%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRightBlack.png -%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRightDown.png -%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRightDownBlack.png -%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRightDownWhite.png -%%DATADIR%%/resources/inspector/Images/disclosureTriangleSmallRightWhite.png %%DATADIR%%/resources/inspector/Images/domain.png -%%DATADIR%%/resources/inspector/Images/errorIcon.png -%%DATADIR%%/resources/inspector/Images/errorMediumIcon.png -%%DATADIR%%/resources/inspector/Images/errorRedDot.png %%DATADIR%%/resources/inspector/Images/fileSystem.png %%DATADIR%%/resources/inspector/Images/forward.png %%DATADIR%%/resources/inspector/Images/frame.png @@ -131,7 +110,6 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/Images/glossyHeaderPressed.png %%DATADIR%%/resources/inspector/Images/glossyHeaderSelected.png %%DATADIR%%/resources/inspector/Images/glossyHeaderSelectedPressed.png -%%DATADIR%%/resources/inspector/Images/goArrow.png %%DATADIR%%/resources/inspector/Images/graphLabelCalloutLeft.png %%DATADIR%%/resources/inspector/Images/graphLabelCalloutRight.png %%DATADIR%%/resources/inspector/Images/indexedDB.png @@ -139,13 +117,9 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/Images/indexedDBObjectStore.png %%DATADIR%%/resources/inspector/Images/localStorage.png %%DATADIR%%/resources/inspector/Images/namedFlowOverflow.png -%%DATADIR%%/resources/inspector/Images/navigatorShowHideButton.png %%DATADIR%%/resources/inspector/Images/paneAddButtons.png -%%DATADIR%%/resources/inspector/Images/paneBottomGrow.png -%%DATADIR%%/resources/inspector/Images/paneBottomGrowActive.png %%DATADIR%%/resources/inspector/Images/paneElementStateButtons.png %%DATADIR%%/resources/inspector/Images/paneFilterButtons.png -%%DATADIR%%/resources/inspector/Images/paneGrowHandleLine.png %%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png %%DATADIR%%/resources/inspector/Images/paneSettingsButtons.png %%DATADIR%%/resources/inspector/Images/popoverArrows.png @@ -153,7 +127,6 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png %%DATADIR%%/resources/inspector/Images/profileIcon.png %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png -%%DATADIR%%/resources/inspector/Images/profilesSilhouette.png %%DATADIR%%/resources/inspector/Images/programCounterBorder.png %%DATADIR%%/resources/inspector/Images/radioDot.png %%DATADIR%%/resources/inspector/Images/regionEmpty.png @@ -165,9 +138,7 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/Images/resourceJSIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png -%%DATADIR%%/resources/inspector/Images/resourcesSizeGraphIcon.png %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png -%%DATADIR%%/resources/inspector/Images/scriptsSilhouette.png %%DATADIR%%/resources/inspector/Images/searchNext.png *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307182206.r6IM6LCe088706>