diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 1c13427812f..18b4b01e433 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.102 2012/08/12 15:13:57 fgsch Exp $ +# $OpenBSD: Makefile,v 1.103 2012/08/26 18:47:01 robert Exp $ ONLY_FOR_ARCHS= i386 amd64 COMMENT= Chromium browser -V= 20.0.1132.57 +V= 21.0.1180.81 DISTNAME= chromium-${V} -REVISION= 1 CATEGORIES= www @@ -22,8 +21,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= http://blade2k.humppa.hu/distfiles/ \ - http://commondatastorage.googleapis.com/chromium-browser-official/ +MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ MODULES= gcc4 lang/python @@ -85,6 +83,7 @@ GYP_DEFS= -Duse_system_bzip2=1 \ -Duse_system_libevent=1 \ -Duse_system_libjpeg=1 \ -Duse_system_libpng=1 \ + -Duse_system_libusb=1 \ -Duse_system_libxml=1 \ -Duse_system_speex=1 \ -Duse_system_sqlite=0 \ @@ -96,6 +95,7 @@ GYP_DEFS= -Duse_system_bzip2=1 \ -Dlinux_use_tcmalloc=0 \ -Dlinux_strip_binary=1 \ -Denable_webrtc=0 \ + -Denable_one_click_signin=1 \ -Duse_kerberos=0 \ -DOS=openbsd @@ -135,7 +135,7 @@ do-install: .for f in libffmpegsumo.so mksnapshot protoc ${INSTALL_DATA} ${BUILDDIR}/${f} ${PREFIX}/chrome .endfor -.for s in 16 22 24 32 48 64 128 256 +.for s in 22 24 48 64 128 256 ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 3fffcbcb2f4..43de5bef7c5 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,5 +1,2 @@ -MD5 (chromium-20.0.1132.57.tar.bz2) = zY6c8u/l/38eDXGvPARvsA== -RMD160 (chromium-20.0.1132.57.tar.bz2) = R/VZ7a3JKeEQwGdqOKrRLpIV7XM= -SHA1 (chromium-20.0.1132.57.tar.bz2) = MgnSuhm0ES+65mWAwxkDkZkmHp0= -SHA256 (chromium-20.0.1132.57.tar.bz2) = EiXGtjBuiciJK8DRjpRWfWCB13fe6bjJDv0NqfbyZBs= -SIZE (chromium-20.0.1132.57.tar.bz2) = 184791674 +SHA256 (chromium-21.0.1180.81.tar.bz2) = 9DbgOD7ipStIPtQHTTrQZ6UXRVReFZ3+MqT3ft7fuqw= +SIZE (chromium-21.0.1180.81.tar.bz2) = 192602548 diff --git a/www/chromium/patches/patch-base_atomicops_h b/www/chromium/patches/patch-base_atomicops_h index f9723b8762f..7b8c236877b 100644 --- a/www/chromium/patches/patch-base_atomicops_h +++ b/www/chromium/patches/patch-base_atomicops_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-base_atomicops_h,v 1.6 2011/10/27 07:59:08 robert Exp $ ---- base/atomicops.h.orig Fri Oct 21 10:30:02 2011 -+++ base/atomicops.h Wed Oct 26 13:37:46 2011 +$OpenBSD: patch-base_atomicops_h,v 1.7 2012/08/26 18:47:01 robert Exp $ +--- base/atomicops.h.orig Tue Aug 14 09:01:48 2012 ++++ base/atomicops.h Wed Aug 15 23:14:34 2012 @@ -50,7 +50,11 @@ typedef intptr_t Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or @@ -13,7 +13,7 @@ $OpenBSD: patch-base_atomicops_h,v 1.6 2011/10/27 07:59:08 robert Exp $ // Atomically execute: // result = *ptr; -@@ -143,7 +147,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); +@@ -145,7 +149,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); // On some platforms we need additional declarations to make // AtomicWord compatible with our other Atomic* types. diff --git a/www/chromium/patches/patch-base_base_gyp b/www/chromium/patches/patch-base_base_gyp index abb55b278e4..e18fa820a07 100644 --- a/www/chromium/patches/patch-base_base_gyp +++ b/www/chromium/patches/patch-base_base_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_base_gyp,v 1.12 2012/07/10 09:22:34 robert Exp $ ---- base/base.gyp.orig Thu Jun 28 15:01:49 2012 -+++ base/base.gyp Sat Jul 7 09:50:22 2012 -@@ -386,6 +386,13 @@ +$OpenBSD: patch-base_base_gyp,v 1.13 2012/08/26 18:47:01 robert Exp $ +--- base/base.gyp.orig Tue Aug 14 09:01:48 2012 ++++ base/base.gyp Wed Aug 15 23:14:34 2012 +@@ -612,6 +612,13 @@ ], }], ], diff --git a/www/chromium/patches/patch-base_base_gypi b/www/chromium/patches/patch-base_base_gypi index 4e520a91d98..3ff809e12e3 100644 --- a/www/chromium/patches/patch-base_base_gypi +++ b/www/chromium/patches/patch-base_base_gypi @@ -1,6 +1,6 @@ -$OpenBSD: patch-base_base_gypi,v 1.12 2012/07/10 09:22:34 robert Exp $ ---- base/base.gypi.orig Thu Jun 28 15:01:49 2012 -+++ base/base.gypi Sat Jul 7 09:50:22 2012 +$OpenBSD: patch-base_base_gypi,v 1.13 2012/08/26 18:47:01 robert Exp $ +--- base/base.gypi.orig Tue Aug 14 09:01:48 2012 ++++ base/base.gypi Wed Aug 15 23:14:34 2012 @@ -130,7 +130,6 @@ 'file_version_info_win.h', 'files/file_path_watcher.cc', @@ -9,8 +9,8 @@ $OpenBSD: patch-base_base_gypi,v 1.12 2012/07/10 09:22:34 robert Exp $ 'files/file_path_watcher_linux.cc', 'files/file_path_watcher_stub.cc', 'files/file_path_watcher_win.cc', -@@ -565,7 +564,6 @@ - [ 'os_bsd==1', { +@@ -602,7 +601,6 @@ + ['<(os_bsd)==1 and >(nacl_untrusted_build)==0', { 'sources/': [ ['exclude', '^files/file_path_watcher_linux\\.cc$'], - ['exclude', '^files/file_path_watcher_stub\\.cc$'], diff --git a/www/chromium/patches/patch-base_debug_debugger_posix_cc b/www/chromium/patches/patch-base_debug_debugger_posix_cc index 0c5014ff851..5167ff0638a 100644 --- a/www/chromium/patches/patch-base_debug_debugger_posix_cc +++ b/www/chromium/patches/patch-base_debug_debugger_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.8 2012/04/15 10:40:44 robert Exp $ ---- base/debug/debugger_posix.cc.orig Sat Apr 14 12:17:19 2012 -+++ base/debug/debugger_posix.cc Sat Apr 14 16:54:46 2012 -@@ -92,33 +92,36 @@ bool BeingDebugged() { +$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.9 2012/08/26 18:47:01 robert Exp $ +--- base/debug/debugger_posix.cc.orig Tue Aug 14 09:01:47 2012 ++++ base/debug/debugger_posix.cc Wed Aug 15 23:14:34 2012 +@@ -103,33 +103,36 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. diff --git a/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc b/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc index 393e91120d1..f30ea0191ad 100644 --- a/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc +++ b/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.1 2012/07/10 09:22:34 robert Exp $ ---- chrome/app/chrome_main_delegate.cc.orig Tue Jul 10 09:32:23 2012 -+++ chrome/app/chrome_main_delegate.cc Tue Jul 10 09:32:54 2012 -@@ -285,7 +285,7 @@ bool SubprocessNeedsResourceBundle(const std::string& +$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.2 2012/08/26 18:47:01 robert Exp $ +--- chrome/app/chrome_main_delegate.cc.orig Tue Aug 14 09:01:53 2012 ++++ chrome/app/chrome_main_delegate.cc Wed Aug 15 23:14:34 2012 +@@ -264,7 +264,7 @@ bool SubprocessNeedsResourceBundle(const std::string& // Mac needs them for the plugin process name. process_type == switches::kPluginProcess || #endif diff --git a/www/chromium/patches/patch-chrome_browser_memory_details_cc b/www/chromium/patches/patch-chrome_browser_memory_details_cc index 22ebf4654e5..7dc5b23c432 100644 --- a/www/chromium/patches/patch-chrome_browser_memory_details_cc +++ b/www/chromium/patches/patch-chrome_browser_memory_details_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.9 2012/07/10 09:22:34 robert Exp $ ---- chrome/browser/memory_details.cc.orig Thu Jun 28 15:02:04 2012 -+++ chrome/browser/memory_details.cc Sat Jul 7 09:50:22 2012 -@@ -32,7 +32,7 @@ +$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.10 2012/08/26 18:47:01 robert Exp $ +--- chrome/browser/memory_details.cc.orig Fri Aug 17 03:02:07 2012 ++++ chrome/browser/memory_details.cc Wed Aug 22 09:56:05 2012 +@@ -31,7 +31,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.9 2012/07/10 09:22:34 rober const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid(); const pid_t sandbox_helper_pid = content::ZygoteHost::GetInstance()->GetSandboxHelperPid(); -@@ -341,7 +341,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -333,7 +333,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { } } diff --git a/www/chromium/patches/patch-chrome_browser_memory_details_linux_cc b/www/chromium/patches/patch-chrome_browser_memory_details_linux_cc deleted file mode 100644 index 42000713362..00000000000 --- a/www/chromium/patches/patch-chrome_browser_memory_details_linux_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_memory_details_linux_cc,v 1.3 2012/07/10 09:22:34 robert Exp $ ---- chrome/browser/memory_details_linux.cc.orig Fri Jun 1 06:15:30 2012 -+++ chrome/browser/memory_details_linux.cc Fri Jun 1 06:16:12 2012 -@@ -240,7 +240,7 @@ void MemoryDetails::CollectProcessData( - } - - std::vector current_browser_processes; -- const pid_t zygote = content::ZygoteHost::GetInstance()->GetPid(); -+ const pid_t zygote = 0; - GetAllChildren(processes, getpid(), zygote, ¤t_browser_processes); - ProcessData current_browser; - GetProcessDataMemoryInformation(current_browser_processes, ¤t_browser); diff --git a/www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc b/www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc index f4c7cca9b91..746269082c1 100644 --- a/www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc +++ b/www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc @@ -1,11 +1,11 @@ -$OpenBSD: patch-chrome_browser_printing_print_system_task_proxy_cc,v 1.2 2012/08/12 15:13:57 fgsch Exp $ +$OpenBSD: patch-chrome_browser_printing_print_system_task_proxy_cc,v 1.3 2012/08/26 18:47:01 robert Exp $ Fix build with cups >= 1.6 error: 'ppd_attr_t* ppdFindAttr(ppd_file_t*, const char*, const char*)' is deprecated ---- chrome/browser/printing/print_system_task_proxy.cc.orig Mon Aug 6 19:00:35 2012 -+++ chrome/browser/printing/print_system_task_proxy.cc Mon Aug 6 19:00:46 2012 -@@ -444,10 +444,7 @@ bool PrintSystemTaskProxy::GetPrinterCapabilitiesCUPS( +--- chrome/browser/printing/print_system_task_proxy.cc.orig Tue Aug 14 09:02:00 2012 ++++ chrome/browser/printing/print_system_task_proxy.cc Wed Aug 15 23:14:34 2012 +@@ -445,10 +445,7 @@ bool PrintSystemTaskProxy::GetPrinterCapabilitiesCUPS( } } diff --git a/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc b/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc index 3bd185f8657..6cd93a9b4c2 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc @@ -1,24 +1,24 @@ -$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.3 2012/07/10 09:22:34 robert Exp $ ---- chrome/browser/ui/webui/about_ui.cc.orig Thu Jun 28 15:02:01 2012 -+++ chrome/browser/ui/webui/about_ui.cc Sat Jul 7 09:50:22 2012 -@@ -83,7 +83,7 @@ - #include "chromeos/dbus/cryptohome_client.h" - #include "chromeos/dbus/dbus_thread_manager.h" - #include "content/public/browser/zygote_host_linux.h" --#elif defined(OS_LINUX) || defined(OS_OPENBSD) -+#elif defined(OS_LINUX) - #include "content/public/browser/zygote_host_linux.h" - #endif +$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.4 2012/08/26 18:47:01 robert Exp $ +--- chrome/browser/ui/webui/about_ui.cc.orig Wed Aug 15 23:16:10 2012 ++++ chrome/browser/ui/webui/about_ui.cc Wed Aug 15 23:16:48 2012 +@@ -72,7 +72,7 @@ + #include "webkit/glue/webkit_glue.h" + #include "webkit/plugins/webplugininfo.h" -@@ -1018,6 +1018,7 @@ std::string AboutLinuxProxyConfig() { +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) + #include "content/public/browser/zygote_host_linux.h" + #include "content/public/common/sandbox_linux.h" + #endif +@@ -1027,6 +1027,7 @@ std::string AboutLinuxProxyConfig() { return data; } -+#if defined(OS_LINUX) ++#if !defined(OS_OPENBSD) void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, bool good) { data->append(""); -@@ -1074,6 +1075,7 @@ std::string AboutSandbox() { +@@ -1083,6 +1084,7 @@ std::string AboutSandbox() { return data; } #endif @@ -26,9 +26,9 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.3 2012/07/10 09:22:34 ro std::string AboutVersionStaticContent(const std::string& query) { return ResourceBundle::GetSharedInstance().GetRawDataResource( -@@ -1413,7 +1415,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st +@@ -1422,7 +1424,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st response = ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_OS_CREDITS_HTML).as_string(); + IDR_OS_CREDITS_HTML, ui::SCALE_FACTOR_NONE).as_string(); #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) diff --git a/www/chromium/patches/patch-chrome_chrome_browser_gypi b/www/chromium/patches/patch-chrome_chrome_browser_gypi index 9728b0fa331..c645884b2c6 100644 --- a/www/chromium/patches/patch-chrome_chrome_browser_gypi +++ b/www/chromium/patches/patch-chrome_chrome_browser_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.12 2012/07/10 09:22:34 robert Exp $ ---- chrome/chrome_browser.gypi.orig Sat Jul 7 10:28:20 2012 -+++ chrome/chrome_browser.gypi Sat Jul 7 17:35:13 2012 -@@ -1327,8 +1327,6 @@ +$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.13 2012/08/26 18:47:01 robert Exp $ +--- chrome/chrome_browser.gypi.orig Wed Aug 15 23:17:03 2012 ++++ chrome/chrome_browser.gypi Wed Aug 15 23:17:21 2012 +@@ -1356,8 +1356,6 @@ 'browser/media/media_stream_capture_indicator.h', 'browser/media/media_stream_devices_menu_model.cc', 'browser/media/media_stream_devices_menu_model.h', @@ -9,21 +9,4 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.12 2012/07/10 09:22:34 robert Exp - 'browser/media_gallery/media_device_notifications_linux.h', 'browser/media_gallery/media_device_notifications_window_win.cc', 'browser/media_gallery/media_device_notifications_window_win.h', - 'browser/media_gallery/media_gallery_database.cc', -@@ -4541,10 +4539,15 @@ - ['exclude', '^browser/usb/'], - ], - }], -- ['OS!="android"', { -+ ['OS!="android" and os_bsd!=1', { - 'dependencies': [ - '../third_party/libusb/libusb.gyp:libusb', - ], -+ },{ -+ 'link_settings': { -+ 'libraries': [ -+ '-lusb', -+ ]}, - }], - ['OS=="mac"', { - 'sources!': [ + 'browser/media_gallery/media_file_system_registry.cc', diff --git a/www/chromium/patches/patch-chrome_common_chrome_notification_types_h b/www/chromium/patches/patch-chrome_common_chrome_notification_types_h new file mode 100644 index 00000000000..ebdb60f284e --- /dev/null +++ b/www/chromium/patches/patch-chrome_common_chrome_notification_types_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_common_chrome_notification_types_h,v 1.1 2012/08/26 18:47:01 robert Exp $ +--- chrome/common/chrome_notification_types.h.orig Thu Aug 16 00:25:40 2012 ++++ chrome/common/chrome_notification_types.h Thu Aug 16 00:25:50 2012 +@@ -54,7 +54,7 @@ enum NotificationType { + // that was closed, no details are expected. + NOTIFICATION_WINDOW_CLOSED, + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux maximize can be an asynchronous operation. This notification + // indicates that the window has been maximized. The source is + // a Source containing the BrowserWindow that was maximized. diff --git a/www/chromium/patches/patch-chrome_common_chrome_paths_cc b/www/chromium/patches/patch-chrome_common_chrome_paths_cc index 9c3085e4b21..dfe567052df 100644 --- a/www/chromium/patches/patch-chrome_common_chrome_paths_cc +++ b/www/chromium/patches/patch-chrome_common_chrome_paths_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.8 2012/07/10 09:22:34 robert Exp $ ---- chrome/common/chrome_paths.cc.orig Thu Jun 28 15:02:23 2012 -+++ chrome/common/chrome_paths.cc Sat Jul 7 09:50:22 2012 -@@ -341,7 +341,7 @@ bool PathProvider(int key, FilePath* result) { +$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.9 2012/08/26 18:47:01 robert Exp $ +--- chrome/common/chrome_paths.cc.orig Tue Aug 14 09:02:25 2012 ++++ chrome/common/chrome_paths.cc Wed Aug 15 23:14:34 2012 +@@ -358,7 +358,7 @@ bool PathProvider(int key, FilePath* result) { if (!file_util::PathExists(cur)) // We don't want to create this return false; break; diff --git a/www/chromium/patches/patch-chrome_test_perf_perf_test_cc b/www/chromium/patches/patch-chrome_test_perf_perf_test_cc new file mode 100644 index 00000000000..88951deb246 --- /dev/null +++ b/www/chromium/patches/patch-chrome_test_perf_perf_test_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-chrome_test_perf_perf_test_cc,v 1.1 2012/08/26 18:47:01 robert Exp $ +--- chrome/test/perf/perf_test.cc.orig Thu Aug 16 09:20:53 2012 ++++ chrome/test/perf/perf_test.cc Thu Aug 16 09:23:52 2012 +@@ -389,7 +389,7 @@ std::string MemoryUsageInfoToString(const std::string& + AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name, + total_working_set_size, "bytes", + false /* not important */); +-#elif defined(OS_LINUX) || defined(OS_MACOSX) ++#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + AppendResult(output, "vm_size_final_b", "", "vm_size_f_b" + trace_name, + browser_virtual_size, "bytes", + false /* not important */); diff --git a/www/chromium/patches/patch-content_app_content_main_runner_cc b/www/chromium/patches/patch-content_app_content_main_runner_cc index 479f89ea2eb..90ff5fc0538 100644 --- a/www/chromium/patches/patch-content_app_content_main_runner_cc +++ b/www/chromium/patches/patch-content_app_content_main_runner_cc @@ -1,37 +1,37 @@ -$OpenBSD: patch-content_app_content_main_runner_cc,v 1.1 2012/07/10 09:22:34 robert Exp $ ---- content/app/content_main_runner.cc.orig Thu Jun 28 15:01:24 2012 -+++ content/app/content_main_runner.cc Sat Jul 7 09:50:22 2012 -@@ -79,7 +79,7 @@ extern int PpapiBrokerMain(const content::MainFunction +$OpenBSD: patch-content_app_content_main_runner_cc,v 1.2 2012/08/26 18:47:01 robert Exp $ +--- content/app/content_main_runner.cc.orig Wed Aug 15 23:17:36 2012 ++++ content/app/content_main_runner.cc Thu Aug 16 10:40:04 2012 +@@ -84,7 +84,7 @@ extern int PpapiBrokerMain(const content::MainFunction extern int RendererMain(const content::MainFunctionParams&); extern int WorkerMain(const content::MainFunctionParams&); extern int UtilityMain(const content::MainFunctionParams&); --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - extern int ZygoteMain(const content::MainFunctionParams&, - content::ZygoteForkDelegate* forkdelegate); - #endif -@@ -192,7 +192,7 @@ struct MainFunction { - int (*function)(const content::MainFunctionParams&); +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + namespace content { + extern int ZygoteMain(const MainFunctionParams&, + ZygoteForkDelegate* forkdelegate); +@@ -268,7 +268,7 @@ struct MainFunction { + int (*function)(const MainFunctionParams&); }; --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#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(). -@@ -291,7 +291,7 @@ int RunNamedProcessTypeMain( +@@ -372,7 +372,7 @@ int RunNamedProcessTypeMain( } } --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#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) -@@ -376,7 +376,7 @@ static void ReleaseFreeMemoryThunk() { - base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance(); - g_fds->Set(kPrimaryIPCChannel, +@@ -462,7 +462,7 @@ static void ReleaseFreeMemoryThunk() { kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); + #endif + -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) g_fds->Set(kCrashDumpSignal, diff --git a/www/chromium/patches/patch-content_browser_browser_main_loop_cc b/www/chromium/patches/patch-content_browser_browser_main_loop_cc index 967dd29c871..faf3e80def7 100644 --- a/www/chromium/patches/patch-content_browser_browser_main_loop_cc +++ b/www/chromium/patches/patch-content_browser_browser_main_loop_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.3 2012/07/10 09:22:34 robert Exp $ ---- content/browser/browser_main_loop.cc.orig Sat Jul 7 15:53:15 2012 -+++ content/browser/browser_main_loop.cc Sat Jul 7 15:53:48 2012 -@@ -67,7 +67,7 @@ +$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.4 2012/08/26 18:47:01 robert Exp $ +--- content/browser/browser_main_loop.cc.orig Tue Aug 14 09:01:25 2012 ++++ content/browser/browser_main_loop.cc Wed Aug 15 23:14:34 2012 +@@ -69,7 +69,7 @@ #include "ui/gfx/gtk_util.h" #endif @@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.3 2012/07/10 09:22:34 r #include #include "content/browser/renderer_host/render_sandbox_host_linux.h" #include "content/browser/zygote_host_impl_linux.h" -@@ -86,7 +86,7 @@ using content::TraceControllerImpl; +@@ -88,7 +88,7 @@ using content::TraceControllerImpl; namespace { @@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.3 2012/07/10 09:22:34 r void SetupSandbox(const CommandLine& parsed_command_line) { // TODO(evanm): move this into SandboxWrapper; I'm just trying to move this // code en masse out of chrome_main for now. -@@ -267,7 +267,7 @@ void BrowserMainLoop::EarlyInitialization() { +@@ -269,7 +269,7 @@ void BrowserMainLoop::EarlyInitialization() { } #endif // !defined(USE_OPENSSL) diff --git a/www/chromium/patches/patch-content_content_browser_gypi b/www/chromium/patches/patch-content_content_browser_gypi index b7b6152078a..444253d9ae9 100644 --- a/www/chromium/patches/patch-content_content_browser_gypi +++ b/www/chromium/patches/patch-content_content_browser_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-content_content_browser_gypi,v 1.10 2012/07/10 09:22:34 robert Exp $ ---- content/content_browser.gypi.orig Sat Jul 7 15:54:47 2012 -+++ content/content_browser.gypi Sat Jul 7 15:54:59 2012 -@@ -160,7 +160,6 @@ +$OpenBSD: patch-content_content_browser_gypi,v 1.11 2012/08/26 18:47:01 robert Exp $ +--- content/content_browser.gypi.orig Wed Aug 15 23:18:24 2012 ++++ content/content_browser.gypi Wed Aug 15 23:18:52 2012 +@@ -164,7 +164,6 @@ 'public/browser/web_ui_message_handler.h', 'public/browser/worker_service.h', 'public/browser/worker_service_observer.h', @@ -9,13 +9,15 @@ $OpenBSD: patch-content_content_browser_gypi,v 1.10 2012/07/10 09:22:34 robert E 'browser/accessibility/browser_accessibility.cc', 'browser/accessibility/browser_accessibility.h', 'browser/accessibility/browser_accessibility_cocoa.h', -@@ -713,9 +712,6 @@ +@@ -760,11 +759,6 @@ 'browser/worker_host/worker_process_host.h', 'browser/worker_host/worker_service_impl.cc', 'browser/worker_host/worker_service_impl.h', - 'browser/zygote_host_impl_linux.cc', - 'browser/zygote_host_impl_linux.h', -- 'browser/zygote_main_linux.cc', - # TODO: These should be moved to test_support (see below), but - # are currently used by production code in automation_provider.cc. - 'test/net/url_request_failed_job.cc', +- 'zygote/zygote_linux.cc', +- 'zygote/zygote_linux.h', +- 'zygote/zygote_main_linux.cc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources.h', + '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.cc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.h', diff --git a/www/chromium/patches/patch-content_public_browser_content_browser_client_cc b/www/chromium/patches/patch-content_public_browser_content_browser_client_cc new file mode 100644 index 00000000000..96d2cf8b67b --- /dev/null +++ b/www/chromium/patches/patch-content_public_browser_content_browser_client_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-content_public_browser_content_browser_client_cc,v 1.1 2012/08/26 18:47:01 robert Exp $ +--- content/public/browser/content_browser_client.cc.orig Mon Aug 20 11:28:14 2012 ++++ content/public/browser/content_browser_client.cc Mon Aug 20 11:28:24 2012 +@@ -208,7 +208,7 @@ bool ContentBrowserClient::AllowPepperPrivateFileAPI() + return false; + } + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + int ContentBrowserClient::GetCrashSignalFD(const CommandLine& command_line) { + return -1; + } diff --git a/www/chromium/patches/patch-content_public_browser_content_browser_client_h b/www/chromium/patches/patch-content_public_browser_content_browser_client_h index 2b6f499d31f..c1766d6da5d 100644 --- a/www/chromium/patches/patch-content_public_browser_content_browser_client_h +++ b/www/chromium/patches/patch-content_public_browser_content_browser_client_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-content_public_browser_content_browser_client_h,v 1.1 2012/07/10 09:22:34 robert Exp $ ---- content/public/browser/content_browser_client.h.orig Fri Jun 1 16:11:06 2012 -+++ content/public/browser/content_browser_client.h Fri Jun 1 16:10:56 2012 -@@ -409,7 +409,7 @@ class ContentBrowserClient { - virtual bool AllowSocketAPI(BrowserContext* browser_context, - const GURL& url) = 0; +$OpenBSD: patch-content_public_browser_content_browser_client_h,v 1.2 2012/08/26 18:47:01 robert Exp $ +--- content/public/browser/content_browser_client.h.orig Tue Aug 14 09:01:26 2012 ++++ content/public/browser/content_browser_client.h Wed Aug 15 23:14:34 2012 +@@ -396,7 +396,7 @@ class CONTENT_EXPORT ContentBrowserClient { + // Returns true if renderer processes can use private Pepper File APIs. + virtual bool AllowPepperPrivateFileAPI(); -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Can return an optional fd for crash handling, otherwise returns -1. The // passed |command_line| will be used to start the process in question. - virtual int GetCrashSignalFD(const CommandLine& command_line) = 0; + virtual int GetCrashSignalFD(const CommandLine& command_line); diff --git a/www/chromium/patches/patch-content_shell_shell_content_browser_client_cc b/www/chromium/patches/patch-content_shell_shell_content_browser_client_cc deleted file mode 100644 index 8e024d7b861..00000000000 --- a/www/chromium/patches/patch-content_shell_shell_content_browser_client_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-content_shell_shell_content_browser_client_cc,v 1.4 2012/07/10 09:22:34 robert Exp $ ---- content/shell/shell_content_browser_client.cc.orig Thu Jun 28 15:01:27 2012 -+++ content/shell/shell_content_browser_client.cc Sat Jul 7 09:50:26 2012 -@@ -334,7 +334,7 @@ bool ShellContentBrowserClient::AllowSocketAPI(Browser - return false; - } - --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - int ShellContentBrowserClient::GetCrashSignalFD( - const CommandLine& command_line) { - return -1; diff --git a/www/chromium/patches/patch-content_shell_shell_content_browser_client_h b/www/chromium/patches/patch-content_shell_shell_content_browser_client_h deleted file mode 100644 index 195bbd6497f..00000000000 --- a/www/chromium/patches/patch-content_shell_shell_content_browser_client_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-content_shell_shell_content_browser_client_h,v 1.1 2012/07/10 09:22:34 robert Exp $ ---- content/shell/shell_content_browser_client.h.orig Thu Jun 28 15:01:27 2012 -+++ content/shell/shell_content_browser_client.h Sat Jul 7 09:50:27 2012 -@@ -170,7 +170,7 @@ class ShellContentBrowserClient : public ContentBrowse - virtual bool AllowSocketAPI(BrowserContext* browser_context, - const GURL& url) OVERRIDE; - --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - virtual int GetCrashSignalFD(const CommandLine& command_line) OVERRIDE; - #endif - diff --git a/www/chromium/patches/patch-media__audio__pulse__pulse_output.h b/www/chromium/patches/patch-media__audio__pulse__pulse_output.h new file mode 100644 index 00000000000..e7ba32b8796 --- /dev/null +++ b/www/chromium/patches/patch-media__audio__pulse__pulse_output.h @@ -0,0 +1,11 @@ +--- media/audio/pulse/pulse_output.h.orig Tue Aug 14 09:01:11 2012 ++++ media/audio/pulse/pulse_output.h Wed Aug 15 23:14:34 2012 +@@ -30,7 +30,7 @@ namespace media { + + class SeekableBuffer; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + class AudioManagerLinux; + typedef AudioManagerLinux AudioManagerPulse; + #elif defined(OS_OPENBSD) diff --git a/www/chromium/patches/patch-media_media_gyp b/www/chromium/patches/patch-media_media_gyp index 2a6ee9555d7..4810ff4e73e 100644 --- a/www/chromium/patches/patch-media_media_gyp +++ b/www/chromium/patches/patch-media_media_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-media_media_gyp,v 1.12 2012/07/10 09:22:34 robert Exp $ ---- media/media.gyp.orig Thu Jun 28 15:01:11 2012 -+++ media/media.gyp Sat Jul 7 09:50:30 2012 -@@ -347,6 +347,7 @@ +$OpenBSD: patch-media_media_gyp,v 1.13 2012/08/26 18:47:01 robert Exp $ +--- media/media.gyp.orig Tue Aug 14 09:01:11 2012 ++++ media/media.gyp Wed Aug 15 23:14:34 2012 +@@ -367,6 +367,7 @@ }], ['OS=="openbsd"', { 'sources/': [ ['exclude', '/alsa_' ], diff --git a/www/chromium/patches/patch-net_base_network_change_notifier_cc b/www/chromium/patches/patch-net_base_network_change_notifier_cc index 47442e2ed56..6395f0a1b57 100644 --- a/www/chromium/patches/patch-net_base_network_change_notifier_cc +++ b/www/chromium/patches/patch-net_base_network_change_notifier_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_base_network_change_notifier_cc,v 1.5 2012/07/10 09:22:34 robert Exp $ ---- net/base/network_change_notifier.cc.orig Thu Jun 28 15:01:30 2012 -+++ net/base/network_change_notifier.cc Sat Jul 7 09:50:30 2012 -@@ -69,7 +69,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() +$OpenBSD: patch-net_base_network_change_notifier_cc,v 1.6 2012/08/26 18:47:01 robert Exp $ +--- net/base/network_change_notifier.cc.orig Tue Aug 14 09:01:30 2012 ++++ net/base/network_change_notifier.cc Wed Aug 15 23:14:35 2012 +@@ -71,7 +71,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() #elif defined(OS_MACOSX) return new NetworkChangeNotifierMac(); #else diff --git a/www/chromium/patches/patch-net_socket_socks5_client_socket_cc b/www/chromium/patches/patch-net_socket_socks5_client_socket_cc new file mode 100644 index 00000000000..e98eedc3c03 --- /dev/null +++ b/www/chromium/patches/patch-net_socket_socks5_client_socket_cc @@ -0,0 +1,13 @@ +$OpenBSD: patch-net_socket_socks5_client_socket_cc,v 1.1 2012/08/26 18:47:01 robert Exp $ +--- net/socket/socks5_client_socket.cc.orig Thu Aug 16 11:38:12 2012 ++++ net/socket/socks5_client_socket.cc Fri Aug 17 10:53:54 2012 +@@ -15,6 +15,9 @@ + #include "net/base/net_util.h" + #include "net/socket/client_socket_handle.h" + ++#include ++#include ++ + namespace net { + + const unsigned int SOCKS5ClientSocket::kGreetReadHeaderSize = 2; diff --git a/www/chromium/patches/patch-ppapi_shared_impl_private_net_address_private_impl_cc b/www/chromium/patches/patch-ppapi_shared_impl_private_net_address_private_impl_cc new file mode 100644 index 00000000000..f1a43b1dac8 --- /dev/null +++ b/www/chromium/patches/patch-ppapi_shared_impl_private_net_address_private_impl_cc @@ -0,0 +1,13 @@ +$OpenBSD: patch-ppapi_shared_impl_private_net_address_private_impl_cc,v 1.1 2012/08/26 18:47:01 robert Exp $ +--- ppapi/shared_impl/private/net_address_private_impl.cc.orig Mon Aug 20 10:07:38 2012 ++++ ppapi/shared_impl/private/net_address_private_impl.cc Mon Aug 20 10:08:04 2012 +@@ -21,6 +21,9 @@ + #include "ppapi/shared_impl/var.h" + #include "ppapi/thunk/thunk.h" + ++#include ++#include ++ + #if defined(OS_MACOSX) + // This is a bit evil, but it's standard operating procedure for |s6_addr|.... + #define s6_addr16 __u6_addr.__u6_addr16 diff --git a/www/chromium/patches/patch-printing_printing_gyp b/www/chromium/patches/patch-printing_printing_gyp index fcbff3da4f1..24e72e8dbce 100644 --- a/www/chromium/patches/patch-printing_printing_gyp +++ b/www/chromium/patches/patch-printing_printing_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-printing_printing_gyp,v 1.11 2012/07/10 09:22:34 robert Exp $ ---- printing/printing.gyp.orig Thu Jun 28 15:01:16 2012 -+++ printing/printing.gyp Sat Jul 7 09:50:31 2012 -@@ -261,6 +261,11 @@ +$OpenBSD: patch-printing_printing_gyp,v 1.12 2012/08/26 18:47:01 robert Exp $ +--- printing/printing.gyp.orig Tue Aug 14 09:01:15 2012 ++++ printing/printing.gyp Wed Aug 15 23:14:35 2012 +@@ -270,6 +270,11 @@ ' V8InspectorFrontendHost::platfor - return v8String("solaris"); - #elif defined(OS_WIN) - return v8String("windows"); -+#elif defined(OS_OPENBSD) -+ return v8String("openbsd"); - #else - return v8String("unknown"); - #endif diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_asm b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_asm index 41e2043fe9c..29cae1ccd08 100644 --- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_asm +++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_asm @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_asm,v 1.1 2012/07/10 09:22:34 robert Exp $ ---- third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.asm.orig Mon Jul 9 18:20:33 2012 -+++ third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.asm Mon Jul 9 18:20:43 2012 -@@ -1,89 +1,1191 @@ +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_asm,v 1.2 2012/08/26 18:47:01 robert Exp $ +--- third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.asm.orig Fri Aug 17 03:03:05 2012 ++++ third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.asm Sun Aug 26 12:40:25 2012 +@@ -1,89 +1,1203 @@ -%define ARCH_X86 -%define ARCH_X86_32 -%define HAVE_AVX @@ -199,9 +199,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define HAVE_MEMALIGN 0 +%define HAVE_MKSTEMP 1 +%define HAVE_MMAP 1 ++%define HAVE_NETINET_SCTP_H 0 +%define HAVE_PEEKNAMEDPIPE 0 +%define HAVE_POLL_H 1 +%define HAVE_POSIX_MEMALIGN 1 ++%define HAVE_PTHREAD_CANCEL 1 +%define HAVE_ROUND 1 +%define HAVE_ROUNDF 1 +%define HAVE_SCHED_GETAFFINITY 0 @@ -260,8 +262,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_AC3DSP 0 +%define CONFIG_AVCODEC 1 +%define CONFIG_AVDEVICE 1 -+%define CONFIG_AVFILTER 1 ++%define CONFIG_AVFILTER 0 +%define CONFIG_AVFORMAT 1 ++%define CONFIG_AVRESAMPLE 0 +%define CONFIG_AVISYNTH 0 +%define CONFIG_BZLIB 0 +%define CONFIG_CRYSTALHD 0 @@ -283,7 +286,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_LIBCDIO 0 +%define CONFIG_LIBCELT 0 +%define CONFIG_LIBDC1394 0 -+%define CONFIG_LIBDIRAC 0 +%define CONFIG_LIBFAAC 0 +%define CONFIG_LIBFREETYPE 0 +%define CONFIG_LIBGSM 0 @@ -373,6 +375,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_AURA2_DECODER 0 +%define CONFIG_AVRP_DECODER 0 +%define CONFIG_AVS_DECODER 0 ++%define CONFIG_AVUI_DECODER 0 +%define CONFIG_AYUV_DECODER 0 +%define CONFIG_BETHSOFTVID_DECODER 0 +%define CONFIG_BFI_DECODER 0 @@ -673,11 +676,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_ASS_DECODER 0 +%define CONFIG_DVBSUB_DECODER 0 +%define CONFIG_DVDSUB_DECODER 0 ++%define CONFIG_JACOSUB_DECODER 0 ++%define CONFIG_MICRODVD_DECODER 0 +%define CONFIG_PGSSUB_DECODER 0 +%define CONFIG_SRT_DECODER 0 +%define CONFIG_XSUB_DECODER 0 +%define CONFIG_LIBCELT_DECODER 0 -+%define CONFIG_LIBDIRAC_DECODER 0 +%define CONFIG_LIBGSM_DECODER 0 +%define CONFIG_LIBGSM_MS_DECODER 0 +%define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 @@ -687,6 +691,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_LIBSPEEX_DECODER 0 +%define CONFIG_LIBSTAGEFRIGHT_H264_DECODER 0 +%define CONFIG_LIBUTVIDEO_DECODER 0 ++%define CONFIG_LIBVORBIS_DECODER 0 +%define CONFIG_LIBVPX_DECODER 0 +%define CONFIG_BINTEXT_DECODER 0 +%define CONFIG_XBIN_DECODER 0 @@ -757,6 +762,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_ISS_DEMUXER 0 +%define CONFIG_IV8_DEMUXER 0 +%define CONFIG_IVF_DEMUXER 0 ++%define CONFIG_JACOSUB_DEMUXER 0 +%define CONFIG_JV_DEMUXER 0 +%define CONFIG_LATM_DEMUXER 0 +%define CONFIG_LMLM4_DEMUXER 0 @@ -868,6 +874,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_ASV1_ENCODER 0 +%define CONFIG_ASV2_ENCODER 0 +%define CONFIG_AVRP_ENCODER 0 ++%define CONFIG_AVUI_ENCODER 0 +%define CONFIG_AYUV_ENCODER 0 +%define CONFIG_BMP_ENCODER 0 +%define CONFIG_CLJR_ENCODER 0 @@ -1002,16 +1009,18 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_ACONVERT_FILTER 0 +%define CONFIG_AFORMAT_FILTER 0 +%define CONFIG_AMERGE_FILTER 0 ++%define CONFIG_AMIX_FILTER 0 +%define CONFIG_ANULL_FILTER 0 +%define CONFIG_ARESAMPLE_FILTER 0 +%define CONFIG_ASHOWINFO_FILTER 0 +%define CONFIG_ASPLIT_FILTER 0 +%define CONFIG_ASTREAMSYNC_FILTER 0 ++%define CONFIG_ASYNCTS_FILTER 0 +%define CONFIG_EARWAX_FILTER 0 +%define CONFIG_PAN_FILTER 0 +%define CONFIG_SILENCEDETECT_FILTER 0 +%define CONFIG_VOLUME_FILTER 0 -+%define CONFIG_ABUFFER_FILTER 0 ++%define CONFIG_RESAMPLE_FILTER 0 +%define CONFIG_AEVALSRC_FILTER 0 +%define CONFIG_AMOVIE_FILTER 0 +%define CONFIG_ANULLSRC_FILTER 0 @@ -1034,6 +1043,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_FIELDORDER_FILTER 0 +%define CONFIG_FIFO_FILTER 0 +%define CONFIG_FORMAT_FILTER 0 ++%define CONFIG_FPS_FILTER 0 +%define CONFIG_FREI0R_FILTER 0 +%define CONFIG_GRADFUN_FILTER 0 +%define CONFIG_HFLIP_FILTER 0 @@ -1051,7 +1061,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_PAD_FILTER 0 +%define CONFIG_PIXDESCTEST_FILTER 0 +%define CONFIG_REMOVELOGO_FILTER 0 -+%define CONFIG_SCALE_FILTER 0 +%define CONFIG_SELECT_FILTER 0 +%define CONFIG_SETDAR_FILTER 0 +%define CONFIG_SETFIELD_FILTER 0 @@ -1152,6 +1161,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_IPOD_MUXER 0 +%define CONFIG_ISMV_MUXER 0 +%define CONFIG_IVF_MUXER 0 ++%define CONFIG_JACOSUB_MUXER 0 +%define CONFIG_LATM_MUXER 0 +%define CONFIG_M4V_MUXER 0 +%define CONFIG_MD5_MUXER 0 @@ -1250,6 +1260,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_MPEG4VIDEO_PARSER 0 +%define CONFIG_MPEGAUDIO_PARSER 0 +%define CONFIG_MPEGVIDEO_PARSER 0 ++%define CONFIG_PNG_PARSER 0 +%define CONFIG_PNM_PARSER 0 +%define CONFIG_RV30_PARSER 0 +%define CONFIG_RV40_PARSER 0 @@ -1274,6 +1285,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +%define CONFIG_PIPE_PROTOCOL 0 +%define CONFIG_RTMP_PROTOCOL 0 +%define CONFIG_RTP_PROTOCOL 0 ++%define CONFIG_SCTP_PROTOCOL 0 +%define CONFIG_TCP_PROTOCOL 0 +%define CONFIG_TLS_PROTOCOL 0 +%define CONFIG_UDP_PROTOCOL 0 diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_h b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_h index 4000288830b..876af8f5361 100644 --- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_h +++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_h,v 1.1 2012/07/10 09:22:34 robert Exp $ ---- third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.h.orig Tue Jul 10 11:00:36 2012 -+++ third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.h Mon Jul 9 18:20:17 2012 +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_h,v 1.2 2012/08/26 18:47:01 robert Exp $ +--- third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.h.orig Fri Aug 17 03:03:05 2012 ++++ third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.h Sun Aug 26 12:40:23 2012 @@ -1,9 +1,10 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H @@ -79,7 +79,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define HAVE_LLRINT 1 #define HAVE_LLRINTF 1 #define HAVE_LOCAL_ALIGNED_16 1 -@@ -106,37 +113,45 @@ +@@ -106,37 +113,47 @@ #define HAVE_LZO1X_999_COMPRESS 0 #define HAVE_MACHINE_IOCTL_BT848_H 0 #define HAVE_MACHINE_IOCTL_METEOR_H 0 @@ -90,9 +90,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +#define HAVE_MEMALIGN 0 #define HAVE_MKSTEMP 1 #define HAVE_MMAP 1 ++#define HAVE_NETINET_SCTP_H 0 +#define HAVE_PEEKNAMEDPIPE 0 +#define HAVE_POLL_H 1 #define HAVE_POSIX_MEMALIGN 1 ++#define HAVE_PTHREAD_CANCEL 1 #define HAVE_ROUND 1 #define HAVE_ROUNDF 1 +#define HAVE_SCHED_GETAFFINITY 0 @@ -135,7 +137,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define HAVE_TERMIOS_H 1 #define HAVE_THREADS 1 #define HAVE_TRUNC 1 -@@ -157,8 +172,11 @@ +@@ -157,13 +174,17 @@ #define CONFIG_MUXERS 0 #define CONFIG_OUTDEVS 0 #define CONFIG_PARSERS 1 @@ -149,7 +151,14 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_AC3DSP 0 #define CONFIG_AVCODEC 1 #define CONFIG_AVDEVICE 1 -@@ -172,35 +190,38 @@ +-#define CONFIG_AVFILTER 1 ++#define CONFIG_AVFILTER 0 + #define CONFIG_AVFORMAT 1 ++#define CONFIG_AVRESAMPLE 0 + #define CONFIG_AVISYNTH 0 + #define CONFIG_BZLIB 0 + #define CONFIG_CRYSTALHD 0 +@@ -172,35 +193,37 @@ #define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 @@ -174,7 +183,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +#define CONFIG_LIBCDIO 0 #define CONFIG_LIBCELT 0 #define CONFIG_LIBDC1394 0 - #define CONFIG_LIBDIRAC 0 +-#define CONFIG_LIBDIRAC 0 #define CONFIG_LIBFAAC 0 #define CONFIG_LIBFREETYPE 0 #define CONFIG_LIBGSM 0 @@ -196,7 +205,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_LIBVO_AACENC 0 #define CONFIG_LIBVO_AMRWBENC 0 #define CONFIG_LIBVORBIS 0 -@@ -208,36 +229,60 @@ +@@ -208,36 +231,60 @@ #define CONFIG_LIBX264 0 #define CONFIG_LIBXAVS 0 #define CONFIG_LIBXVID 0 @@ -259,12 +268,13 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_AASC_DECODER 0 #define CONFIG_AMV_DECODER 0 #define CONFIG_ANM_DECODER 0 -@@ -246,24 +291,30 @@ +@@ -246,24 +293,31 @@ #define CONFIG_ASV2_DECODER 0 #define CONFIG_AURA_DECODER 0 #define CONFIG_AURA2_DECODER 0 +#define CONFIG_AVRP_DECODER 0 #define CONFIG_AVS_DECODER 0 ++#define CONFIG_AVUI_DECODER 0 +#define CONFIG_AYUV_DECODER 0 #define CONFIG_BETHSOFTVID_DECODER 0 #define CONFIG_BFI_DECODER 0 @@ -290,7 +300,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_EACMV_DECODER 0 #define CONFIG_EAMAD_DECODER 0 #define CONFIG_EATGQ_DECODER 0 -@@ -272,11 +323,13 @@ +@@ -272,11 +326,13 @@ #define CONFIG_EIGHTBPS_DECODER 0 #define CONFIG_EIGHTSVX_EXP_DECODER 0 #define CONFIG_EIGHTSVX_FIB_DECODER 0 @@ -305,7 +315,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_FLIC_DECODER 0 #define CONFIG_FLV_DECODER 0 #define CONFIG_FOURXM_DECODER 0 -@@ -295,6 +348,7 @@ +@@ -295,6 +351,7 @@ #define CONFIG_IFF_ILBM_DECODER 0 #define CONFIG_INDEO2_DECODER 0 #define CONFIG_INDEO3_DECODER 0 @@ -313,7 +323,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_INDEO5_DECODER 0 #define CONFIG_INTERPLAY_VIDEO_DECODER 0 #define CONFIG_JPEG2000_DECODER 0 -@@ -337,6 +391,8 @@ +@@ -337,6 +394,8 @@ #define CONFIG_PICTOR_DECODER 0 #define CONFIG_PNG_DECODER 0 #define CONFIG_PPM_DECODER 0 @@ -322,7 +332,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_PTX_DECODER 0 #define CONFIG_QDRAW_DECODER 0 #define CONFIG_QPEG_DECODER 0 -@@ -371,12 +427,18 @@ +@@ -371,12 +430,18 @@ #define CONFIG_TSCC_DECODER 0 #define CONFIG_TXD_DECODER 0 #define CONFIG_ULTI_DECODER 0 @@ -341,7 +351,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_VCR1_DECODER 0 #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 -@@ -392,11 +454,17 @@ +@@ -392,11 +457,17 @@ #define CONFIG_WMV3_DECODER 0 #define CONFIG_WMV3_CRYSTALHD_DECODER 0 #define CONFIG_WMV3_VDPAU_DECODER 0 @@ -359,7 +369,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_ZLIB_DECODER 0 #define CONFIG_ZMBV_DECODER 0 #define CONFIG_AAC_DECODER 0 -@@ -411,11 +479,15 @@ +@@ -411,11 +482,15 @@ #define CONFIG_ATRAC3_DECODER 0 #define CONFIG_BINKAUDIO_DCT_DECODER 0 #define CONFIG_BINKAUDIO_RDFT_DECODER 0 @@ -375,7 +385,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_GSM_DECODER 0 #define CONFIG_GSM_MS_DECODER 0 #define CONFIG_IMC_DECODER 0 -@@ -439,6 +511,7 @@ +@@ -439,6 +514,7 @@ #define CONFIG_QDM2_DECODER 0 #define CONFIG_RA_144_DECODER 0 #define CONFIG_RA_288_DECODER 0 @@ -383,7 +393,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_SHORTEN_DECODER 0 #define CONFIG_SIPR_DECODER 0 #define CONFIG_SMACKAUD_DECODER 0 -@@ -450,6 +523,7 @@ +@@ -450,6 +526,7 @@ #define CONFIG_VMDAUDIO_DECODER 0 #define CONFIG_VORBIS_DECODER 1 #define CONFIG_WAVPACK_DECODER 0 @@ -391,7 +401,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_WMAPRO_DECODER 0 #define CONFIG_WMAV1_DECODER 0 #define CONFIG_WMAV2_DECODER 0 -@@ -465,6 +539,7 @@ +@@ -465,6 +542,7 @@ #define CONFIG_PCM_LXF_DECODER 0 #define CONFIG_PCM_MULAW_DECODER 0 #define CONFIG_PCM_S8_DECODER 0 @@ -399,7 +409,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_PCM_S16BE_DECODER 0 #define CONFIG_PCM_S16LE_DECODER 1 #define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -@@ -497,6 +572,7 @@ +@@ -497,6 +575,7 @@ #define CONFIG_ADPCM_G722_DECODER 0 #define CONFIG_ADPCM_G726_DECODER 0 #define CONFIG_ADPCM_IMA_AMV_DECODER 0 @@ -407,12 +417,27 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_ADPCM_IMA_DK3_DECODER 0 #define CONFIG_ADPCM_IMA_DK4_DECODER 0 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -@@ -529,179 +605,23 @@ +@@ -517,11 +596,12 @@ + #define CONFIG_ASS_DECODER 0 + #define CONFIG_DVBSUB_DECODER 0 + #define CONFIG_DVDSUB_DECODER 0 ++#define CONFIG_JACOSUB_DECODER 0 ++#define CONFIG_MICRODVD_DECODER 0 + #define CONFIG_PGSSUB_DECODER 0 + #define CONFIG_SRT_DECODER 0 + #define CONFIG_XSUB_DECODER 0 + #define CONFIG_LIBCELT_DECODER 0 +-#define CONFIG_LIBDIRAC_DECODER 0 + #define CONFIG_LIBGSM_DECODER 0 + #define CONFIG_LIBGSM_MS_DECODER 0 + #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 +@@ -529,179 +609,24 @@ #define CONFIG_LIBOPENJPEG_DECODER 0 #define CONFIG_LIBSCHROEDINGER_DECODER 0 #define CONFIG_LIBSPEEX_DECODER 0 +#define CONFIG_LIBSTAGEFRIGHT_H264_DECODER 0 +#define CONFIG_LIBUTVIDEO_DECODER 0 ++#define CONFIG_LIBVORBIS_DECODER 0 #define CONFIG_LIBVPX_DECODER 0 -#define CONFIG_A64MULTI_ENCODER 0 -#define CONFIG_A64MULTI5_ENCODER 0 @@ -595,7 +620,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_ASF_DEMUXER 0 #define CONFIG_ASS_DEMUXER 0 #define CONFIG_AU_DEMUXER 0 -@@ -710,11 +630,15 @@ +@@ -710,11 +635,15 @@ #define CONFIG_AVS_DEMUXER 0 #define CONFIG_BETHSOFTVID_DEMUXER 0 #define CONFIG_BFI_DEMUXER 0 @@ -611,7 +636,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_DAUD_DEMUXER 0 #define CONFIG_DFA_DEMUXER 0 #define CONFIG_DIRAC_DEMUXER 0 -@@ -734,12 +658,17 @@ +@@ -734,12 +663,17 @@ #define CONFIG_FLV_DEMUXER 0 #define CONFIG_FOURXM_DEMUXER 0 #define CONFIG_G722_DEMUXER 0 @@ -629,9 +654,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_IFF_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 -@@ -749,10 +678,13 @@ +@@ -748,11 +682,15 @@ + #define CONFIG_ISS_DEMUXER 0 #define CONFIG_IV8_DEMUXER 0 #define CONFIG_IVF_DEMUXER 0 ++#define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_LATM_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 @@ -643,7 +670,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_MICRODVD_DEMUXER 0 #define CONFIG_MJPEG_DEMUXER 0 #define CONFIG_MLP_DEMUXER 0 -@@ -810,11 +742,13 @@ +@@ -810,11 +748,13 @@ #define CONFIG_RTP_DEMUXER 0 #define CONFIG_RTSP_DEMUXER 0 #define CONFIG_SAP_DEMUXER 0 @@ -657,7 +684,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_SOL_DEMUXER 0 #define CONFIG_SOX_DEMUXER 0 #define CONFIG_SPDIF_DEMUXER 0 -@@ -836,19 +770,271 @@ +@@ -836,19 +776,274 @@ #define CONFIG_W64_DEMUXER 0 #define CONFIG_WAV_DEMUXER 1 #define CONFIG_WC3_DEMUXER 0 @@ -680,6 +707,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +#define CONFIG_ASV1_ENCODER 0 +#define CONFIG_ASV2_ENCODER 0 +#define CONFIG_AVRP_ENCODER 0 ++#define CONFIG_AVUI_ENCODER 0 +#define CONFIG_AYUV_ENCODER 0 +#define CONFIG_BMP_ENCODER 0 +#define CONFIG_CLJR_ENCODER 0 @@ -814,16 +842,18 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +#define CONFIG_ACONVERT_FILTER 0 +#define CONFIG_AFORMAT_FILTER 0 +#define CONFIG_AMERGE_FILTER 0 ++#define CONFIG_AMIX_FILTER 0 +#define CONFIG_ANULL_FILTER 0 +#define CONFIG_ARESAMPLE_FILTER 0 +#define CONFIG_ASHOWINFO_FILTER 0 +#define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASTREAMSYNC_FILTER 0 ++#define CONFIG_ASYNCTS_FILTER 0 +#define CONFIG_EARWAX_FILTER 0 +#define CONFIG_PAN_FILTER 0 +#define CONFIG_SILENCEDETECT_FILTER 0 +#define CONFIG_VOLUME_FILTER 0 -+#define CONFIG_ABUFFER_FILTER 0 ++#define CONFIG_RESAMPLE_FILTER 0 +#define CONFIG_AEVALSRC_FILTER 0 +#define CONFIG_AMOVIE_FILTER 0 +#define CONFIG_ANULLSRC_FILTER 0 @@ -846,6 +876,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +#define CONFIG_FIELDORDER_FILTER 0 +#define CONFIG_FIFO_FILTER 0 +#define CONFIG_FORMAT_FILTER 0 ++#define CONFIG_FPS_FILTER 0 +#define CONFIG_FREI0R_FILTER 0 +#define CONFIG_GRADFUN_FILTER 0 +#define CONFIG_HFLIP_FILTER 0 @@ -863,7 +894,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +#define CONFIG_PAD_FILTER 0 +#define CONFIG_PIXDESCTEST_FILTER 0 +#define CONFIG_REMOVELOGO_FILTER 0 -+#define CONFIG_SCALE_FILTER 0 +#define CONFIG_SELECT_FILTER 0 +#define CONFIG_SETDAR_FILTER 0 +#define CONFIG_SETFIELD_FILTER 0 @@ -930,7 +960,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_AIFF_MUXER 0 #define CONFIG_AMR_MUXER 0 #define CONFIG_ASF_MUXER 0 -@@ -857,6 +1043,7 @@ +@@ -857,6 +1052,7 @@ #define CONFIG_AU_MUXER 0 #define CONFIG_AVI_MUXER 0 #define CONFIG_AVM2_MUXER 0 @@ -938,7 +968,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_CAF_MUXER 0 #define CONFIG_CAVSVIDEO_MUXER 0 #define CONFIG_CRC_MUXER 0 -@@ -874,6 +1061,7 @@ +@@ -874,6 +1070,7 @@ #define CONFIG_FRAMECRC_MUXER 0 #define CONFIG_FRAMEMD5_MUXER 0 #define CONFIG_G722_MUXER 0 @@ -946,17 +976,18 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_GIF_MUXER 0 #define CONFIG_GXF_MUXER 0 #define CONFIG_H261_MUXER 0 -@@ -882,7 +1070,9 @@ +@@ -882,7 +1079,10 @@ #define CONFIG_IMAGE2_MUXER 0 #define CONFIG_IMAGE2PIPE_MUXER 0 #define CONFIG_IPOD_MUXER 0 +#define CONFIG_ISMV_MUXER 0 #define CONFIG_IVF_MUXER 0 ++#define CONFIG_JACOSUB_MUXER 0 +#define CONFIG_LATM_MUXER 0 #define CONFIG_M4V_MUXER 0 #define CONFIG_MD5_MUXER 0 #define CONFIG_MATROSKA_MUXER 0 -@@ -909,6 +1099,7 @@ +@@ -909,6 +1109,7 @@ #define CONFIG_NULL_MUXER 0 #define CONFIG_NUT_MUXER 0 #define CONFIG_OGG_MUXER 0 @@ -964,7 +995,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ #define CONFIG_PCM_ALAW_MUXER 0 #define CONFIG_PCM_MULAW_MUXER 0 #define CONFIG_PCM_F64BE_MUXER 0 -@@ -937,103 +1128,78 @@ +@@ -937,103 +1138,80 @@ #define CONFIG_RTP_MUXER 0 #define CONFIG_RTSP_MUXER 0 #define CONFIG_SAP_MUXER 0 @@ -1060,6 +1091,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ +#define CONFIG_MPEG4VIDEO_PARSER 0 +#define CONFIG_MPEGAUDIO_PARSER 0 +#define CONFIG_MPEGVIDEO_PARSER 0 ++#define CONFIG_PNG_PARSER 0 +#define CONFIG_PNM_PARSER 0 +#define CONFIG_RV30_PARSER 0 +#define CONFIG_RV40_PARSER 0 @@ -1088,6 +1120,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_ -#define CONFIG_RTMPTE_PROTOCOL 0 -#define CONFIG_RTMPS_PROTOCOL 0 #define CONFIG_RTP_PROTOCOL 0 ++#define CONFIG_SCTP_PROTOCOL 0 #define CONFIG_TCP_PROTOCOL 0 +#define CONFIG_TLS_PROTOCOL 0 #define CONFIG_UDP_PROTOCOL 0 diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_asm b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_asm index 1c0d203ff50..9fcb1199a00 100644 --- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_asm +++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_asm @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_asm,v 1.1 2012/07/10 09:22:34 robert Exp $ ---- third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.asm.orig Thu Jun 28 15:03:01 2012 -+++ third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.asm Sat Jul 7 13:12:49 2012 -@@ -1,97 +1,1191 @@ +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_asm,v 1.2 2012/08/26 18:47:01 robert Exp $ +--- third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.asm.orig Tue Aug 14 09:02:58 2012 ++++ third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.asm Sun Aug 19 14:59:49 2012 +@@ -1,97 +1,1203 @@ -%define ARCH_X86 -%define ARCH_X86_64 -%define HAVE_AVX @@ -207,14 +207,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define HAVE_MEMALIGN 0 +%define HAVE_MKSTEMP 1 +%define HAVE_MMAP 1 ++%define HAVE_NETINET_SCTP_H 0 +%define HAVE_PEEKNAMEDPIPE 0 +%define HAVE_POLL_H 1 +%define HAVE_POSIX_MEMALIGN 1 ++%define HAVE_PTHREAD_CANCEL 1 +%define HAVE_ROUND 1 +%define HAVE_ROUNDF 1 +%define HAVE_SCHED_GETAFFINITY 0 -+%define HAVE_SDL 1 -+%define HAVE_SDL_VIDEO_SIZE 1 ++%define HAVE_SDL 0 ++%define HAVE_SDL_VIDEO_SIZE 0 +%define HAVE_SETMODE 0 +%define HAVE_SETRLIMIT 1 +%define HAVE_SNDIO_H 1 @@ -268,13 +270,14 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_AC3DSP 0 +%define CONFIG_AVCODEC 1 +%define CONFIG_AVDEVICE 1 -+%define CONFIG_AVFILTER 1 ++%define CONFIG_AVFILTER 0 +%define CONFIG_AVFORMAT 1 ++%define CONFIG_AVRESAMPLE 0 +%define CONFIG_AVISYNTH 0 +%define CONFIG_BZLIB 0 +%define CONFIG_CRYSTALHD 0 +%define CONFIG_DCT 0 -+%define CONFIG_DOC 1 ++%define CONFIG_DOC 0 +%define CONFIG_DWT 0 +%define CONFIG_DXVA2 0 +%define CONFIG_FASTDIV 1 @@ -291,7 +294,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_LIBCDIO 0 +%define CONFIG_LIBCELT 0 +%define CONFIG_LIBDC1394 0 -+%define CONFIG_LIBDIRAC 0 +%define CONFIG_LIBFAAC 0 +%define CONFIG_LIBFREETYPE 0 +%define CONFIG_LIBGSM 0 @@ -381,6 +383,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_AURA2_DECODER 0 +%define CONFIG_AVRP_DECODER 0 +%define CONFIG_AVS_DECODER 0 ++%define CONFIG_AVUI_DECODER 0 +%define CONFIG_AYUV_DECODER 0 +%define CONFIG_BETHSOFTVID_DECODER 0 +%define CONFIG_BFI_DECODER 0 @@ -681,11 +684,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_ASS_DECODER 0 +%define CONFIG_DVBSUB_DECODER 0 +%define CONFIG_DVDSUB_DECODER 0 ++%define CONFIG_JACOSUB_DECODER 0 ++%define CONFIG_MICRODVD_DECODER 0 +%define CONFIG_PGSSUB_DECODER 0 +%define CONFIG_SRT_DECODER 0 +%define CONFIG_XSUB_DECODER 0 +%define CONFIG_LIBCELT_DECODER 0 -+%define CONFIG_LIBDIRAC_DECODER 0 +%define CONFIG_LIBGSM_DECODER 0 +%define CONFIG_LIBGSM_MS_DECODER 0 +%define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 @@ -695,6 +699,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_LIBSPEEX_DECODER 0 +%define CONFIG_LIBSTAGEFRIGHT_H264_DECODER 0 +%define CONFIG_LIBUTVIDEO_DECODER 0 ++%define CONFIG_LIBVORBIS_DECODER 0 +%define CONFIG_LIBVPX_DECODER 0 +%define CONFIG_BINTEXT_DECODER 0 +%define CONFIG_XBIN_DECODER 0 @@ -765,6 +770,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_ISS_DEMUXER 0 +%define CONFIG_IV8_DEMUXER 0 +%define CONFIG_IVF_DEMUXER 0 ++%define CONFIG_JACOSUB_DEMUXER 0 +%define CONFIG_JV_DEMUXER 0 +%define CONFIG_LATM_DEMUXER 0 +%define CONFIG_LMLM4_DEMUXER 0 @@ -876,6 +882,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_ASV1_ENCODER 0 +%define CONFIG_ASV2_ENCODER 0 +%define CONFIG_AVRP_ENCODER 0 ++%define CONFIG_AVUI_ENCODER 0 +%define CONFIG_AYUV_ENCODER 0 +%define CONFIG_BMP_ENCODER 0 +%define CONFIG_CLJR_ENCODER 0 @@ -1010,16 +1017,18 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_ACONVERT_FILTER 0 +%define CONFIG_AFORMAT_FILTER 0 +%define CONFIG_AMERGE_FILTER 0 ++%define CONFIG_AMIX_FILTER 0 +%define CONFIG_ANULL_FILTER 0 +%define CONFIG_ARESAMPLE_FILTER 0 +%define CONFIG_ASHOWINFO_FILTER 0 +%define CONFIG_ASPLIT_FILTER 0 +%define CONFIG_ASTREAMSYNC_FILTER 0 ++%define CONFIG_ASYNCTS_FILTER 0 +%define CONFIG_EARWAX_FILTER 0 +%define CONFIG_PAN_FILTER 0 +%define CONFIG_SILENCEDETECT_FILTER 0 +%define CONFIG_VOLUME_FILTER 0 -+%define CONFIG_ABUFFER_FILTER 0 ++%define CONFIG_RESAMPLE_FILTER 0 +%define CONFIG_AEVALSRC_FILTER 0 +%define CONFIG_AMOVIE_FILTER 0 +%define CONFIG_ANULLSRC_FILTER 0 @@ -1042,6 +1051,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_FIELDORDER_FILTER 0 +%define CONFIG_FIFO_FILTER 0 +%define CONFIG_FORMAT_FILTER 0 ++%define CONFIG_FPS_FILTER 0 +%define CONFIG_FREI0R_FILTER 0 +%define CONFIG_GRADFUN_FILTER 0 +%define CONFIG_HFLIP_FILTER 0 @@ -1059,7 +1069,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_PAD_FILTER 0 +%define CONFIG_PIXDESCTEST_FILTER 0 +%define CONFIG_REMOVELOGO_FILTER 0 -+%define CONFIG_SCALE_FILTER 0 +%define CONFIG_SELECT_FILTER 0 +%define CONFIG_SETDAR_FILTER 0 +%define CONFIG_SETFIELD_FILTER 0 @@ -1160,6 +1169,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_IPOD_MUXER 0 +%define CONFIG_ISMV_MUXER 0 +%define CONFIG_IVF_MUXER 0 ++%define CONFIG_JACOSUB_MUXER 0 +%define CONFIG_LATM_MUXER 0 +%define CONFIG_M4V_MUXER 0 +%define CONFIG_MD5_MUXER 0 @@ -1258,6 +1268,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_MPEG4VIDEO_PARSER 0 +%define CONFIG_MPEGAUDIO_PARSER 0 +%define CONFIG_MPEGVIDEO_PARSER 0 ++%define CONFIG_PNG_PARSER 0 +%define CONFIG_PNM_PARSER 0 +%define CONFIG_RV30_PARSER 0 +%define CONFIG_RV40_PARSER 0 @@ -1282,6 +1293,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a +%define CONFIG_PIPE_PROTOCOL 0 +%define CONFIG_RTMP_PROTOCOL 0 +%define CONFIG_RTP_PROTOCOL 0 ++%define CONFIG_SCTP_PROTOCOL 0 +%define CONFIG_TCP_PROTOCOL 0 +%define CONFIG_TLS_PROTOCOL 0 +%define CONFIG_UDP_PROTOCOL 0 diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h index fee7a32d784..7385837cb76 100644 --- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h +++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h,v 1.1 2012/07/10 09:22:34 robert Exp $ ---- third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.h.orig Thu Jun 28 15:03:01 2012 -+++ third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.h Sat Jul 7 13:12:24 2012 +$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h,v 1.2 2012/08/26 18:47:01 robert Exp $ +--- third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.h.orig Tue Aug 14 09:02:58 2012 ++++ third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.h Sun Aug 19 14:59:44 2012 @@ -1,9 +1,10 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H @@ -75,7 +75,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define HAVE_LLRINT 1 #define HAVE_LLRINTF 1 #define HAVE_LOCAL_ALIGNED_16 1 -@@ -106,37 +113,45 @@ +@@ -106,37 +113,47 @@ #define HAVE_LZO1X_999_COMPRESS 0 #define HAVE_MACHINE_IOCTL_BT848_H 0 #define HAVE_MACHINE_IOCTL_METEOR_H 0 @@ -86,14 +86,18 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h +#define HAVE_MEMALIGN 0 #define HAVE_MKSTEMP 1 #define HAVE_MMAP 1 ++#define HAVE_NETINET_SCTP_H 0 +#define HAVE_PEEKNAMEDPIPE 0 +#define HAVE_POLL_H 1 #define HAVE_POSIX_MEMALIGN 1 ++#define HAVE_PTHREAD_CANCEL 1 #define HAVE_ROUND 1 #define HAVE_ROUNDF 1 +-#define HAVE_SDL 1 +-#define HAVE_SDL_VIDEO_SIZE 1 +#define HAVE_SCHED_GETAFFINITY 0 - #define HAVE_SDL 1 - #define HAVE_SDL_VIDEO_SIZE 1 ++#define HAVE_SDL 0 ++#define HAVE_SDL_VIDEO_SIZE 0 #define HAVE_SETMODE 0 -#define HAVE_SNDIO_H 0 -#define HAVE_SOCKLEN_T 0 @@ -131,7 +135,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define HAVE_TERMIOS_H 1 #define HAVE_THREADS 1 #define HAVE_TRUNC 1 -@@ -157,8 +172,11 @@ +@@ -157,13 +174,17 @@ #define CONFIG_MUXERS 0 #define CONFIG_OUTDEVS 0 #define CONFIG_PARSERS 1 @@ -145,12 +149,14 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_AC3DSP 0 #define CONFIG_AVCODEC 1 #define CONFIG_AVDEVICE 1 -@@ -168,39 +186,42 @@ +-#define CONFIG_AVFILTER 1 ++#define CONFIG_AVFILTER 0 + #define CONFIG_AVFORMAT 1 ++#define CONFIG_AVRESAMPLE 0 + #define CONFIG_AVISYNTH 0 #define CONFIG_BZLIB 0 #define CONFIG_CRYSTALHD 0 - #define CONFIG_DCT 0 --#define CONFIG_DOC 0 -+#define CONFIG_DOC 1 +@@ -172,35 +193,37 @@ #define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 @@ -175,7 +181,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h +#define CONFIG_LIBCDIO 0 #define CONFIG_LIBCELT 0 #define CONFIG_LIBDC1394 0 - #define CONFIG_LIBDIRAC 0 +-#define CONFIG_LIBDIRAC 0 #define CONFIG_LIBFAAC 0 #define CONFIG_LIBFREETYPE 0 #define CONFIG_LIBGSM 0 @@ -197,7 +203,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_LIBVO_AACENC 0 #define CONFIG_LIBVO_AMRWBENC 0 #define CONFIG_LIBVORBIS 0 -@@ -208,36 +229,60 @@ +@@ -208,36 +231,60 @@ #define CONFIG_LIBX264 0 #define CONFIG_LIBXAVS 0 #define CONFIG_LIBXVID 0 @@ -260,12 +266,13 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_AASC_DECODER 0 #define CONFIG_AMV_DECODER 0 #define CONFIG_ANM_DECODER 0 -@@ -246,24 +291,30 @@ +@@ -246,24 +293,31 @@ #define CONFIG_ASV2_DECODER 0 #define CONFIG_AURA_DECODER 0 #define CONFIG_AURA2_DECODER 0 +#define CONFIG_AVRP_DECODER 0 #define CONFIG_AVS_DECODER 0 ++#define CONFIG_AVUI_DECODER 0 +#define CONFIG_AYUV_DECODER 0 #define CONFIG_BETHSOFTVID_DECODER 0 #define CONFIG_BFI_DECODER 0 @@ -291,7 +298,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_EACMV_DECODER 0 #define CONFIG_EAMAD_DECODER 0 #define CONFIG_EATGQ_DECODER 0 -@@ -272,11 +323,13 @@ +@@ -272,11 +326,13 @@ #define CONFIG_EIGHTBPS_DECODER 0 #define CONFIG_EIGHTSVX_EXP_DECODER 0 #define CONFIG_EIGHTSVX_FIB_DECODER 0 @@ -306,7 +313,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_FLIC_DECODER 0 #define CONFIG_FLV_DECODER 0 #define CONFIG_FOURXM_DECODER 0 -@@ -295,6 +348,7 @@ +@@ -295,6 +351,7 @@ #define CONFIG_IFF_ILBM_DECODER 0 #define CONFIG_INDEO2_DECODER 0 #define CONFIG_INDEO3_DECODER 0 @@ -314,7 +321,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_INDEO5_DECODER 0 #define CONFIG_INTERPLAY_VIDEO_DECODER 0 #define CONFIG_JPEG2000_DECODER 0 -@@ -337,6 +391,8 @@ +@@ -337,6 +394,8 @@ #define CONFIG_PICTOR_DECODER 0 #define CONFIG_PNG_DECODER 0 #define CONFIG_PPM_DECODER 0 @@ -323,7 +330,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_PTX_DECODER 0 #define CONFIG_QDRAW_DECODER 0 #define CONFIG_QPEG_DECODER 0 -@@ -371,12 +427,18 @@ +@@ -371,12 +430,18 @@ #define CONFIG_TSCC_DECODER 0 #define CONFIG_TXD_DECODER 0 #define CONFIG_ULTI_DECODER 0 @@ -342,7 +349,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_VCR1_DECODER 0 #define CONFIG_VMDVIDEO_DECODER 0 #define CONFIG_VMNC_DECODER 0 -@@ -392,11 +454,17 @@ +@@ -392,11 +457,17 @@ #define CONFIG_WMV3_DECODER 0 #define CONFIG_WMV3_CRYSTALHD_DECODER 0 #define CONFIG_WMV3_VDPAU_DECODER 0 @@ -360,7 +367,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_ZLIB_DECODER 0 #define CONFIG_ZMBV_DECODER 0 #define CONFIG_AAC_DECODER 0 -@@ -411,11 +479,15 @@ +@@ -411,11 +482,15 @@ #define CONFIG_ATRAC3_DECODER 0 #define CONFIG_BINKAUDIO_DCT_DECODER 0 #define CONFIG_BINKAUDIO_RDFT_DECODER 0 @@ -376,7 +383,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_GSM_DECODER 0 #define CONFIG_GSM_MS_DECODER 0 #define CONFIG_IMC_DECODER 0 -@@ -439,6 +511,7 @@ +@@ -439,6 +514,7 @@ #define CONFIG_QDM2_DECODER 0 #define CONFIG_RA_144_DECODER 0 #define CONFIG_RA_288_DECODER 0 @@ -384,7 +391,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_SHORTEN_DECODER 0 #define CONFIG_SIPR_DECODER 0 #define CONFIG_SMACKAUD_DECODER 0 -@@ -450,6 +523,7 @@ +@@ -450,6 +526,7 @@ #define CONFIG_VMDAUDIO_DECODER 0 #define CONFIG_VORBIS_DECODER 1 #define CONFIG_WAVPACK_DECODER 0 @@ -392,7 +399,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_WMAPRO_DECODER 0 #define CONFIG_WMAV1_DECODER 0 #define CONFIG_WMAV2_DECODER 0 -@@ -465,6 +539,7 @@ +@@ -465,6 +542,7 @@ #define CONFIG_PCM_LXF_DECODER 0 #define CONFIG_PCM_MULAW_DECODER 0 #define CONFIG_PCM_S8_DECODER 0 @@ -400,7 +407,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_PCM_S16BE_DECODER 0 #define CONFIG_PCM_S16LE_DECODER 1 #define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -@@ -497,6 +572,7 @@ +@@ -497,6 +575,7 @@ #define CONFIG_ADPCM_G722_DECODER 0 #define CONFIG_ADPCM_G726_DECODER 0 #define CONFIG_ADPCM_IMA_AMV_DECODER 0 @@ -408,12 +415,27 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_ADPCM_IMA_DK3_DECODER 0 #define CONFIG_ADPCM_IMA_DK4_DECODER 0 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -@@ -529,179 +605,23 @@ +@@ -517,11 +596,12 @@ + #define CONFIG_ASS_DECODER 0 + #define CONFIG_DVBSUB_DECODER 0 + #define CONFIG_DVDSUB_DECODER 0 ++#define CONFIG_JACOSUB_DECODER 0 ++#define CONFIG_MICRODVD_DECODER 0 + #define CONFIG_PGSSUB_DECODER 0 + #define CONFIG_SRT_DECODER 0 + #define CONFIG_XSUB_DECODER 0 + #define CONFIG_LIBCELT_DECODER 0 +-#define CONFIG_LIBDIRAC_DECODER 0 + #define CONFIG_LIBGSM_DECODER 0 + #define CONFIG_LIBGSM_MS_DECODER 0 + #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 +@@ -529,179 +609,24 @@ #define CONFIG_LIBOPENJPEG_DECODER 0 #define CONFIG_LIBSCHROEDINGER_DECODER 0 #define CONFIG_LIBSPEEX_DECODER 0 +#define CONFIG_LIBSTAGEFRIGHT_H264_DECODER 0 +#define CONFIG_LIBUTVIDEO_DECODER 0 ++#define CONFIG_LIBVORBIS_DECODER 0 #define CONFIG_LIBVPX_DECODER 0 -#define CONFIG_A64MULTI_ENCODER 0 -#define CONFIG_A64MULTI5_ENCODER 0 @@ -596,7 +618,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_ASF_DEMUXER 0 #define CONFIG_ASS_DEMUXER 0 #define CONFIG_AU_DEMUXER 0 -@@ -710,11 +630,15 @@ +@@ -710,11 +635,15 @@ #define CONFIG_AVS_DEMUXER 0 #define CONFIG_BETHSOFTVID_DEMUXER 0 #define CONFIG_BFI_DEMUXER 0 @@ -612,7 +634,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_DAUD_DEMUXER 0 #define CONFIG_DFA_DEMUXER 0 #define CONFIG_DIRAC_DEMUXER 0 -@@ -734,12 +658,17 @@ +@@ -734,12 +663,17 @@ #define CONFIG_FLV_DEMUXER 0 #define CONFIG_FOURXM_DEMUXER 0 #define CONFIG_G722_DEMUXER 0 @@ -630,9 +652,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_IFF_DEMUXER 0 #define CONFIG_IMAGE2_DEMUXER 0 #define CONFIG_IMAGE2PIPE_DEMUXER 0 -@@ -749,10 +678,13 @@ +@@ -748,11 +682,15 @@ + #define CONFIG_ISS_DEMUXER 0 #define CONFIG_IV8_DEMUXER 0 #define CONFIG_IVF_DEMUXER 0 ++#define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 +#define CONFIG_LATM_DEMUXER 0 #define CONFIG_LMLM4_DEMUXER 0 @@ -644,7 +668,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_MICRODVD_DEMUXER 0 #define CONFIG_MJPEG_DEMUXER 0 #define CONFIG_MLP_DEMUXER 0 -@@ -810,11 +742,13 @@ +@@ -810,11 +748,13 @@ #define CONFIG_RTP_DEMUXER 0 #define CONFIG_RTSP_DEMUXER 0 #define CONFIG_SAP_DEMUXER 0 @@ -658,7 +682,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_SOL_DEMUXER 0 #define CONFIG_SOX_DEMUXER 0 #define CONFIG_SPDIF_DEMUXER 0 -@@ -836,19 +770,271 @@ +@@ -836,19 +776,274 @@ #define CONFIG_W64_DEMUXER 0 #define CONFIG_WAV_DEMUXER 1 #define CONFIG_WC3_DEMUXER 0 @@ -681,6 +705,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h +#define CONFIG_ASV1_ENCODER 0 +#define CONFIG_ASV2_ENCODER 0 +#define CONFIG_AVRP_ENCODER 0 ++#define CONFIG_AVUI_ENCODER 0 +#define CONFIG_AYUV_ENCODER 0 +#define CONFIG_BMP_ENCODER 0 +#define CONFIG_CLJR_ENCODER 0 @@ -815,16 +840,18 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h +#define CONFIG_ACONVERT_FILTER 0 +#define CONFIG_AFORMAT_FILTER 0 +#define CONFIG_AMERGE_FILTER 0 ++#define CONFIG_AMIX_FILTER 0 +#define CONFIG_ANULL_FILTER 0 +#define CONFIG_ARESAMPLE_FILTER 0 +#define CONFIG_ASHOWINFO_FILTER 0 +#define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASTREAMSYNC_FILTER 0 ++#define CONFIG_ASYNCTS_FILTER 0 +#define CONFIG_EARWAX_FILTER 0 +#define CONFIG_PAN_FILTER 0 +#define CONFIG_SILENCEDETECT_FILTER 0 +#define CONFIG_VOLUME_FILTER 0 -+#define CONFIG_ABUFFER_FILTER 0 ++#define CONFIG_RESAMPLE_FILTER 0 +#define CONFIG_AEVALSRC_FILTER 0 +#define CONFIG_AMOVIE_FILTER 0 +#define CONFIG_ANULLSRC_FILTER 0 @@ -847,6 +874,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h +#define CONFIG_FIELDORDER_FILTER 0 +#define CONFIG_FIFO_FILTER 0 +#define CONFIG_FORMAT_FILTER 0 ++#define CONFIG_FPS_FILTER 0 +#define CONFIG_FREI0R_FILTER 0 +#define CONFIG_GRADFUN_FILTER 0 +#define CONFIG_HFLIP_FILTER 0 @@ -864,7 +892,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h +#define CONFIG_PAD_FILTER 0 +#define CONFIG_PIXDESCTEST_FILTER 0 +#define CONFIG_REMOVELOGO_FILTER 0 -+#define CONFIG_SCALE_FILTER 0 +#define CONFIG_SELECT_FILTER 0 +#define CONFIG_SETDAR_FILTER 0 +#define CONFIG_SETFIELD_FILTER 0 @@ -931,7 +958,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_AIFF_MUXER 0 #define CONFIG_AMR_MUXER 0 #define CONFIG_ASF_MUXER 0 -@@ -857,6 +1043,7 @@ +@@ -857,6 +1052,7 @@ #define CONFIG_AU_MUXER 0 #define CONFIG_AVI_MUXER 0 #define CONFIG_AVM2_MUXER 0 @@ -939,7 +966,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_CAF_MUXER 0 #define CONFIG_CAVSVIDEO_MUXER 0 #define CONFIG_CRC_MUXER 0 -@@ -874,6 +1061,7 @@ +@@ -874,6 +1070,7 @@ #define CONFIG_FRAMECRC_MUXER 0 #define CONFIG_FRAMEMD5_MUXER 0 #define CONFIG_G722_MUXER 0 @@ -947,17 +974,18 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_GIF_MUXER 0 #define CONFIG_GXF_MUXER 0 #define CONFIG_H261_MUXER 0 -@@ -882,7 +1070,9 @@ +@@ -882,7 +1079,10 @@ #define CONFIG_IMAGE2_MUXER 0 #define CONFIG_IMAGE2PIPE_MUXER 0 #define CONFIG_IPOD_MUXER 0 +#define CONFIG_ISMV_MUXER 0 #define CONFIG_IVF_MUXER 0 ++#define CONFIG_JACOSUB_MUXER 0 +#define CONFIG_LATM_MUXER 0 #define CONFIG_M4V_MUXER 0 #define CONFIG_MD5_MUXER 0 #define CONFIG_MATROSKA_MUXER 0 -@@ -909,6 +1099,7 @@ +@@ -909,6 +1109,7 @@ #define CONFIG_NULL_MUXER 0 #define CONFIG_NUT_MUXER 0 #define CONFIG_OGG_MUXER 0 @@ -965,7 +993,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h #define CONFIG_PCM_ALAW_MUXER 0 #define CONFIG_PCM_MULAW_MUXER 0 #define CONFIG_PCM_F64BE_MUXER 0 -@@ -937,103 +1128,78 @@ +@@ -937,103 +1138,80 @@ #define CONFIG_RTP_MUXER 0 #define CONFIG_RTSP_MUXER 0 #define CONFIG_SAP_MUXER 0 @@ -1061,6 +1089,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h +#define CONFIG_MPEG4VIDEO_PARSER 0 +#define CONFIG_MPEGAUDIO_PARSER 0 +#define CONFIG_MPEGVIDEO_PARSER 0 ++#define CONFIG_PNG_PARSER 0 +#define CONFIG_PNM_PARSER 0 +#define CONFIG_RV30_PARSER 0 +#define CONFIG_RV40_PARSER 0 @@ -1089,6 +1118,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h -#define CONFIG_RTMPTE_PROTOCOL 0 -#define CONFIG_RTMPS_PROTOCOL 0 #define CONFIG_RTP_PROTOCOL 0 ++#define CONFIG_SCTP_PROTOCOL 0 #define CONFIG_TCP_PROTOCOL 0 +#define CONFIG_TLS_PROTOCOL 0 #define CONFIG_UDP_PROTOCOL 0 diff --git a/www/chromium/patches/patch-third_party_libjingle_source_talk_base_nethelpers_cc b/www/chromium/patches/patch-third_party_libjingle_source_talk_base_nethelpers_cc new file mode 100644 index 00000000000..eabcd6f7074 --- /dev/null +++ b/www/chromium/patches/patch-third_party_libjingle_source_talk_base_nethelpers_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_libjingle_source_talk_base_nethelpers_cc,v 1.5 2012/08/26 18:47:01 robert Exp $ +--- third_party/libjingle/source/talk/base/nethelpers.cc.orig Thu Aug 23 09:13:32 2012 ++++ third_party/libjingle/source/talk/base/nethelpers.cc Thu Aug 23 09:13:43 2012 +@@ -36,6 +36,8 @@ + #include "talk/base/byteorder.h" + #include "talk/base/signalthread.h" + ++#define AI_ADDRCONFIG 0 ++ + namespace talk_base { + + int ResolveHostname(const std::string& hostname, int family, diff --git a/www/chromium/patches/patch-third_party_libusb_libusb_gyp b/www/chromium/patches/patch-third_party_libusb_libusb_gyp new file mode 100644 index 00000000000..9ca89a8a726 --- /dev/null +++ b/www/chromium/patches/patch-third_party_libusb_libusb_gyp @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_libusb_libusb_gyp,v 1.1 2012/08/26 18:47:01 robert Exp $ +--- third_party/libusb/libusb.gyp.orig Mon Aug 20 11:49:15 2012 ++++ third_party/libusb/libusb.gyp Mon Aug 20 11:49:29 2012 +@@ -10,7 +10,7 @@ + { + 'target_name': 'libusb', + 'conditions': [ +- ['OS == "linux" and use_system_libusb', { ++ ['(OS == "linux" or os_bsd==1) and use_system_libusb', { + 'type': 'none', + 'direct_dependent_settings': { + 'defines': [ diff --git a/www/chromium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h b/www/chromium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h new file mode 100644 index 00000000000..bf8a80c2c61 --- /dev/null +++ b/www/chromium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h @@ -0,0 +1,15 @@ +$OpenBSD: patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h,v 1.1 2012/08/26 18:47:01 robert Exp $ +--- third_party/protobuf/src/google/protobuf/stubs/atomicops.h.orig Sun Aug 26 11:49:41 2012 ++++ third_party/protobuf/src/google/protobuf/stubs/atomicops.h Sun Aug 26 11:51:09 2012 +@@ -74,7 +74,11 @@ typedef intptr_t Atomic64; + + // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or + // Atomic64 routines below, depending on your architecture. ++#if defined(__OpenBSD__) && defined(__i386__) ++typedef Atomic32 AtomicWord; ++#else + typedef intptr_t AtomicWord; ++#endif + + // Atomically execute: + // result = *ptr; diff --git a/www/chromium/patches/patch-third_party_webrtc_build_common_gypi b/www/chromium/patches/patch-third_party_webrtc_build_common_gypi deleted file mode 100644 index e9ffa32c23e..00000000000 --- a/www/chromium/patches/patch-third_party_webrtc_build_common_gypi +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-third_party_webrtc_build_common_gypi,v 1.3 2012/07/10 09:22:34 robert Exp $ ---- third_party/webrtc/build/common.gypi.orig Sun Jul 8 20:31:50 2012 -+++ third_party/webrtc/build/common.gypi Sun Jul 8 20:32:02 2012 -@@ -98,7 +98,7 @@ - 'defines': [ - # TODO(leozwang): Most of team use git-svn, need to add - # git-svn support as well. -- 'WEBRTC_SVNREVISION="/dev/null || echo -n 0)"', - ], - 'conditions': [ - ['build_with_chromium==1', { diff --git a/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py b/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py index fb1277bf048..66c391ef33d 100644 --- a/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py +++ b/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py @@ -1,7 +1,7 @@ -$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.10 2012/07/10 09:22:34 robert Exp $ ---- tools/gyp/pylib/gyp/generator/make.py.orig Wed May 23 03:52:36 2012 -+++ tools/gyp/pylib/gyp/generator/make.py Fri Jun 1 06:13:04 2012 -@@ -266,13 +266,13 @@ ARFLAGS.target ?= %(ARFLAGS.target)s +$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.11 2012/08/26 18:47:01 robert Exp $ +--- tools/gyp/pylib/gyp/generator/make.py.orig Tue Aug 14 09:04:19 2012 ++++ tools/gyp/pylib/gyp/generator/make.py Wed Aug 15 23:14:39 2012 +@@ -270,13 +270,13 @@ ARFLAGS.target ?= %(ARFLAGS.target)s # in gyp's make.py where ARFLAGS.host etc. is computed. # TODO(evan): move all cross-compilation logic to gyp-time so we don't need # to replicate this environment fallback in make as well. diff --git a/www/chromium/patches/patch-ui_gfx_codec_png_codec_cc b/www/chromium/patches/patch-ui_gfx_codec_png_codec_cc index 3e6976f0690..5709ea9898e 100644 --- a/www/chromium/patches/patch-ui_gfx_codec_png_codec_cc +++ b/www/chromium/patches/patch-ui_gfx_codec_png_codec_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_gfx_codec_png_codec_cc,v 1.1 2011/07/08 20:38:02 naddy Exp $ ---- ui/gfx/codec/png_codec.cc.orig Mon Jul 4 15:57:42 2011 -+++ ui/gfx/codec/png_codec.cc Mon Jul 4 15:57:54 2011 -@@ -15,6 +15,7 @@ +$OpenBSD: patch-ui_gfx_codec_png_codec_cc,v 1.2 2012/08/26 18:47:01 robert Exp $ +--- ui/gfx/codec/png_codec.cc.orig Tue Aug 14 09:02:26 2012 ++++ ui/gfx/codec/png_codec.cc Wed Aug 15 23:14:39 2012 +@@ -16,6 +16,7 @@ extern "C" { #if defined(USE_SYSTEM_LIBPNG) #include diff --git a/www/chromium/patches/patch-webkit_plugins_npapi_plugin_list_posix_cc b/www/chromium/patches/patch-webkit_plugins_npapi_plugin_list_posix_cc index f833200ddf5..a75ae4b4205 100644 --- a/www/chromium/patches/patch-webkit_plugins_npapi_plugin_list_posix_cc +++ b/www/chromium/patches/patch-webkit_plugins_npapi_plugin_list_posix_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-webkit_plugins_npapi_plugin_list_posix_cc,v 1.1 2012/07/10 12:55:25 robert Exp $ ---- webkit/plugins/npapi/plugin_list_posix.cc.orig Tue Jul 10 14:53:21 2012 -+++ webkit/plugins/npapi/plugin_list_posix.cc Tue Jul 10 14:53:36 2012 +$OpenBSD: patch-webkit_plugins_npapi_plugin_list_posix_cc,v 1.2 2012/08/26 18:47:01 robert Exp $ +--- webkit/plugins/npapi/plugin_list_posix.cc.orig Tue Aug 14 09:01:13 2012 ++++ webkit/plugins/npapi/plugin_list_posix.cc Thu Aug 16 07:52:35 2012 @@ -149,7 +149,7 @@ void PluginList::GetPluginDirectories(std::vectorpush_back(FilePath("/usr/lib/browser-plugins")); - plugin_dirs->push_back(FilePath("/usr/lib/mozilla/plugins")); -+ plugin_dirs->push_back(FilePath("${LOCALBASE}/lib/mozilla/plugins")); ++ plugin_dirs->push_back(FilePath("/usr/local/lib/mozilla/plugins")); plugin_dirs->push_back(FilePath("/usr/lib/firefox/plugins")); plugin_dirs->push_back(FilePath("/usr/lib/xulrunner-addons/plugins")); diff --git a/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc b/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc index e542aa17bf6..cf6bd0819a1 100644 --- a/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc +++ b/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.10 2012/07/10 09:22:34 robert Exp $ ---- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig Thu Jun 28 15:01:13 2012 -+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc Sat Jul 7 09:50:39 2012 -@@ -1419,7 +1419,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_ +$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.11 2012/08/26 18:47:01 robert Exp $ +--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig Tue Aug 14 09:01:13 2012 ++++ webkit/plugins/ppapi/ppapi_plugin_instance.cc Wed Aug 15 23:14:41 2012 +@@ -1465,7 +1465,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_ #endif // defined(OS_WIN) bool ret = false; diff --git a/www/chromium/pkg/PLIST b/www/chromium/pkg/PLIST index f8e48560ae4..51e2e124e67 100644 --- a/www/chromium/pkg/PLIST +++ b/www/chromium/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.18 2012/07/10 09:22:34 robert Exp $ +@comment $OpenBSD: PLIST,v 1.19 2012/08/26 18:47:01 robert Exp $ bin/chrome chrome/ @bin chrome/chrome @@ -64,6 +64,9 @@ chrome/product_logo_48.png chrome/protoc chrome/resources/ chrome/resources.pak +chrome/resources/extension/ +chrome/resources/extension/demo/ +chrome/resources/extension/demo/library.js chrome/resources/inspector/ chrome/resources/inspector/DevTools.js chrome/resources/inspector/HeapSnapshotWorker.js @@ -98,6 +101,7 @@ chrome/resources/inspector/Images/domain.png chrome/resources/inspector/Images/errorIcon.png chrome/resources/inspector/Images/errorMediumIcon.png chrome/resources/inspector/Images/errorRedDot.png +chrome/resources/inspector/Images/fileSystem.png chrome/resources/inspector/Images/forward.png chrome/resources/inspector/Images/frame.png chrome/resources/inspector/Images/glossyHeader.png @@ -111,7 +115,6 @@ chrome/resources/inspector/Images/indexedDB.png chrome/resources/inspector/Images/indexedDBIndex.png chrome/resources/inspector/Images/indexedDBObjectStore.png chrome/resources/inspector/Images/localStorage.png -chrome/resources/inspector/Images/navigatorPinButton.png chrome/resources/inspector/Images/navigatorShowHideButton.png chrome/resources/inspector/Images/paneAddButtons.png chrome/resources/inspector/Images/paneBottomGrow.png @@ -183,15 +186,7 @@ chrome/resources/inspector/Images/thumbHoriz.png chrome/resources/inspector/Images/thumbHoverHoriz.png chrome/resources/inspector/Images/thumbHoverVert.png chrome/resources/inspector/Images/thumbVert.png -chrome/resources/inspector/Images/timelineBarBlue.png -chrome/resources/inspector/Images/timelineBarGray.png -chrome/resources/inspector/Images/timelineBarGreen.png -chrome/resources/inspector/Images/timelineBarOrange.png -chrome/resources/inspector/Images/timelineBarPurple.png -chrome/resources/inspector/Images/timelineBarRed.png -chrome/resources/inspector/Images/timelineBarYellow.png -chrome/resources/inspector/Images/timelineCheckmarks.png -chrome/resources/inspector/Images/timelineDots.png +chrome/resources/inspector/Images/tickMark.png chrome/resources/inspector/Images/timelineHollowPillBlue.png chrome/resources/inspector/Images/timelineHollowPillGray.png chrome/resources/inspector/Images/timelineHollowPillGreen.png @@ -233,8 +228,10 @@ chrome/resources/inspector/devtools_extension_api.js chrome/resources/inspector/elementsPanel.css chrome/resources/inspector/filteredItemSelectionDialog.css chrome/resources/inspector/heapProfiler.css +chrome/resources/inspector/helpScreen.css chrome/resources/inspector/indexedDBViews.css chrome/resources/inspector/inspectorCommon.css +chrome/resources/inspector/nativeMemoryProfiler.css chrome/resources/inspector/navigatorView.css chrome/resources/inspector/networkLogView.css chrome/resources/inspector/networkPanel.css @@ -242,6 +239,7 @@ chrome/resources/inspector/panelEnablerView.css chrome/resources/inspector/profilesPanel.css chrome/resources/inspector/resourceView.css chrome/resources/inspector/resourcesPanel.css +chrome/resources/inspector/revisionHistory.css chrome/resources/inspector/scriptsPanel.css chrome/resources/inspector/splitView.css chrome/resources/inspector/tabbedPane.css @@ -253,11 +251,9 @@ chrome/ui_resources_standard.pak @man man/man1/chrome.1 share/applications/chrome.desktop share/icons/hicolor/128x128/apps/chrome.png -share/icons/hicolor/16x16/apps/chrome.png share/icons/hicolor/22x22/apps/chrome.png share/icons/hicolor/24x24/apps/chrome.png share/icons/hicolor/256x256/apps/chrome.png -share/icons/hicolor/32x32/apps/chrome.png share/icons/hicolor/48x48/apps/chrome.png share/icons/hicolor/64x64/apps/chrome.png @exec %D/bin/update-desktop-database