cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 22.0.1229.94

Browse Source
This commit is contained in:
robert 2012-10-12 16:46:09 +00:00
parent ff9d38c33c
commit 26018c5afe
45 changed files with 2324 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/chromium/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.107 2012/10/04 07:40:25 landry Exp $
# $OpenBSD: Makefile,v 1.108 2012/10/12 16:46:09 robert Exp $
ONLY_FOR_ARCHS= i386 amd64
COMMENT= Chromium browser
V= 21.0.1180.89
V= 22.0.1229.94
DISTNAME= chromium-${V}
CATEGORIES= www
@ -125,7 +125,8 @@ do-install:
${FILESDIR}/chrome ${PREFIX}/bin/chrome
chmod ${BINMODE} ${PREFIX}/bin/chrome
${INSTALL_MAN} ${BUILDDIR}/chrome.1 ${PREFIX}/man/man1
.for p in chrome content_resources resources theme_resources_standard ui_resources_standard
.for p in chrome content_resources resources theme_resources_100_percent ui_resources_100_percent
${INSTALL_DATA} ${BUILDDIR}/${p}.pak ${PREFIX}/chrome
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/chrome/locales

4
www/chromium/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (chromium-21.0.1180.89.tar.bz2) = Fsyo2QozaYQPeabwbRF1ZRX8ikw1lQYHeNyrIeWSNcU=
SIZE (chromium-21.0.1180.89.tar.bz2) = 192638239
SHA256 (chromium-22.0.1229.94.tar.bz2) = oK9+aB70OnoXsyofbh3Bb/oqX3JflG3a7qE2YOujHK8=
SIZE (chromium-22.0.1229.94.tar.bz2) = 210379000

10
www/chromium/patches/patch-base_atomicops_h
View File

@ -1,7 +1,7 @@
$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;
$OpenBSD: patch-base_atomicops_h,v 1.8 2012/10/12 16:46:09 robert Exp $
--- base/atomicops.h.orig Tue Sep 25 15:01:57 2012
+++ base/atomicops.h Wed Oct 10 17:19:28 2012
@@ -49,7 +49,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.
@ -13,7 +13,7 @@ $OpenBSD: patch-base_atomicops_h,v 1.7 2012/08/26 18:47:01 robert Exp $
// Atomically execute:
// result = *ptr;
@@ -145,7 +149,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
@@ -144,7 +148,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
// On some platforms we need additional declarations to make
// AtomicWord compatible with our other Atomic* types.

14
www/chromium/patches/patch-base_base_gyp
View File

@ -1,9 +1,9 @@
$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 @@
],
}],
$OpenBSD: patch-base_base_gyp,v 1.14 2012/10/12 16:46:09 robert Exp $
--- base/base.gyp.orig Tue Sep 25 15:01:57 2012
+++ base/base.gyp Wed Oct 10 17:19:28 2012
@@ -731,6 +731,13 @@
'test/values_test_util.cc',
'test/values_test_util.h',
],
+ 'conditions': [
+ [ 'OS == "openbsd"', {
@ -14,4 +14,4 @@ $OpenBSD: patch-base_base_gyp,v 1.13 2012/08/26 18:47:01 robert Exp $
+ ],
},
{
'target_name': 'check_example',
'target_name': 'test_support_perf',

12
www/chromium/patches/patch-base_base_gypi
View File

@ -1,15 +1,15 @@
$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',
$OpenBSD: patch-base_base_gypi,v 1.14 2012/10/12 16:46:09 robert Exp $
--- base/base.gypi.orig Tue Sep 25 15:01:57 2012
+++ base/base.gypi Wed Oct 10 17:19:28 2012
@@ -137,7 +137,6 @@
'files/dir_reader_posix.h',
'files/file_path_watcher.cc',
'files/file_path_watcher.h',
- 'files/file_path_watcher_kqueue.cc',
'files/file_path_watcher_linux.cc',
'files/file_path_watcher_stub.cc',
'files/file_path_watcher_win.cc',
@@ -602,7 +601,6 @@
@@ -661,7 +660,6 @@
['<(os_bsd)==1 and >(nacl_untrusted_build)==0', {
'sources/': [
['exclude', '^files/file_path_watcher_linux\\.cc$'],

15
www/chromium/patches/patch-base_debug_stack_trace_posix_cc
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.5 2012/07/10 09:22:34 robert Exp $
--- base/debug/stack_trace_posix.cc.orig Tue Jul 10 10:37:42 2012
+++ base/debug/stack_trace_posix.cc Tue Jul 10 10:42:08 2012
@@ -153,6 +153,11 @@ StackTrace::StackTrace() {
count_ = 0;
return;
}
+#elif defined(OS_BSD)
+ // Disable backtrace for now, libexecinfo crashes in getframeaddr
+ // in release build / i386.
+ count_ = 0;
+ return;
#endif
// Though the backtrace API man page does not list any possible negative
// return values, we take no chance.

12
www/chromium/patches/patch-base_threading_worker_pool_posix_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-base_threading_worker_pool_posix_cc,v 1.6 2012/07/10 09:22:34 robert Exp $
--- base/threading/worker_pool_posix.cc.orig Thu Jun 28 15:01:48 2012
+++ base/threading/worker_pool_posix.cc Sat Jul 7 09:50:22 2012
@@ -28,7 +28,7 @@ base::LazyInstance<ThreadLocalBoolean>::Leaky
const int kIdleSecondsBeforeExit = 10 * 60;
// A stack size of 64 KB is too small for the CERT_PKIXVerifyCert
// function of NSS because of NSS bug 439169.
-const int kWorkerThreadStackSize = 128 * 1024;
+const int kWorkerThreadStackSize = 256 * 1024;
class WorkerPoolImpl {
public:

8
www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-chrome_browser_printing_print_system_task_proxy_cc,v 1.3 2012/08/26 18:47:01 robert Exp $
$OpenBSD: patch-chrome_browser_printing_print_system_task_proxy_cc,v 1.4 2012/10/12 16:46:09 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 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(
--- chrome/browser/printing/print_system_task_proxy.cc.orig Tue Sep 25 15:02:11 2012
+++ chrome/browser/printing/print_system_task_proxy.cc Wed Oct 10 17:19:28 2012
@@ -421,10 +421,7 @@ bool PrintSystemTaskProxy::ParsePrinterCapabilities(
}
}

18
www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc
View File

@ -1,16 +1,16 @@
$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"
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.5 2012/10/12 16:46:10 robert Exp $
--- chrome/browser/ui/webui/about_ui.cc.orig Tue Sep 25 15:02:14 2012
+++ chrome/browser/ui/webui/about_ui.cc Wed Oct 10 17:19:28 2012
@@ -74,7 +74,7 @@
#include "chrome/browser/ui/webui/theme_source.h"
#endif
-#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() {
@@ -940,6 +940,7 @@ std::string AboutLinuxProxyConfig() {
return data;
}
@ -18,7 +18,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.4 2012/08/26 18:47:01 ro
void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
bool good) {
data->append("<tr><td>");
@@ -1083,6 +1084,7 @@ std::string AboutSandbox() {
@@ -1001,6 +1002,7 @@ std::string AboutSandbox() {
return data;
}
#endif
@ -26,7 +26,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.4 2012/08/26 18:47:01 ro
std::string AboutVersionStaticContent(const std::string& query) {
return ResourceBundle::GetSharedInstance().GetRawDataResource(
@@ -1422,7 +1424,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st
@@ -1341,7 +1343,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st
response = ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_OS_CREDITS_HTML, ui::SCALE_FACTOR_NONE).as_string();
#endif

16
www/chromium/patches/patch-chrome_chrome_browser_gypi
View File

@ -1,12 +1,12 @@
$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',
$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.14 2012/10/12 16:46:10 robert Exp $
--- chrome/chrome_browser.gypi.orig Wed Oct 10 18:38:26 2012
+++ chrome/chrome_browser.gypi Wed Oct 10 18:38:55 2012
@@ -1426,8 +1426,6 @@
'browser/media/media_stream_devices_menu_model.h',
'browser/media_gallery/media_device_notifications_chromeos.cc',
'browser/media_gallery/media_device_notifications_chromeos.h',
- 'browser/media_gallery/media_device_notifications_linux.cc',
- 'browser/media_gallery/media_device_notifications_linux.h',
'browser/media_gallery/media_device_notifications_utils.cc',
'browser/media_gallery/media_device_notifications_utils.h',
'browser/media_gallery/media_device_notifications_window_win.cc',
'browser/media_gallery/media_device_notifications_window_win.h',
'browser/media_gallery/media_file_system_registry.cc',

8
www/chromium/patches/patch-chrome_common_chrome_notification_types_h
View File

@ -1,7 +1,7 @@
$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 {
$OpenBSD: patch-chrome_common_chrome_notification_types_h,v 1.2 2012/10/12 16:46:10 robert Exp $
--- chrome/common/chrome_notification_types.h.orig Tue Sep 25 15:02:43 2012
+++ chrome/common/chrome_notification_types.h Wed Oct 10 17:19:28 2012
@@ -46,7 +46,7 @@ enum NotificationType {
// that was closed, no details are expected.
NOTIFICATION_WINDOW_CLOSED,

8
www/chromium/patches/patch-chrome_common_chrome_paths_cc
View File

@ -1,7 +1,7 @@
$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) {
$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.10 2012/10/12 16:46:10 robert Exp $
--- chrome/common/chrome_paths.cc.orig Tue Sep 25 15:02:43 2012
+++ chrome/common/chrome_paths.cc Wed Oct 10 17:19:28 2012
@@ -367,7 +367,7 @@ bool PathProvider(int key, FilePath* result) {
if (!file_util::PathExists(cur)) // We don't want to create this
return false;
break;

10
www/chromium/patches/patch-chrome_test_perf_perf_test_cc
View File

@ -1,12 +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
$OpenBSD: patch-chrome_test_perf_perf_test_cc,v 1.2 2012/10/12 16:46:10 robert Exp $
--- chrome/test/perf/perf_test.cc.orig Wed Oct 10 19:04:22 2012
+++ chrome/test/perf/perf_test.cc Wed Oct 10 19:04:50 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)
-#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_ANDROID)
+#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_BSD)
AppendResult(output, "vm_size_final_b", "", "vm_size_f_b" + trace_name,
browser_virtual_size, "bytes",
false /* not important */);

14
www/chromium/patches/patch-content_app_content_main_runner_cc
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-content_app_content_main_runner_cc,v 1.3 2012/10/12 16:46:10 robert Exp $
--- content/app/content_main_runner.cc.orig Tue Sep 25 15:01:30 2012
+++ content/app/content_main_runner.cc Wed Oct 10 17:19:28 2012
@@ -85,7 +85,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&);
@ -10,7 +10,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.2 2012/08/26 18:47:01 rob
namespace content {
extern int ZygoteMain(const MainFunctionParams&,
ZygoteForkDelegate* forkdelegate);
@@ -268,7 +268,7 @@ struct MainFunction {
@@ -273,7 +273,7 @@ struct MainFunction {
int (*function)(const MainFunctionParams&);
};
@ -19,7 +19,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.2 2012/08/26 18:47:01 rob
// 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().
@@ -372,7 +372,7 @@ int RunNamedProcessTypeMain(
@@ -377,7 +377,7 @@ int RunNamedProcessTypeMain(
}
}
@ -28,7 +28,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.2 2012/08/26 18:47:01 rob
// Zygote startup is special -- see RunZygote comments above
// for why we don't use ZygoteMain directly.
if (process_type == switches::kZygoteProcess)
@@ -462,7 +462,7 @@ static void ReleaseFreeMemoryThunk() {
@@ -470,7 +470,7 @@ static void ReleaseFreeMemoryThunk() {
kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
#endif

14
www/chromium/patches/patch-content_browser_browser_main_loop_cc
View File

@ -1,7 +1,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 @@
$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.5 2012/10/12 16:46:10 robert Exp $
--- content/browser/browser_main_loop.cc.orig Tue Sep 25 15:01:32 2012
+++ content/browser/browser_main_loop.cc Wed Oct 10 17:19:28 2012
@@ -78,7 +78,7 @@
#include "ui/gfx/gtk_util.h"
#endif
@ -9,8 +9,8 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.4 2012/08/26 18:47:01 r
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
#include <sys/stat.h>
#include "content/browser/renderer_host/render_sandbox_host_linux.h"
#include "content/browser/zygote_host_impl_linux.h"
@@ -88,7 +88,7 @@ using content::TraceControllerImpl;
#include "content/browser/zygote_host/zygote_host_impl_linux.h"
@@ -97,7 +97,7 @@ using content::TraceControllerImpl;
namespace {
@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.4 2012/08/26 18:47:01 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.
@@ -269,7 +269,7 @@ void BrowserMainLoop::EarlyInitialization() {
@@ -282,7 +282,7 @@ void BrowserMainLoop::EarlyInitialization() {
}
#endif // !defined(USE_OPENSSL)

78
www/chromium/patches/patch-content_browser_child_process_launcher_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22:34 robert Exp $
--- content/browser/child_process_launcher.cc.orig Sat Jul 7 15:53:55 2012
+++ content/browser/child_process_launcher.cc Sat Jul 7 15:54:36 2012
@@ -49,7 +49,7 @@ class ChildProcessLauncher::Context
$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.6 2012/10/12 16:46:10 robert Exp $
--- content/browser/child_process_launcher.cc.orig Thu Oct 11 23:31:56 2012
+++ content/browser/child_process_launcher.cc Thu Oct 11 23:48:24 2012
@@ -52,7 +52,7 @@ class ChildProcessLauncher::Context
termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
exit_code_(content::RESULT_CODE_NORMAL_EXIT),
starting_(true)
@ -10,33 +10,25 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22
, zygote_(false)
#endif
{
@@ -132,7 +132,7 @@ class ChildProcessLauncher::Context
// to reliably detect child termination.
file_util::ScopedFD ipcfd_closer(&ipcfd);
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
// On Linux, we need to add some extra file descriptors for crash handling.
std::string process_type =
cmd_line->GetSwitchValueASCII(switches::kProcessType);
@@ -157,7 +157,7 @@ class ChildProcessLauncher::Context
ipcfd,
kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
if (crash_signal_fd >= 0) {
fds_to_map.push_back(std::make_pair(
crash_signal_fd,
@@ -214,14 +214,14 @@ class ChildProcessLauncher::Context
base::Bind(
&Context::Notify,
this_object.get(),
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
use_zygote,
@@ -188,7 +188,7 @@ class ChildProcessLauncher::Context
base::GlobalDescriptors::Mapping files_to_register;
files_to_register.push_back(std::pair<base::GlobalDescriptors::Key, int>(
kPrimaryIPCChannel, ipcfd));
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
content::GetContentClient()->browser()->
GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register);
if (use_zygote) {
@@ -261,7 +261,7 @@ class ChildProcessLauncher::Context
base::Bind(
&Context::Notify,
this_object.get(),
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
use_zygote,
#endif
handle));
handle));
@@ -269,7 +269,7 @@ class ChildProcessLauncher::Context
}
void Notify(
@ -45,7 +37,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22
bool zygote,
#endif
base::ProcessHandle handle) {
@@ -230,7 +230,7 @@ class ChildProcessLauncher::Context
@@ -282,7 +282,7 @@ class ChildProcessLauncher::Context
if (!handle)
LOG(ERROR) << "Failed to launch child process";
@ -54,7 +46,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22
zygote_ = zygote;
#endif
if (client_) {
@@ -253,7 +253,7 @@ class ChildProcessLauncher::Context
@@ -305,7 +305,7 @@ class ChildProcessLauncher::Context
BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
base::Bind(
&Context::TerminateInternal,
@ -63,7 +55,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22
zygote_,
#endif
process_.handle()));
@@ -267,7 +267,7 @@ class ChildProcessLauncher::Context
@@ -319,7 +319,7 @@ class ChildProcessLauncher::Context
}
static void TerminateInternal(
@ -72,25 +64,25 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22
bool zygote,
#endif
base::ProcessHandle handle) {
@@ -277,7 +277,7 @@ class ChildProcessLauncher::Context
@@ -333,7 +333,7 @@ class ChildProcessLauncher::Context
process.Terminate(content::RESULT_CODE_NORMAL_EXIT);
// On POSIX, we must additionally reap the child.
#if defined(OS_POSIX)
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
if (zygote) {
// If the renderer was created via a zygote, we have to proxy the reaping
// through the zygote process.
@@ -301,7 +301,7 @@ class ChildProcessLauncher::Context
// shutdown. Default behavior is to terminate the child.
bool terminate_child_on_shutdown_;
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
@@ -360,7 +360,7 @@ class ChildProcessLauncher::Context
#if defined(OS_ANDROID)
// The fd to close after creating the process.
int ipcfd_;
-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
bool zygote_;
#endif
};
@@ -352,7 +352,7 @@ base::TerminationStatus ChildProcessLauncher::GetChild
@@ -413,7 +413,7 @@ base::TerminationStatus ChildProcessLauncher::GetChild
*exit_code = context_->exit_code_;
return context_->termination_status_;
}

41
www/chromium/patches/patch-content_content_browser_gypi
View File

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-content_content_browser_gypi,v 1.12 2012/10/12 16:46:10 robert Exp $
--- content/content_browser.gypi.orig Wed Oct 10 23:06:08 2012
+++ content/content_browser.gypi Wed Oct 10 23:21:19 2012
@@ -168,7 +168,6 @@
'public/browser/web_ui_message_handler.h',
'public/browser/worker_service.h',
'public/browser/worker_service_observer.h',
@ -9,12 +9,39 @@ $OpenBSD: patch-content_content_browser_gypi,v 1.11 2012/08/26 18:47:01 robert E
'browser/accessibility/browser_accessibility.cc',
'browser/accessibility/browser_accessibility.h',
'browser/accessibility/browser_accessibility_cocoa.h',
@@ -760,11 +759,6 @@
@@ -273,8 +272,6 @@
'browser/debugger/worker_devtools_manager.h',
'browser/debugger/worker_devtools_message_filter.cc',
'browser/debugger/worker_devtools_message_filter.h',
- 'browser/device_monitor_linux.cc',
- 'browser/device_monitor_linux.h',
'browser/device_orientation/accelerometer_mac.cc',
'browser/device_orientation/accelerometer_mac.h',
'browser/device_orientation/data_fetcher.h',
@@ -331,8 +328,6 @@
'browser/download/drag_download_file.h',
'browser/download/drag_download_util.cc',
'browser/download/drag_download_util.h',
- 'browser/download/file_metadata_linux.cc',
- 'browser/download/file_metadata_linux.h',
'browser/download/file_metadata_mac.h',
'browser/download/file_metadata_mac.mm',
'browser/download/mhtml_generation_manager.cc',
@@ -743,8 +738,6 @@
'browser/system_message_window_win.h',
'browser/tcmalloc_internals_request_job.cc',
'browser/tcmalloc_internals_request_job.h',
- 'browser/udev_linux.cc',
- 'browser/udev_linux.h',
'browser/web_contents/debug_urls.cc',
'browser/web_contents/debug_urls.h',
'browser/web_contents/drag_utils_gtk.cc',
@@ -807,11 +800,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_host/zygote_host_impl_linux.cc',
- 'browser/zygote_host/zygote_host_impl_linux.h',
- 'zygote/zygote_linux.cc',
- 'zygote/zygote_linux.h',
- 'zygote/zygote_main_linux.cc',

12
www/chromium/patches/patch-content_content_common_gypi Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-content_content_common_gypi,v 1.1 2012/10/12 16:46:10 robert Exp $
--- content/content_common.gypi.orig Wed Oct 10 22:34:13 2012
+++ content/content_common.gypi Wed Oct 10 22:34:17 2012
@@ -324,8 +324,6 @@
'common/sandbox_linux.cc',
'common/sandbox_policy.cc',
'common/sandbox_policy.h',
- 'common/sandbox_seccomp_bpf_linux.cc',
- 'common/sandbox_seccomp_bpf_linux.h',
'common/savable_url_schemes.cc',
'common/savable_url_schemes.h',
'common/set_process_title.cc',

12
www/chromium/patches/patch-content_content_gpu_gypi Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-content_content_gpu_gypi,v 1.1 2012/10/12 16:46:10 robert Exp $
--- content/content_gpu.gypi.orig Thu Oct 11 23:31:06 2012
+++ content/content_gpu.gypi Thu Oct 11 23:31:26 2012
@@ -95,7 +95,7 @@
'../third_party/amd/amd_videocard_info_win.cc',
],
}],
- ['OS=="linux"', {
+ ['OS=="linux" or os_bsd==1', {
'dependencies': [
'../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
],

12
www/chromium/patches/patch-content_public_browser_content_browser_client_cc
View File

@ -1,12 +0,0 @@
$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;
}

12
www/chromium/patches/patch-content_public_browser_content_browser_client_h
View File

@ -1,12 +0,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);

16
www/chromium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-content_renderer_renderer_main_platform_delegate_linux_cc,v 1.4 2012/07/10 09:22:34 robert Exp $
--- content/renderer/renderer_main_platform_delegate_linux.cc.orig Sat Jul 7 17:27:38 2012
+++ content/renderer/renderer_main_platform_delegate_linux.cc Sat Jul 7 17:27:45 2012
@@ -41,8 +41,8 @@ bool RendererMainPlatformDelegate::EnableSandbox() {
// a file descriptor for "/proc".
if (SeccompSandboxEnabled() && SupportsSeccompSandbox(-1))
StartSeccompSandbox();
-#endif
$OpenBSD: patch-content_renderer_renderer_main_platform_delegate_linux_cc,v 1.5 2012/10/12 16:46:10 robert Exp $
--- content/renderer/renderer_main_platform_delegate_linux.cc.orig Wed Oct 10 22:54:20 2012
+++ content/renderer/renderer_main_platform_delegate_linux.cc Wed Oct 10 22:54:33 2012
@@ -34,7 +34,9 @@ bool RendererMainPlatformDelegate::EnableSandbox() {
//
// The seccomp sandbox mode 1 (sandbox/linux/seccomp-legacy) and mode 2
// (sandbox/linux/seccomp-bpf) are started in InitializeSandbox().
+#if !defined(OS_BSD)
content::InitializeSandbox();
+#endif
return true;

8
www/chromium/patches/patch-media_media_gyp
View File

@ -1,7 +1,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 @@
$OpenBSD: patch-media_media_gyp,v 1.14 2012/10/12 16:46:10 robert Exp $
--- media/media.gyp.orig Tue Sep 25 15:01:15 2012
+++ media/media.gyp Wed Oct 10 17:19:28 2012
@@ -385,6 +385,7 @@
}],
['OS=="openbsd"', {
'sources/': [ ['exclude', '/alsa_' ],

8
www/chromium/patches/patch-net_disk_cache_disk_format_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-net_disk_cache_disk_format_h,v 1.4 2012/02/17 10:19:51 robert Exp $
--- net/disk_cache/disk_format.h.orig Fri Jan 27 09:01:26 2012
+++ net/disk_cache/disk_format.h Thu Feb 9 09:31:06 2012
@@ -158,7 +158,7 @@ struct RankingsNode {
$OpenBSD: patch-net_disk_cache_disk_format_h,v 1.5 2012/10/12 16:46:10 robert Exp $
--- net/disk_cache/disk_format.h.orig Tue Sep 25 15:01:37 2012
+++ net/disk_cache/disk_format.h Wed Oct 10 17:19:28 2012
@@ -157,7 +157,7 @@ struct RankingsNode {
};
#pragma pack(pop)

12
www/chromium/patches/patch-net_net_gyp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-net_net_gyp,v 1.11 2012/10/12 16:46:10 robert Exp $
--- net/net.gyp.orig Wed Oct 10 19:48:32 2012
+++ net/net.gyp Wed Oct 10 19:48:38 2012
@@ -55,8 +55,6 @@
'base/address_family.h',
'base/address_list.cc',
'base/address_list.h',
- 'base/address_tracker_linux.cc',
- 'base/address_tracker_linux.h',
'base/asn1_util.cc',
'base/asn1_util.h',
'base/auth.cc',

8
www/chromium/patches/patch-printing_printing_gyp
View File

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-printing_printing_gyp,v 1.13 2012/10/12 16:46:10 robert Exp $
--- printing/printing.gyp.orig Tue Sep 25 15:01:20 2012
+++ printing/printing.gyp Wed Oct 10 17:19:28 2012
@@ -276,6 +276,11 @@
'<!@(python cups_config_helper.py --cflags)',
],
}],

16
www/chromium/patches/patch-skia_skia_gyp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-skia_skia_gyp,v 1.4 2012/08/26 18:47:01 robert Exp $
--- skia/skia.gyp.orig Tue Aug 14 09:01:31 2012
+++ skia/skia.gyp Wed Aug 15 23:14:35 2012
@@ -863,7 +863,7 @@
$OpenBSD: patch-skia_skia_gyp,v 1.5 2012/10/12 16:46:10 robert Exp $
--- skia/skia.gyp.orig Tue Sep 25 15:01:38 2012
+++ skia/skia.gyp Wed Oct 10 17:19:29 2012
@@ -914,7 +914,7 @@
'__ARM_HAVE_NEON',
],
}],
@ -10,7 +10,7 @@ $OpenBSD: patch-skia_skia_gyp,v 1.4 2012/08/26 18:47:01 robert Exp $
'sources!': [
'../third_party/skia/src/opts/opts_check_SSE2.cpp'
],
@@ -1137,7 +1137,7 @@
@@ -1209,7 +1209,7 @@
'SK_BUILD_FOR_ANDROID_NDK',
],
}],
@ -19,7 +19,7 @@ $OpenBSD: patch-skia_skia_gyp,v 1.4 2012/08/26 18:47:01 robert Exp $
'sources': [
'../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
@@ -1152,8 +1152,14 @@
@@ -1224,8 +1224,14 @@
],
}],
],
@ -36,7 +36,7 @@ $OpenBSD: patch-skia_skia_gyp,v 1.4 2012/08/26 18:47:01 robert Exp $
'conditions': [
['order_profiling != 0', {
'target_conditions' : [
@@ -1235,7 +1241,7 @@
@@ -1310,7 +1316,7 @@
'../third_party/skia/src/core',
],
'conditions': [
@ -45,7 +45,7 @@ $OpenBSD: patch-skia_skia_gyp,v 1.4 2012/08/26 18:47:01 robert Exp $
'cflags': [
'-mssse3',
],
@@ -1262,7 +1268,7 @@
@@ -1337,7 +1343,7 @@
],
},
}],

112
www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_asm
View File

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_asm,v 1.3 2012/10/12 16:46:10 robert Exp $
--- third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.asm.orig Wed Oct 10 15:03:14 2012
+++ third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.asm Fri Oct 12 12:55:47 2012
@@ -1,89 +1,1287 @@
-%define ARCH_X86
-%define ARCH_X86_32
-%define HAVE_AVX
@ -113,8 +113,8 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define ARCH_X86_32 1
+%define ARCH_X86_64 0
+%define HAVE_ALTIVEC 0
+%define HAVE_AMD3DNOW 0
+%define HAVE_AMD3DNOWEXT 0
+%define HAVE_AMD3DNOW 1
+%define HAVE_AMD3DNOWEXT 1
+%define HAVE_ARMV5TE 0
+%define HAVE_ARMV6 0
+%define HAVE_ARMV6T2 0
@ -129,11 +129,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define HAVE_SSSE3 0
+%define HAVE_VFPV3 0
+%define HAVE_VIS 0
+%define HAVE_MIPSFPU 0
+%define HAVE_MIPS32R2 0
+%define HAVE_MIPSDSPR1 0
+%define HAVE_MIPSDSPR2 0
+%define HAVE_BIGENDIAN 0
+%define HAVE_FAST_UNALIGNED 1
+%define HAVE_PTHREADS 1
+%define HAVE_W32THREADS 0
+%define HAVE_OS2THREADS 0
+%define HAVE_ALIGNED_MALLOC 0
+%define HAVE_ALIGNED_STACK 1
+%define HAVE_ALSA_ASOUNDLIB_H 0
+%define HAVE_ALTIVEC_H 0
@ -146,6 +151,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define HAVE_CLOCK_GETTIME 1
+%define HAVE_CLOSESOCKET 0
+%define HAVE_CMOV 0
+%define HAVE_CPUID 0
+%define HAVE_DCBZL 0
+%define HAVE_DEV_BKTR_IOCTL_BT848_H 0
+%define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
@ -155,6 +161,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define HAVE_DLFCN_H 1
+%define HAVE_DLOPEN 1
+%define HAVE_DOS_PATHS 0
+%define HAVE_DXVA_H 0
+%define HAVE_EBP_AVAILABLE 1
+%define HAVE_EBX_AVAILABLE 0
+%define HAVE_EXP2 1
@ -164,18 +171,24 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define HAVE_FAST_CMOV 0
+%define HAVE_FCNTL 1
+%define HAVE_FORK 1
+%define HAVE_GETADDRINFO 1
+%define HAVE_GETADDRINFO 0
+%define HAVE_GETHRTIME 0
+%define HAVE_GETOPT 1
+%define HAVE_GETPROCESSAFFINITYMASK 0
+%define HAVE_GETPROCESSMEMORYINFO 0
+%define HAVE_GETPROCESSTIMES 0
+%define HAVE_GETSYSTEMTIMEASFILETIME 0
+%define HAVE_GETRUSAGE 1
+%define HAVE_GETTIMEOFDAY 1
+%define HAVE_GLOB 1
+%define HAVE_GNU_AS 1
+%define HAVE_IBM_ASM 0
+%define HAVE_INET_ATON 1
+%define HAVE_INLINE_ASM 1
+%define HAVE_ISATTY 1
+%define HAVE_ISINF 1
+%define HAVE_ISNAN 1
+%define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
+%define HAVE_KBHIT 0
+%define HAVE_LDBRX 0
+%define HAVE_LIBDC1394_1 0
@ -198,26 +211,36 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define HAVE_MAPVIEWOFFILE 0
+%define HAVE_MEMALIGN 0
+%define HAVE_MKSTEMP 1
+%define HAVE_MM_EMPTY 0
+%define HAVE_MMAP 1
+%define HAVE_NANOSLEEP 1
+%define HAVE_NETINET_SCTP_H 0
+%define HAVE_PEEKNAMEDPIPE 0
+%define HAVE_POD2MAN 1
+%define HAVE_POLL_H 1
+%define HAVE_POSIX_MEMALIGN 1
+%define HAVE_PTHREAD_CANCEL 1
+%define HAVE_RDTSC 0
+%define HAVE_RINT 1
+%define HAVE_ROUND 1
+%define HAVE_ROUNDF 1
+%define HAVE_RWEFLAGS 0
+%define HAVE_SCHED_GETAFFINITY 0
+%define HAVE_SDL 0
+%define HAVE_SDL_VIDEO_SIZE 0
+%define HAVE_SETMODE 0
+%define HAVE_SETRLIMIT 1
+%define HAVE_SLEEP 0
+%define HAVE_SNDIO_H 1
+%define HAVE_SOCKLEN_T 0
+%define HAVE_SOUNDCARD_H 1
+%define HAVE_STRERROR_R 1
+%define HAVE_STRPTIME 1
+%define HAVE_STRUCT_ADDRINFO 0
+%define HAVE_STRUCT_GROUP_SOURCE_REQ 0
+%define HAVE_STRUCT_IP_MREQ_SOURCE 0
+%define HAVE_STRUCT_IPV6_MREQ 0
+%define HAVE_STRUCT_POLLFD 0
+%define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
+%define HAVE_STRUCT_SOCKADDR_IN6 0
+%define HAVE_STRUCT_SOCKADDR_SA_LEN 0
@ -233,15 +256,21 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define HAVE_SYS_RESOURCE_H 1
+%define HAVE_SYS_SELECT_H 1
+%define HAVE_SYS_SOUNDCARD_H 0
+%define HAVE_SYS_TIME_H 1
+%define HAVE_SYS_VIDEOIO_H 1
+%define HAVE_TERMIOS_H 1
+%define HAVE_TEXI2HTML 0
+%define HAVE_THREADS 1
+%define HAVE_TRUNC 1
+%define HAVE_TRUNCF 1
+%define HAVE_UNISTD_H 1
+%define HAVE_USLEEP 1
+%define HAVE_VFP_ARGS 0
+%define HAVE_VIRTUALALLOC 0
+%define HAVE_WINDOWS_H 0
+%define HAVE_WINSOCK2_H 0
+%define HAVE_XFORM_ASM 0
+%define HAVE_XGETBV 0
+%define HAVE_XMM_CLOBBERS 0
+%define HAVE_YASM 1
+%define CONFIG_BSFS 0
@ -261,7 +290,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_FFMPEG 0
+%define CONFIG_AC3DSP 0
+%define CONFIG_AVCODEC 1
+%define CONFIG_AVDEVICE 1
+%define CONFIG_AVDEVICE 0
+%define CONFIG_AVFILTER 0
+%define CONFIG_AVFORMAT 1
+%define CONFIG_AVRESAMPLE 0
@ -272,10 +301,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_DOC 0
+%define CONFIG_DWT 0
+%define CONFIG_DXVA2 0
+%define CONFIG_FAST_UNALIGNED 1
+%define CONFIG_FASTDIV 1
+%define CONFIG_FFT 1
+%define CONFIG_FONTCONFIG 0
+%define CONFIG_FREI0R 0
+%define CONFIG_GCRYPT 0
+%define CONFIG_GNUTLS 0
+%define CONFIG_GPL 0
+%define CONFIG_GRAY 0
@ -283,12 +314,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_LIBAACPLUS 0
+%define CONFIG_LIBASS 0
+%define CONFIG_LIBBLURAY 0
+%define CONFIG_LIBCACA 0
+%define CONFIG_LIBCDIO 0
+%define CONFIG_LIBCELT 0
+%define CONFIG_LIBDC1394 0
+%define CONFIG_LIBFAAC 0
+%define CONFIG_LIBFDK_AAC 0
+%define CONFIG_LIBFREETYPE 0
+%define CONFIG_LIBGSM 0
+%define CONFIG_LIBIEC61883 0
+%define CONFIG_LIBILBC 0
+%define CONFIG_LIBMODPLUG 0
+%define CONFIG_LIBMP3LAME 0
+%define CONFIG_LIBNUT 0
@ -296,6 +331,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_LIBOPENCORE_AMRWB 0
+%define CONFIG_LIBOPENCV 0
+%define CONFIG_LIBOPENJPEG 0
+%define CONFIG_LIBOPUS 0
+%define CONFIG_LIBPULSE 0
+%define CONFIG_LIBRTMP 0
+%define CONFIG_LIBSCHROEDINGER 0
@ -314,7 +350,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_LSP 0
+%define CONFIG_MDCT 1
+%define CONFIG_MEMALIGN_HACK 0
+%define CONFIG_MEMORY_POISONING 0
+%define CONFIG_MPEGAUDIODSP 0
+%define CONFIG_NETTLE 0
+%define CONFIG_NETWORK 0
+%define CONFIG_NONFREE 0
+%define CONFIG_OPENAL 0
@ -330,7 +368,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_SMALL 0
+%define CONFIG_SRAM 0
+%define CONFIG_STATIC 1
+%define CONFIG_SWRESAMPLE 1
+%define CONFIG_SWRESAMPLE 0
+%define CONFIG_SWSCALE 0
+%define CONFIG_SWSCALE_ALPHA 1
+%define CONFIG_THUMB 0
@ -352,6 +390,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_HUFFMAN 0
+%define CONFIG_LGPLV3 0
+%define CONFIG_LPC 0
+%define CONFIG_VP3DSP 1
+%define CONFIG_AAC_ADTSTOASC_BSF 0
+%define CONFIG_CHOMP_BSF 0
+%define CONFIG_DUMP_EXTRADATA_BSF 0
@ -422,6 +461,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_H261_DECODER 0
+%define CONFIG_H263_DECODER 0
+%define CONFIG_H263I_DECODER 0
+%define CONFIG_H263P_DECODER 0
+%define CONFIG_H264_DECODER 0
+%define CONFIG_H264_CRYSTALHD_DECODER 0
+%define CONFIG_H264_VDPAU_DECODER 0
@ -457,15 +497,19 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_MPEG_VDPAU_DECODER 0
+%define CONFIG_MPEG1_VDPAU_DECODER 0
+%define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+%define CONFIG_MSA1_DECODER 0
+%define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
+%define CONFIG_MSMPEG4V1_DECODER 0
+%define CONFIG_MSMPEG4V2_DECODER 0
+%define CONFIG_MSMPEG4V3_DECODER 0
+%define CONFIG_MSRLE_DECODER 0
+%define CONFIG_MSS1_DECODER 0
+%define CONFIG_MSVIDEO1_DECODER 0
+%define CONFIG_MSZH_DECODER 0
+%define CONFIG_MTS2_DECODER 0
+%define CONFIG_MXPEG_DECODER 0
+%define CONFIG_NUV_DECODER 0
+%define CONFIG_PAF_VIDEO_DECODER 0
+%define CONFIG_PAM_DECODER 0
+%define CONFIG_PBM_DECODER 0
+%define CONFIG_PCX_DECODER 0
@ -491,6 +535,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_RV30_DECODER 0
+%define CONFIG_RV40_DECODER 0
+%define CONFIG_S302M_DECODER 0
+%define CONFIG_SANM_DECODER 0
+%define CONFIG_SGI_DECODER 0
+%define CONFIG_SMACKER_DECODER 0
+%define CONFIG_SMC_DECODER 0
@ -508,6 +553,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_TRUEMOTION1_DECODER 0
+%define CONFIG_TRUEMOTION2_DECODER 0
+%define CONFIG_TSCC_DECODER 0
+%define CONFIG_TSCC2_DECODER 0
+%define CONFIG_TXD_DECODER 0
+%define CONFIG_ULTI_DECODER 0
+%define CONFIG_UTVIDEO_DECODER 0
@ -573,6 +619,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_G729_DECODER 0
+%define CONFIG_GSM_DECODER 0
+%define CONFIG_GSM_MS_DECODER 0
+%define CONFIG_IAC_DECODER 0
+%define CONFIG_IMC_DECODER 0
+%define CONFIG_MACE3_DECODER 0
+%define CONFIG_MACE6_DECODER 0
@ -590,6 +637,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_MPC7_DECODER 0
+%define CONFIG_MPC8_DECODER 0
+%define CONFIG_NELLYMOSER_DECODER 0
+%define CONFIG_PAF_AUDIO_DECODER 0
+%define CONFIG_QCELP_DECODER 0
+%define CONFIG_QDM2_DECODER 0
+%define CONFIG_RA_144_DECODER 0
@ -623,12 +671,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_PCM_MULAW_DECODER 0
+%define CONFIG_PCM_S8_DECODER 0
+%define CONFIG_PCM_S8_PLANAR_DECODER 0
+%define CONFIG_PCM_S16BE_DECODER 0
+%define CONFIG_PCM_S16BE_DECODER 1
+%define CONFIG_PCM_S16LE_DECODER 1
+%define CONFIG_PCM_S16LE_PLANAR_DECODER 0
+%define CONFIG_PCM_S24BE_DECODER 0
+%define CONFIG_PCM_S24BE_DECODER 1
+%define CONFIG_PCM_S24DAUD_DECODER 0
+%define CONFIG_PCM_S24LE_DECODER 0
+%define CONFIG_PCM_S24LE_DECODER 1
+%define CONFIG_PCM_S32BE_DECODER 0
+%define CONFIG_PCM_S32LE_DECODER 0
+%define CONFIG_PCM_U8_DECODER 1
@ -673,20 +721,26 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_ADPCM_THP_DECODER 0
+%define CONFIG_ADPCM_XA_DECODER 0
+%define CONFIG_ADPCM_YAMAHA_DECODER 0
+%define CONFIG_VIMA_DECODER 0
+%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_MOVTEXT_DECODER 0
+%define CONFIG_PGSSUB_DECODER 0
+%define CONFIG_REALTEXT_DECODER 0
+%define CONFIG_SAMI_DECODER 0
+%define CONFIG_SRT_DECODER 0
+%define CONFIG_XSUB_DECODER 0
+%define CONFIG_LIBCELT_DECODER 0
+%define CONFIG_LIBGSM_DECODER 0
+%define CONFIG_LIBGSM_MS_DECODER 0
+%define CONFIG_LIBILBC_DECODER 0
+%define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
+%define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
+%define CONFIG_LIBOPENJPEG_DECODER 0
+%define CONFIG_LIBOPUS_DECODER 0
+%define CONFIG_LIBSCHROEDINGER_DECODER 0
+%define CONFIG_LIBSPEEX_DECODER 0
+%define CONFIG_LIBSTAGEFRIGHT_H264_DECODER 0
@ -755,6 +809,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_IDCIN_DEMUXER 0
+%define CONFIG_IDF_DEMUXER 0
+%define CONFIG_IFF_DEMUXER 0
+%define CONFIG_ILBC_DEMUXER 0
+%define CONFIG_IMAGE2_DEMUXER 0
+%define CONFIG_IMAGE2PIPE_DEMUXER 0
+%define CONFIG_INGENIENT_DEMUXER 0
@ -795,6 +850,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_NUV_DEMUXER 0
+%define CONFIG_OGG_DEMUXER 1
+%define CONFIG_OMA_DEMUXER 0
+%define CONFIG_PAF_DEMUXER 0
+%define CONFIG_PCM_ALAW_DEMUXER 0
+%define CONFIG_PCM_MULAW_DEMUXER 0
+%define CONFIG_PCM_F64BE_DEMUXER 0
@ -820,6 +876,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_QCP_DEMUXER 0
+%define CONFIG_R3D_DEMUXER 0
+%define CONFIG_RAWVIDEO_DEMUXER 0
+%define CONFIG_REALTEXT_DEMUXER 0
+%define CONFIG_RL2_DEMUXER 0
+%define CONFIG_RM_DEMUXER 0
+%define CONFIG_ROQ_DEMUXER 0
@ -827,6 +884,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_RSO_DEMUXER 0
+%define CONFIG_RTP_DEMUXER 0
+%define CONFIG_RTSP_DEMUXER 0
+%define CONFIG_SAMI_DEMUXER 0
+%define CONFIG_SAP_DEMUXER 0
+%define CONFIG_SBG_DEMUXER 0
+%define CONFIG_SDP_DEMUXER 0
@ -835,6 +893,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_SIFF_DEMUXER 0
+%define CONFIG_SMACKER_DEMUXER 0
+%define CONFIG_SMJPEG_DEMUXER 0
+%define CONFIG_SMUSH_DEMUXER 0
+%define CONFIG_SOL_DEMUXER 0
+%define CONFIG_SOX_DEMUXER 0
+%define CONFIG_SPDIF_DEMUXER 0
@ -988,8 +1047,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_SRT_ENCODER 0
+%define CONFIG_XSUB_ENCODER 0
+%define CONFIG_LIBFAAC_ENCODER 0
+%define CONFIG_LIBFDK_AAC_ENCODER 0
+%define CONFIG_LIBGSM_ENCODER 0
+%define CONFIG_LIBGSM_MS_ENCODER 0
+%define CONFIG_LIBILBC_ENCODER 0
+%define CONFIG_LIBMP3LAME_ENCODER 0
+%define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
+%define CONFIG_LIBOPENJPEG_ENCODER 0
@ -1007,16 +1068,23 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_LIBXVID_ENCODER 0
+%define CONFIG_LIBAACPLUS_ENCODER 0
+%define CONFIG_ACONVERT_FILTER 0
+%define CONFIG_AFIFO_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_ASETNSAMPLES_FILTER 0
+%define CONFIG_ASETTB_FILTER 0
+%define CONFIG_ASHOWINFO_FILTER 0
+%define CONFIG_ASPLIT_FILTER 0
+%define CONFIG_ASTREAMSYNC_FILTER 0
+%define CONFIG_ASYNCTS_FILTER 0
+%define CONFIG_ATEMPO_FILTER 0
+%define CONFIG_CHANNELMAP_FILTER 0
+%define CONFIG_CHANNELSPLIT_FILTER 0
+%define CONFIG_EARWAX_FILTER 0
+%define CONFIG_JOIN_FILTER 0
+%define CONFIG_PAN_FILTER 0
+%define CONFIG_SILENCEDETECT_FILTER 0
+%define CONFIG_VOLUME_FILTER 0
@ -1026,6 +1094,8 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_ANULLSRC_FILTER 0
+%define CONFIG_ABUFFERSINK_FILTER 0
+%define CONFIG_ANULLSINK_FILTER 0
+%define CONFIG_ALPHAEXTRACT_FILTER 0
+%define CONFIG_ALPHAMERGE_FILTER 0
+%define CONFIG_ASS_FILTER 0
+%define CONFIG_BBOX_FILTER 0
+%define CONFIG_BLACKDETECT_FILTER 0
@ -1061,6 +1131,7 @@ $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
@ -1091,6 +1162,8 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_TESTSRC_FILTER 0
+%define CONFIG_BUFFERSINK_FILTER 0
+%define CONFIG_NULLSINK_FILTER 0
+%define CONFIG_CONCAT_FILTER 0
+%define CONFIG_SHOWWAVES_FILTER 0
+%define CONFIG_H263_VAAPI_HWACCEL 0
+%define CONFIG_H264_DXVA2_HWACCEL 0
+%define CONFIG_H264_VAAPI_HWACCEL 0
@ -1109,6 +1182,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_DSHOW_INDEV 0
+%define CONFIG_DV1394_INDEV 0
+%define CONFIG_FBDEV_INDEV 0
+%define CONFIG_IEC61883_INDEV 0
+%define CONFIG_JACK_INDEV 0
+%define CONFIG_LAVFI_INDEV 0
+%define CONFIG_OPENAL_INDEV 0
@ -1156,6 +1230,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_H261_MUXER 0
+%define CONFIG_H263_MUXER 0
+%define CONFIG_H264_MUXER 0
+%define CONFIG_ILBC_MUXER 0
+%define CONFIG_IMAGE2_MUXER 0
+%define CONFIG_IMAGE2PIPE_MUXER 0
+%define CONFIG_IPOD_MUXER 0
@ -1219,6 +1294,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_RTSP_MUXER 0
+%define CONFIG_SAP_MUXER 0
+%define CONFIG_SEGMENT_MUXER 0
+%define CONFIG_STREAM_SEGMENT_MUXER 0
+%define CONFIG_SMJPEG_MUXER 0
+%define CONFIG_SOX_MUXER 0
+%define CONFIG_SPDIF_MUXER 0
@ -1236,6 +1312,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_YUV4MPEGPIPE_MUXER 0
+%define CONFIG_LIBNUT_MUXER 0
+%define CONFIG_ALSA_OUTDEV 0
+%define CONFIG_CACA_OUTDEV 0
+%define CONFIG_OSS_OUTDEV 0
+%define CONFIG_SDL_OUTDEV 0
+%define CONFIG_SNDIO_OUTDEV 0
@ -1265,14 +1342,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_RV30_PARSER 0
+%define CONFIG_RV40_PARSER 0
+%define CONFIG_VC1_PARSER 0
+%define CONFIG_VORBIS_PARSER 0
+%define CONFIG_VP3_PARSER 0
+%define CONFIG_VORBIS_PARSER 1
+%define CONFIG_VP3_PARSER 1
+%define CONFIG_VP8_PARSER 1
+%define CONFIG_APPLEHTTP_PROTOCOL 0
+%define CONFIG_BLURAY_PROTOCOL 0
+%define CONFIG_CACHE_PROTOCOL 0
+%define CONFIG_CONCAT_PROTOCOL 0
+%define CONFIG_CRYPTO_PROTOCOL 0
+%define CONFIG_FFRTMPCRYPT_PROTOCOL 0
+%define CONFIG_FFRTMPHTTP_PROTOCOL 0
+%define CONFIG_FILE_PROTOCOL 0
+%define CONFIG_GOPHER_PROTOCOL 0
+%define CONFIG_HLS_PROTOCOL 0
@ -1284,6 +1363,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+%define CONFIG_MD5_PROTOCOL 0
+%define CONFIG_PIPE_PROTOCOL 0
+%define CONFIG_RTMP_PROTOCOL 0
+%define CONFIG_RTMPE_PROTOCOL 0
+%define CONFIG_RTMPS_PROTOCOL 0
+%define CONFIG_RTMPT_PROTOCOL 0
+%define CONFIG_RTMPTE_PROTOCOL 0
+%define CONFIG_RTMPTS_PROTOCOL 0
+%define CONFIG_RTP_PROTOCOL 0
+%define CONFIG_SCTP_PROTOCOL 0
+%define CONFIG_TCP_PROTOCOL 0

271
www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_h
View File

@ -1,19 +1,32 @@
$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 @@
$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_h,v 1.3 2012/10/12 16:46:10 robert Exp $
--- third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.h.orig Wed Oct 10 15:03:14 2012
+++ third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/config.h Fri Oct 12 12:55:45 2012
@@ -1,12 +1,12 @@
/* Automatically generated by configure - do not modify! */
#ifndef FFMPEG_CONFIG_H
#define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-everything --enable-fft --enable-rdft --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_f32le' --enable-demuxer='ogg,matroska,wav' --enable-parser=vp8 --arch=i686 --enable-yasm --extra-cflags=-m32 --extra-cflags=-fPIC --extra-ldflags=-m32"
+#define FFMPEG_CONFIGURATION "--disable-everything --enable-fft --enable-rdft --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --optflags=-O2 --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_f32le' --enable-demuxer='ogg,matroska,wav' --enable-parser=vp8 --arch=i686 --enable-yasm --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic"
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-avdevice --disable-avfilter --disable-bzlib --disable-doc --disable-network --disable-postproc --disable-swresample --disable-swscale --disable-zlib --enable-fft --enable-rdft --enable-shared --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --optflags=-O2 --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be' --enable-demuxer='ogg,matroska,wav' --enable-parser='vp3,vorbis,vp8' --enable-pic"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-#define CC_TYPE "gcc"
-#define CC_VERSION __VERSION__
-#define restrict restrict
+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
#define CC_TYPE "gcc"
#define CC_VERSION __VERSION__
#define restrict restrict
@@ -38,8 +39,7 @@
+#define CC_IDENT "gcc 4.2.1 (GCC) 20070719"
+#define av_restrict restrict
#define EXTERN_PREFIX ""
#define EXTERN_ASM
#define SLIBSUF ".so"
@@ -32,14 +32,13 @@
#define ARCH_X86_32 1
#define ARCH_X86_64 0
#define HAVE_ALTIVEC 0
-#define HAVE_AMD3DNOW 0
-#define HAVE_AMD3DNOWEXT 0
+#define HAVE_AMD3DNOW 1
+#define HAVE_AMD3DNOWEXT 1
#define HAVE_ARMV5TE 0
#define HAVE_ARMV6 0
#define HAVE_ARMV6T2 0
#define HAVE_ARMVFP 0
@ -23,11 +36,20 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
#define HAVE_MMI 0
#define HAVE_MMX 1
#define HAVE_MMX2 1
@@ -53,25 +53,29 @@
@@ -49,29 +48,40 @@
#define HAVE_SSSE3 0
#define HAVE_VFPV3 0
#define HAVE_VIS 0
+#define HAVE_MIPSFPU 0
+#define HAVE_MIPS32R2 0
+#define HAVE_MIPSDSPR1 0
+#define HAVE_MIPSDSPR2 0
#define HAVE_BIGENDIAN 0
#define HAVE_FAST_UNALIGNED 1
#define HAVE_PTHREADS 1
#define HAVE_W32THREADS 0
+#define HAVE_OS2THREADS 0
+#define HAVE_ALIGNED_MALLOC 0
#define HAVE_ALIGNED_STACK 1
#define HAVE_ALSA_ASOUNDLIB_H 0
#define HAVE_ALTIVEC_H 0
@ -41,6 +63,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define HAVE_CLOCK_GETTIME 1
#define HAVE_CLOSESOCKET 0
#define HAVE_CMOV 0
+#define HAVE_CPUID 0
#define HAVE_DCBZL 0
#define HAVE_DEV_BKTR_IOCTL_BT848_H 0
#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
@ -53,18 +76,25 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
#define HAVE_DLOPEN 1
#define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
+#define HAVE_DXVA_H 0
+#define HAVE_EBP_AVAILABLE 1
#define HAVE_EBX_AVAILABLE 0
#define HAVE_EXP2 1
#define HAVE_EXP2F 1
@@ -82,17 +86,20 @@
@@ -80,19 +90,28 @@
#define HAVE_FAST_CMOV 0
#define HAVE_FCNTL 1
#define HAVE_FORK 1
#define HAVE_GETADDRINFO 1
-#define HAVE_GETADDRINFO 1
+#define HAVE_GETADDRINFO 0
#define HAVE_GETHRTIME 0
+#define HAVE_GETOPT 1
+#define HAVE_GETPROCESSAFFINITYMASK 0
#define HAVE_GETPROCESSMEMORYINFO 0
#define HAVE_GETPROCESSTIMES 0
+#define HAVE_GETSYSTEMTIMEASFILETIME 0
#define HAVE_GETRUSAGE 1
+#define HAVE_GETTIMEOFDAY 1
+#define HAVE_GLOB 1
#define HAVE_GNU_AS 1
-#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
@ -72,6 +102,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
#define HAVE_INET_ATON 1
#define HAVE_INLINE_ASM 1
#define HAVE_ISATTY 1
+#define HAVE_ISINF 1
+#define HAVE_ISNAN 1
+#define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
#define HAVE_KBHIT 0
#define HAVE_LDBRX 0
+#define HAVE_LIBDC1394_1 0
@ -79,7 +112,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,47 @@
@@ -106,45 +125,71 @@
#define HAVE_LZO1X_999_COMPRESS 0
#define HAVE_MACHINE_IOCTL_BT848_H 0
#define HAVE_MACHINE_IOCTL_METEOR_H 0
@ -89,14 +122,20 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
-#define HAVE_MEMALIGN 1
+#define HAVE_MEMALIGN 0
#define HAVE_MKSTEMP 1
+#define HAVE_MM_EMPTY 0
#define HAVE_MMAP 1
+#define HAVE_NANOSLEEP 1
+#define HAVE_NETINET_SCTP_H 0
+#define HAVE_PEEKNAMEDPIPE 0
+#define HAVE_POD2MAN 1
+#define HAVE_POLL_H 1
#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_PTHREAD_CANCEL 1
+#define HAVE_RDTSC 0
+#define HAVE_RINT 1
#define HAVE_ROUND 1
#define HAVE_ROUNDF 1
+#define HAVE_RWEFLAGS 0
+#define HAVE_SCHED_GETAFFINITY 0
#define HAVE_SDL 0
#define HAVE_SDL_VIDEO_SIZE 0
@ -106,6 +145,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
-#define HAVE_SOUNDCARD_H 0
-#define HAVE_POLL_H 1
#define HAVE_SETRLIMIT 1
+#define HAVE_SLEEP 0
+#define HAVE_SNDIO_H 1
+#define HAVE_SOCKLEN_T 0
+#define HAVE_SOUNDCARD_H 1
@ -113,7 +153,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
-#define HAVE_STRTOK_R 1
+#define HAVE_STRPTIME 1
#define HAVE_STRUCT_ADDRINFO 0
+#define HAVE_STRUCT_GROUP_SOURCE_REQ 0
+#define HAVE_STRUCT_IP_MREQ_SOURCE 0
#define HAVE_STRUCT_IPV6_MREQ 0
+#define HAVE_STRUCT_POLLFD 0
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
#define HAVE_STRUCT_SOCKADDR_IN6 0
#define HAVE_STRUCT_SOCKADDR_SA_LEN 0
@ -133,11 +176,25 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
-#define HAVE_SYS_SOUNDCARD_H 1
-#define HAVE_SYS_VIDEOIO_H 0
+#define HAVE_SYS_SOUNDCARD_H 0
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_VIDEOIO_H 1
#define HAVE_TERMIOS_H 1
+#define HAVE_TEXI2HTML 0
#define HAVE_THREADS 1
#define HAVE_TRUNC 1
@@ -157,13 +174,17 @@
#define HAVE_TRUNCF 1
+#define HAVE_UNISTD_H 1
+#define HAVE_USLEEP 1
#define HAVE_VFP_ARGS 0
#define HAVE_VIRTUALALLOC 0
+#define HAVE_WINDOWS_H 0
#define HAVE_WINSOCK2_H 0
#define HAVE_XFORM_ASM 0
+#define HAVE_XGETBV 0
#define HAVE_XMM_CLOBBERS 0
#define HAVE_YASM 1
#define CONFIG_BSFS 0
@@ -157,13 +202,17 @@
#define CONFIG_MUXERS 0
#define CONFIG_OUTDEVS 0
#define CONFIG_PARSERS 1
@ -150,17 +207,20 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_FFMPEG 0
#define CONFIG_AC3DSP 0
#define CONFIG_AVCODEC 1
#define CONFIG_AVDEVICE 1
-#define CONFIG_AVDEVICE 1
-#define CONFIG_AVFILTER 1
+#define CONFIG_AVDEVICE 0
+#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 @@
@@ -171,36 +220,45 @@
#define CONFIG_DOC 0
#define CONFIG_DWT 0
#define CONFIG_DXVA2 0
+#define CONFIG_FAST_UNALIGNED 1
#define CONFIG_FASTDIV 1
-#define CONFIG_FFMPEG 0
-#define CONFIG_FFPLAY 0
@ -170,6 +230,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_FONTCONFIG 0
#define CONFIG_FREI0R 0
-#define CONFIG_GOLOMB 1
+#define CONFIG_GCRYPT 0
+#define CONFIG_GNUTLS 0
#define CONFIG_GPL 0
#define CONFIG_GRAY 0
@ -180,13 +241,17 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_LIBAACPLUS 0
+#define CONFIG_LIBASS 0
+#define CONFIG_LIBBLURAY 0
+#define CONFIG_LIBCACA 0
+#define CONFIG_LIBCDIO 0
#define CONFIG_LIBCELT 0
#define CONFIG_LIBDC1394 0
-#define CONFIG_LIBDIRAC 0
#define CONFIG_LIBFAAC 0
+#define CONFIG_LIBFDK_AAC 0
#define CONFIG_LIBFREETYPE 0
#define CONFIG_LIBGSM 0
+#define CONFIG_LIBIEC61883 0
+#define CONFIG_LIBILBC 0
+#define CONFIG_LIBMODPLUG 0
#define CONFIG_LIBMP3LAME 0
#define CONFIG_LIBNUT 0
@ -194,6 +259,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
#define CONFIG_LIBOPENCORE_AMRWB 0
#define CONFIG_LIBOPENCV 0
#define CONFIG_LIBOPENJPEG 0
+#define CONFIG_LIBOPUS 0
+#define CONFIG_LIBPULSE 0
#define CONFIG_LIBRTMP 0
#define CONFIG_LIBSCHROEDINGER 0
@ -205,7 +271,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 +231,60 @@
@@ -208,36 +266,63 @@
#define CONFIG_LIBX264 0
#define CONFIG_LIBXAVS 0
#define CONFIG_LIBXVID 0
@ -214,7 +280,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
#define CONFIG_MDCT 1
#define CONFIG_MEMALIGN_HACK 0
-#define CONFIG_MLIB 0
+#define CONFIG_MEMORY_POISONING 0
#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_NETTLE 0
#define CONFIG_NETWORK 0
#define CONFIG_NONFREE 0
#define CONFIG_OPENAL 0
@ -230,7 +298,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
#define CONFIG_SMALL 0
#define CONFIG_SRAM 0
#define CONFIG_STATIC 1
+#define CONFIG_SWRESAMPLE 1
+#define CONFIG_SWRESAMPLE 0
#define CONFIG_SWSCALE 0
#define CONFIG_SWSCALE_ALPHA 1
#define CONFIG_THUMB 0
@ -252,6 +320,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_HUFFMAN 0
#define CONFIG_LGPLV3 0
+#define CONFIG_LPC 0
+#define CONFIG_VP3DSP 1
+#define CONFIG_AAC_ADTSTOASC_BSF 0
+#define CONFIG_CHOMP_BSF 0
+#define CONFIG_DUMP_EXTRADATA_BSF 0
@ -268,7 +337,7 @@ $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 +293,31 @@
@@ -246,24 +331,31 @@
#define CONFIG_ASV2_DECODER 0
#define CONFIG_AURA_DECODER 0
#define CONFIG_AURA2_DECODER 0
@ -300,7 +369,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 +326,13 @@
@@ -272,11 +364,13 @@
#define CONFIG_EIGHTBPS_DECODER 0
#define CONFIG_EIGHTSVX_EXP_DECODER 0
#define CONFIG_EIGHTSVX_FIB_DECODER 0
@ -315,7 +384,15 @@ $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 +351,7 @@
@@ -286,6 +380,7 @@
#define CONFIG_H261_DECODER 0
#define CONFIG_H263_DECODER 0
#define CONFIG_H263I_DECODER 0
+#define CONFIG_H263P_DECODER 0
#define CONFIG_H264_DECODER 0
#define CONFIG_H264_CRYSTALHD_DECODER 0
#define CONFIG_H264_VDPAU_DECODER 0
@@ -295,6 +390,7 @@
#define CONFIG_IFF_ILBM_DECODER 0
#define CONFIG_INDEO2_DECODER 0
#define CONFIG_INDEO3_DECODER 0
@ -323,7 +400,27 @@ $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 +394,8 @@
@@ -320,15 +416,19 @@
#define CONFIG_MPEG_VDPAU_DECODER 0
#define CONFIG_MPEG1_VDPAU_DECODER 0
#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+#define CONFIG_MSA1_DECODER 0
#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
#define CONFIG_MSMPEG4V1_DECODER 0
#define CONFIG_MSMPEG4V2_DECODER 0
#define CONFIG_MSMPEG4V3_DECODER 0
#define CONFIG_MSRLE_DECODER 0
+#define CONFIG_MSS1_DECODER 0
#define CONFIG_MSVIDEO1_DECODER 0
#define CONFIG_MSZH_DECODER 0
+#define CONFIG_MTS2_DECODER 0
#define CONFIG_MXPEG_DECODER 0
#define CONFIG_NUV_DECODER 0
+#define CONFIG_PAF_VIDEO_DECODER 0
#define CONFIG_PAM_DECODER 0
#define CONFIG_PBM_DECODER 0
#define CONFIG_PCX_DECODER 0
@@ -337,6 +437,8 @@
#define CONFIG_PICTOR_DECODER 0
#define CONFIG_PNG_DECODER 0
#define CONFIG_PPM_DECODER 0
@ -332,8 +429,19 @@ $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 +430,18 @@
@@ -352,6 +454,7 @@
#define CONFIG_RV30_DECODER 0
#define CONFIG_RV40_DECODER 0
#define CONFIG_S302M_DECODER 0
+#define CONFIG_SANM_DECODER 0
#define CONFIG_SGI_DECODER 0
#define CONFIG_SMACKER_DECODER 0
#define CONFIG_SMC_DECODER 0
@@ -369,14 +472,21 @@
#define CONFIG_TRUEMOTION1_DECODER 0
#define CONFIG_TRUEMOTION2_DECODER 0
#define CONFIG_TSCC_DECODER 0
+#define CONFIG_TSCC2_DECODER 0
#define CONFIG_TXD_DECODER 0
#define CONFIG_ULTI_DECODER 0
+#define CONFIG_UTVIDEO_DECODER 0
@ -351,7 +459,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 +457,17 @@
@@ -392,11 +502,17 @@
#define CONFIG_WMV3_DECODER 0
#define CONFIG_WMV3_CRYSTALHD_DECODER 0
#define CONFIG_WMV3_VDPAU_DECODER 0
@ -369,7 +477,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 +482,15 @@
@@ -411,13 +527,18 @@
#define CONFIG_ATRAC3_DECODER 0
#define CONFIG_BINKAUDIO_DCT_DECODER 0
#define CONFIG_BINKAUDIO_RDFT_DECODER 0
@ -384,8 +492,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_G729_DECODER 0
#define CONFIG_GSM_DECODER 0
#define CONFIG_GSM_MS_DECODER 0
+#define CONFIG_IAC_DECODER 0
#define CONFIG_IMC_DECODER 0
@@ -439,6 +514,7 @@
#define CONFIG_MACE3_DECODER 0
#define CONFIG_MACE6_DECODER 0
@@ -435,10 +556,12 @@
#define CONFIG_MPC7_DECODER 0
#define CONFIG_MPC8_DECODER 0
#define CONFIG_NELLYMOSER_DECODER 0
+#define CONFIG_PAF_AUDIO_DECODER 0
#define CONFIG_QCELP_DECODER 0
#define CONFIG_QDM2_DECODER 0
#define CONFIG_RA_144_DECODER 0
#define CONFIG_RA_288_DECODER 0
@ -393,7 +509,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 +526,7 @@
@@ -450,6 +573,7 @@
#define CONFIG_VMDAUDIO_DECODER 0
#define CONFIG_VORBIS_DECODER 1
#define CONFIG_WAVPACK_DECODER 0
@ -401,15 +517,24 @@ $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 +542,7 @@
@@ -465,12 +589,13 @@
#define CONFIG_PCM_LXF_DECODER 0
#define CONFIG_PCM_MULAW_DECODER 0
#define CONFIG_PCM_S8_DECODER 0
-#define CONFIG_PCM_S16BE_DECODER 0
+#define CONFIG_PCM_S8_PLANAR_DECODER 0
#define CONFIG_PCM_S16BE_DECODER 0
+#define CONFIG_PCM_S16BE_DECODER 1
#define CONFIG_PCM_S16LE_DECODER 1
#define CONFIG_PCM_S16LE_PLANAR_DECODER 0
@@ -497,6 +575,7 @@
-#define CONFIG_PCM_S24BE_DECODER 0
+#define CONFIG_PCM_S24BE_DECODER 1
#define CONFIG_PCM_S24DAUD_DECODER 0
-#define CONFIG_PCM_S24LE_DECODER 0
+#define CONFIG_PCM_S24LE_DECODER 1
#define CONFIG_PCM_S32BE_DECODER 0
#define CONFIG_PCM_S32LE_DECODER 0
#define CONFIG_PCM_U8_DECODER 1
@@ -497,6 +622,7 @@
#define CONFIG_ADPCM_G722_DECODER 0
#define CONFIG_ADPCM_G726_DECODER 0
#define CONFIG_ADPCM_IMA_AMV_DECODER 0
@ -417,22 +542,31 @@ $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
@@ -517,11 +596,12 @@
@@ -514,194 +640,46 @@
#define CONFIG_ADPCM_THP_DECODER 0
#define CONFIG_ADPCM_XA_DECODER 0
#define CONFIG_ADPCM_YAMAHA_DECODER 0
+#define CONFIG_VIMA_DECODER 0
#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_MOVTEXT_DECODER 0
#define CONFIG_PGSSUB_DECODER 0
+#define CONFIG_REALTEXT_DECODER 0
+#define CONFIG_SAMI_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_LIBILBC_DECODER 0
#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
@@ -529,179 +609,24 @@
#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
#define CONFIG_LIBOPENJPEG_DECODER 0
+#define CONFIG_LIBOPUS_DECODER 0
#define CONFIG_LIBSCHROEDINGER_DECODER 0
#define CONFIG_LIBSPEEX_DECODER 0
+#define CONFIG_LIBSTAGEFRIGHT_H264_DECODER 0
@ -620,7 +754,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 +635,15 @@
@@ -710,11 +688,15 @@
#define CONFIG_AVS_DEMUXER 0
#define CONFIG_BETHSOFTVID_DEMUXER 0
#define CONFIG_BFI_DEMUXER 0
@ -636,7 +770,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 +663,17 @@
@@ -734,13 +716,19 @@
#define CONFIG_FLV_DEMUXER 0
#define CONFIG_FOURXM_DEMUXER 0
#define CONFIG_G722_DEMUXER 0
@ -652,9 +786,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
#define CONFIG_IDCIN_DEMUXER 0
+#define CONFIG_IDF_DEMUXER 0
#define CONFIG_IFF_DEMUXER 0
+#define CONFIG_ILBC_DEMUXER 0
#define CONFIG_IMAGE2_DEMUXER 0
#define CONFIG_IMAGE2PIPE_DEMUXER 0
@@ -748,11 +682,15 @@
#define CONFIG_INGENIENT_DEMUXER 0
@@ -748,11 +736,15 @@
#define CONFIG_ISS_DEMUXER 0
#define CONFIG_IV8_DEMUXER 0
#define CONFIG_IVF_DEMUXER 0
@ -670,9 +806,27 @@ $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 +748,13 @@
@@ -777,6 +769,7 @@
#define CONFIG_NUV_DEMUXER 0
#define CONFIG_OGG_DEMUXER 1
#define CONFIG_OMA_DEMUXER 0
+#define CONFIG_PAF_DEMUXER 0
#define CONFIG_PCM_ALAW_DEMUXER 0
#define CONFIG_PCM_MULAW_DEMUXER 0
#define CONFIG_PCM_F64BE_DEMUXER 0
@@ -802,6 +795,7 @@
#define CONFIG_QCP_DEMUXER 0
#define CONFIG_R3D_DEMUXER 0
#define CONFIG_RAWVIDEO_DEMUXER 0
+#define CONFIG_REALTEXT_DEMUXER 0
#define CONFIG_RL2_DEMUXER 0
#define CONFIG_RM_DEMUXER 0
#define CONFIG_ROQ_DEMUXER 0
@@ -809,12 +803,16 @@
#define CONFIG_RSO_DEMUXER 0
#define CONFIG_RTP_DEMUXER 0
#define CONFIG_RTSP_DEMUXER 0
+#define CONFIG_SAMI_DEMUXER 0
#define CONFIG_SAP_DEMUXER 0
+#define CONFIG_SBG_DEMUXER 0
#define CONFIG_SDP_DEMUXER 0
@ -681,10 +835,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
#define CONFIG_SIFF_DEMUXER 0
#define CONFIG_SMACKER_DEMUXER 0
+#define CONFIG_SMJPEG_DEMUXER 0
+#define CONFIG_SMUSH_DEMUXER 0
#define CONFIG_SOL_DEMUXER 0
#define CONFIG_SOX_DEMUXER 0
#define CONFIG_SPDIF_DEMUXER 0
@@ -836,19 +776,274 @@
@@ -836,19 +834,289 @@
#define CONFIG_W64_DEMUXER 0
#define CONFIG_WAV_DEMUXER 1
#define CONFIG_WC3_DEMUXER 0
@ -821,8 +976,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_SRT_ENCODER 0
+#define CONFIG_XSUB_ENCODER 0
+#define CONFIG_LIBFAAC_ENCODER 0
+#define CONFIG_LIBFDK_AAC_ENCODER 0
+#define CONFIG_LIBGSM_ENCODER 0
+#define CONFIG_LIBGSM_MS_ENCODER 0
+#define CONFIG_LIBILBC_ENCODER 0
+#define CONFIG_LIBMP3LAME_ENCODER 0
+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
+#define CONFIG_LIBOPENJPEG_ENCODER 0
@ -840,16 +997,23 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_LIBXVID_ENCODER 0
+#define CONFIG_LIBAACPLUS_ENCODER 0
+#define CONFIG_ACONVERT_FILTER 0
+#define CONFIG_AFIFO_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_ASETNSAMPLES_FILTER 0
+#define CONFIG_ASETTB_FILTER 0
+#define CONFIG_ASHOWINFO_FILTER 0
+#define CONFIG_ASPLIT_FILTER 0
+#define CONFIG_ASTREAMSYNC_FILTER 0
+#define CONFIG_ASYNCTS_FILTER 0
+#define CONFIG_ATEMPO_FILTER 0
+#define CONFIG_CHANNELMAP_FILTER 0
+#define CONFIG_CHANNELSPLIT_FILTER 0
+#define CONFIG_EARWAX_FILTER 0
+#define CONFIG_JOIN_FILTER 0
+#define CONFIG_PAN_FILTER 0
+#define CONFIG_SILENCEDETECT_FILTER 0
+#define CONFIG_VOLUME_FILTER 0
@ -859,6 +1023,8 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_ANULLSRC_FILTER 0
+#define CONFIG_ABUFFERSINK_FILTER 0
+#define CONFIG_ANULLSINK_FILTER 0
+#define CONFIG_ALPHAEXTRACT_FILTER 0
+#define CONFIG_ALPHAMERGE_FILTER 0
+#define CONFIG_ASS_FILTER 0
+#define CONFIG_BBOX_FILTER 0
+#define CONFIG_BLACKDETECT_FILTER 0
@ -894,6 +1060,7 @@ $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
@ -924,6 +1091,8 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_TESTSRC_FILTER 0
+#define CONFIG_BUFFERSINK_FILTER 0
+#define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_CONCAT_FILTER 0
+#define CONFIG_SHOWWAVES_FILTER 0
+#define CONFIG_H263_VAAPI_HWACCEL 0
+#define CONFIG_H264_DXVA2_HWACCEL 0
+#define CONFIG_H264_VAAPI_HWACCEL 0
@ -942,6 +1111,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_DSHOW_INDEV 0
+#define CONFIG_DV1394_INDEV 0
+#define CONFIG_FBDEV_INDEV 0
+#define CONFIG_IEC61883_INDEV 0
+#define CONFIG_JACK_INDEV 0
+#define CONFIG_LAVFI_INDEV 0
+#define CONFIG_OPENAL_INDEV 0
@ -960,7 +1130,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 +1052,7 @@
@@ -857,6 +1125,7 @@
#define CONFIG_AU_MUXER 0
#define CONFIG_AVI_MUXER 0
#define CONFIG_AVM2_MUXER 0
@ -968,7 +1138,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 +1070,7 @@
@@ -874,15 +1143,20 @@
#define CONFIG_FRAMECRC_MUXER 0
#define CONFIG_FRAMEMD5_MUXER 0
#define CONFIG_G722_MUXER 0
@ -976,7 +1146,9 @@ $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 +1079,10 @@
#define CONFIG_H263_MUXER 0
#define CONFIG_H264_MUXER 0
+#define CONFIG_ILBC_MUXER 0
#define CONFIG_IMAGE2_MUXER 0
#define CONFIG_IMAGE2PIPE_MUXER 0
#define CONFIG_IPOD_MUXER 0
@ -987,7 +1159,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
#define CONFIG_M4V_MUXER 0
#define CONFIG_MD5_MUXER 0
#define CONFIG_MATROSKA_MUXER 0
@@ -909,6 +1109,7 @@
@@ -909,6 +1183,7 @@
#define CONFIG_NULL_MUXER 0
#define CONFIG_NUT_MUXER 0
#define CONFIG_OGG_MUXER 0
@ -995,11 +1167,12 @@ $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 +1138,80 @@
@@ -937,103 +1212,89 @@
#define CONFIG_RTP_MUXER 0
#define CONFIG_RTSP_MUXER 0
#define CONFIG_SAP_MUXER 0
+#define CONFIG_SEGMENT_MUXER 0
+#define CONFIG_STREAM_SEGMENT_MUXER 0
+#define CONFIG_SMJPEG_MUXER 0
#define CONFIG_SOX_MUXER 0
#define CONFIG_SPDIF_MUXER 0
@ -1067,6 +1240,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
-#define CONFIG_BUFFERSINK_FILTER 0
-#define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_ALSA_OUTDEV 0
+#define CONFIG_CACA_OUTDEV 0
+#define CONFIG_OSS_OUTDEV 0
+#define CONFIG_SDL_OUTDEV 0
+#define CONFIG_SNDIO_OUTDEV 0
@ -1096,14 +1270,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
+#define CONFIG_RV30_PARSER 0
+#define CONFIG_RV40_PARSER 0
+#define CONFIG_VC1_PARSER 0
+#define CONFIG_VORBIS_PARSER 0
+#define CONFIG_VP3_PARSER 0
+#define CONFIG_VORBIS_PARSER 1
+#define CONFIG_VP3_PARSER 1
+#define CONFIG_VP8_PARSER 1
#define CONFIG_APPLEHTTP_PROTOCOL 0
+#define CONFIG_BLURAY_PROTOCOL 0
+#define CONFIG_CACHE_PROTOCOL 0
#define CONFIG_CONCAT_PROTOCOL 0
#define CONFIG_CRYPTO_PROTOCOL 0
+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
#define CONFIG_FILE_PROTOCOL 0
#define CONFIG_GOPHER_PROTOCOL 0
+#define CONFIG_HLS_PROTOCOL 0
@ -1116,9 +1292,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_config_
#define CONFIG_PIPE_PROTOCOL 0
#define CONFIG_RTMP_PROTOCOL 0
-#define CONFIG_RTMPT_PROTOCOL 0
-#define CONFIG_RTMPE_PROTOCOL 0
#define CONFIG_RTMPE_PROTOCOL 0
-#define CONFIG_RTMPTE_PROTOCOL 0
-#define CONFIG_RTMPS_PROTOCOL 0
#define CONFIG_RTMPS_PROTOCOL 0
+#define CONFIG_RTMPT_PROTOCOL 0
+#define CONFIG_RTMPTE_PROTOCOL 0
+#define CONFIG_RTMPTS_PROTOCOL 0
#define CONFIG_RTP_PROTOCOL 0
+#define CONFIG_SCTP_PROTOCOL 0
#define CONFIG_TCP_PROTOCOL 0

687
www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_libavcodec_codec_names_h Normal file
View File

@ -0,0 +1,687 @@
$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_ia32_libavcodec_codec_names_h,v 1.1 2012/10/12 16:46:10 robert Exp $
--- third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/libavcodec/codec_names.h.orig Fri Oct 12 12:56:00 2012
+++ third_party/ffmpeg/chromium/config/Chromium/openbsd/ia32/libavcodec/codec_names.h Fri Oct 12 12:56:01 2012
@@ -0,0 +1,683 @@
+case CODEC_ID_NONE:
+ return "none";
+case CODEC_ID_MPEG1VIDEO:
+ return "mpeg1video";
+case CODEC_ID_MPEG2VIDEO:
+ return "mpeg2video";
+case CODEC_ID_MPEG2VIDEO_XVMC:
+ return "mpeg2video_xvmc";
+case CODEC_ID_H261:
+ return "h261";
+case CODEC_ID_H263:
+ return "h263";
+case CODEC_ID_RV10:
+ return "rv10";
+case CODEC_ID_RV20:
+ return "rv20";
+case CODEC_ID_MJPEG:
+ return "mjpeg";
+case CODEC_ID_MJPEGB:
+ return "mjpegb";
+case CODEC_ID_LJPEG:
+ return "ljpeg";
+case CODEC_ID_SP5X:
+ return "sp5x";
+case CODEC_ID_JPEGLS:
+ return "jpegls";
+case CODEC_ID_MPEG4:
+ return "mpeg4";
+case CODEC_ID_RAWVIDEO:
+ return "rawvideo";
+case CODEC_ID_MSMPEG4V1:
+ return "msmpeg4v1";
+case CODEC_ID_MSMPEG4V2:
+ return "msmpeg4v2";
+case CODEC_ID_MSMPEG4V3:
+ return "msmpeg4v3";
+case CODEC_ID_WMV1:
+ return "wmv1";
+case CODEC_ID_WMV2:
+ return "wmv2";
+case CODEC_ID_H263P:
+ return "h263p";
+case CODEC_ID_H263I:
+ return "h263i";
+case CODEC_ID_FLV1:
+ return "flv1";
+case CODEC_ID_SVQ1:
+ return "svq1";
+case CODEC_ID_SVQ3:
+ return "svq3";
+case CODEC_ID_DVVIDEO:
+ return "dvvideo";
+case CODEC_ID_HUFFYUV:
+ return "huffyuv";
+case CODEC_ID_CYUV:
+ return "cyuv";
+case CODEC_ID_H264:
+ return "h264";
+case CODEC_ID_INDEO3:
+ return "indeo3";
+case CODEC_ID_VP3:
+ { extern AVCodec ff_vp3_decoder;
+ return ff_vp3_decoder.name; }
+case CODEC_ID_THEORA:
+ { extern AVCodec ff_theora_decoder;
+ return ff_theora_decoder.name; }
+case CODEC_ID_ASV1:
+ return "asv1";
+case CODEC_ID_ASV2:
+ return "asv2";
+case CODEC_ID_FFV1:
+ return "ffv1";
+case CODEC_ID_4XM:
+ return "4xm";
+case CODEC_ID_VCR1:
+ return "vcr1";
+case CODEC_ID_CLJR:
+ return "cljr";
+case CODEC_ID_MDEC:
+ return "mdec";
+case CODEC_ID_ROQ:
+ return "roq";
+case CODEC_ID_INTERPLAY_VIDEO:
+ return "interplay_video";
+case CODEC_ID_XAN_WC3:
+ return "xan_wc3";
+case CODEC_ID_XAN_WC4:
+ return "xan_wc4";
+case CODEC_ID_RPZA:
+ return "rpza";
+case CODEC_ID_CINEPAK:
+ return "cinepak";
+case CODEC_ID_WS_VQA:
+ return "ws_vqa";
+case CODEC_ID_MSRLE:
+ return "msrle";
+case CODEC_ID_MSVIDEO1:
+ return "msvideo1";
+case CODEC_ID_IDCIN:
+ return "idcin";
+case CODEC_ID_8BPS:
+ return "8bps";
+case CODEC_ID_SMC:
+ return "smc";
+case CODEC_ID_FLIC:
+ return "flic";
+case CODEC_ID_TRUEMOTION1:
+ return "truemotion1";
+case CODEC_ID_VMDVIDEO:
+ return "vmdvideo";
+case CODEC_ID_MSZH:
+ return "mszh";
+case CODEC_ID_ZLIB:
+ return "zlib";
+case CODEC_ID_QTRLE:
+ return "qtrle";
+case CODEC_ID_SNOW:
+ return "snow";
+case CODEC_ID_TSCC:
+ return "tscc";
+case CODEC_ID_ULTI:
+ return "ulti";
+case CODEC_ID_QDRAW:
+ return "qdraw";
+case CODEC_ID_VIXL:
+ return "vixl";
+case CODEC_ID_QPEG:
+ return "qpeg";
+case CODEC_ID_PNG:
+ return "png";
+case CODEC_ID_PPM:
+ return "ppm";
+case CODEC_ID_PBM:
+ return "pbm";
+case CODEC_ID_PGM:
+ return "pgm";
+case CODEC_ID_PGMYUV:
+ return "pgmyuv";
+case CODEC_ID_PAM:
+ return "pam";
+case CODEC_ID_FFVHUFF:
+ return "ffvhuff";
+case CODEC_ID_RV30:
+ return "rv30";
+case CODEC_ID_RV40:
+ return "rv40";
+case CODEC_ID_VC1:
+ return "vc1";
+case CODEC_ID_WMV3:
+ return "wmv3";
+case CODEC_ID_LOCO:
+ return "loco";
+case CODEC_ID_WNV1:
+ return "wnv1";
+case CODEC_ID_AASC:
+ return "aasc";
+case CODEC_ID_INDEO2:
+ return "indeo2";
+case CODEC_ID_FRAPS:
+ return "fraps";
+case CODEC_ID_TRUEMOTION2:
+ return "truemotion2";
+case CODEC_ID_BMP:
+ return "bmp";
+case CODEC_ID_CSCD:
+ return "cscd";
+case CODEC_ID_MMVIDEO:
+ return "mmvideo";
+case CODEC_ID_ZMBV:
+ return "zmbv";
+case CODEC_ID_AVS:
+ return "avs";
+case CODEC_ID_SMACKVIDEO:
+ return "smackvideo";
+case CODEC_ID_NUV:
+ return "nuv";
+case CODEC_ID_KMVC:
+ return "kmvc";
+case CODEC_ID_FLASHSV:
+ return "flashsv";
+case CODEC_ID_CAVS:
+ return "cavs";
+case CODEC_ID_JPEG2000:
+ return "jpeg2000";
+case CODEC_ID_VMNC:
+ return "vmnc";
+case CODEC_ID_VP5:
+ return "vp5";
+case CODEC_ID_VP6:
+ return "vp6";
+case CODEC_ID_VP6F:
+ return "vp6f";
+case CODEC_ID_TARGA:
+ return "targa";
+case CODEC_ID_DSICINVIDEO:
+ return "dsicinvideo";
+case CODEC_ID_TIERTEXSEQVIDEO:
+ return "tiertexseqvideo";
+case CODEC_ID_TIFF:
+ return "tiff";
+case CODEC_ID_GIF:
+ return "gif";
+case CODEC_ID_DXA:
+ return "dxa";
+case CODEC_ID_DNXHD:
+ return "dnxhd";
+case CODEC_ID_THP:
+ return "thp";
+case CODEC_ID_SGI:
+ return "sgi";
+case CODEC_ID_C93:
+ return "c93";
+case CODEC_ID_BETHSOFTVID:
+ return "bethsoftvid";
+case CODEC_ID_PTX:
+ return "ptx";
+case CODEC_ID_TXD:
+ return "txd";
+case CODEC_ID_VP6A:
+ return "vp6a";
+case CODEC_ID_AMV:
+ return "amv";
+case CODEC_ID_VB:
+ return "vb";
+case CODEC_ID_PCX:
+ return "pcx";
+case CODEC_ID_SUNRAST:
+ return "sunrast";
+case CODEC_ID_INDEO4:
+ return "indeo4";
+case CODEC_ID_INDEO5:
+ return "indeo5";
+case CODEC_ID_MIMIC:
+ return "mimic";
+case CODEC_ID_RL2:
+ return "rl2";
+case CODEC_ID_ESCAPE124:
+ return "escape124";
+case CODEC_ID_DIRAC:
+ return "dirac";
+case CODEC_ID_BFI:
+ return "bfi";
+case CODEC_ID_CMV:
+ return "cmv";
+case CODEC_ID_MOTIONPIXELS:
+ return "motionpixels";
+case CODEC_ID_TGV:
+ return "tgv";
+case CODEC_ID_TGQ:
+ return "tgq";
+case CODEC_ID_TQI:
+ return "tqi";
+case CODEC_ID_AURA:
+ return "aura";
+case CODEC_ID_AURA2:
+ return "aura2";
+case CODEC_ID_V210X:
+ return "v210x";
+case CODEC_ID_TMV:
+ return "tmv";
+case CODEC_ID_V210:
+ return "v210";
+case CODEC_ID_DPX:
+ return "dpx";
+case CODEC_ID_MAD:
+ return "mad";
+case CODEC_ID_FRWU:
+ return "frwu";
+case CODEC_ID_FLASHSV2:
+ return "flashsv2";
+case CODEC_ID_CDGRAPHICS:
+ return "cdgraphics";
+case CODEC_ID_R210:
+ return "r210";
+case CODEC_ID_ANM:
+ return "anm";
+case CODEC_ID_BINKVIDEO:
+ return "binkvideo";
+case CODEC_ID_IFF_ILBM:
+ return "iff_ilbm";
+case CODEC_ID_IFF_BYTERUN1:
+ return "iff_byterun1";
+case CODEC_ID_KGV1:
+ return "kgv1";
+case CODEC_ID_YOP:
+ return "yop";
+case CODEC_ID_VP8:
+ { extern AVCodec ff_vp8_decoder;
+ return ff_vp8_decoder.name; }
+case CODEC_ID_PICTOR:
+ return "pictor";
+case CODEC_ID_ANSI:
+ return "ansi";
+case CODEC_ID_A64_MULTI:
+ return "a64_multi";
+case CODEC_ID_A64_MULTI5:
+ return "a64_multi5";
+case CODEC_ID_R10K:
+ return "r10k";
+case CODEC_ID_MXPEG:
+ return "mxpeg";
+case CODEC_ID_LAGARITH:
+ return "lagarith";
+case CODEC_ID_PRORES:
+ return "prores";
+case CODEC_ID_JV:
+ return "jv";
+case CODEC_ID_DFA:
+ return "dfa";
+case CODEC_ID_WMV3IMAGE:
+ return "wmv3image";
+case CODEC_ID_VC1IMAGE:
+ return "vc1image";
+case CODEC_ID_UTVIDEO:
+ return "utvideo";
+case CODEC_ID_BMV_VIDEO:
+ return "bmv_video";
+case CODEC_ID_VBLE:
+ return "vble";
+case CODEC_ID_DXTORY:
+ return "dxtory";
+case CODEC_ID_V410:
+ return "v410";
+case CODEC_ID_XWD:
+ return "xwd";
+case CODEC_ID_CDXL:
+ return "cdxl";
+case CODEC_ID_XBM:
+ return "xbm";
+case CODEC_ID_ZEROCODEC:
+ return "zerocodec";
+case CODEC_ID_MSS1:
+ return "mss1";
+case CODEC_ID_MSA1:
+ return "msa1";
+case CODEC_ID_TSCC2:
+ return "tscc2";
+case CODEC_ID_MTS2:
+ return "mts2";
+case CODEC_ID_Y41P:
+ return "y41p";
+case CODEC_ID_ESCAPE130:
+ return "escape130";
+case CODEC_ID_EXR:
+ return "exr";
+case CODEC_ID_AVRP:
+ return "avrp";
+case CODEC_ID_G2M:
+ return "g2m";
+case CODEC_ID_AVUI:
+ return "avui";
+case CODEC_ID_AYUV:
+ return "ayuv";
+case CODEC_ID_V308:
+ return "v308";
+case CODEC_ID_V408:
+ return "v408";
+case CODEC_ID_YUV4:
+ return "yuv4";
+case CODEC_ID_SANM:
+ return "sanm";
+case CODEC_ID_PAF_VIDEO:
+ return "paf_video";
+case CODEC_ID_PCM_S16LE:
+ { extern AVCodec ff_pcm_s16le_decoder;
+ return ff_pcm_s16le_decoder.name; }
+case CODEC_ID_PCM_S16BE:
+ { extern AVCodec ff_pcm_s16be_decoder;
+ return ff_pcm_s16be_decoder.name; }
+case CODEC_ID_PCM_U16LE:
+ return "pcm_u16le";
+case CODEC_ID_PCM_U16BE:
+ return "pcm_u16be";
+case CODEC_ID_PCM_S8:
+ return "pcm_s8";
+case CODEC_ID_PCM_U8:
+ { extern AVCodec ff_pcm_u8_decoder;
+ return ff_pcm_u8_decoder.name; }
+case CODEC_ID_PCM_MULAW:
+ return "pcm_mulaw";
+case CODEC_ID_PCM_ALAW:
+ return "pcm_alaw";
+case CODEC_ID_PCM_S32LE:
+ return "pcm_s32le";
+case CODEC_ID_PCM_S32BE:
+ return "pcm_s32be";
+case CODEC_ID_PCM_U32LE:
+ return "pcm_u32le";
+case CODEC_ID_PCM_U32BE:
+ return "pcm_u32be";
+case CODEC_ID_PCM_S24LE:
+ { extern AVCodec ff_pcm_s24le_decoder;
+ return ff_pcm_s24le_decoder.name; }
+case CODEC_ID_PCM_S24BE:
+ { extern AVCodec ff_pcm_s24be_decoder;
+ return ff_pcm_s24be_decoder.name; }
+case CODEC_ID_PCM_U24LE:
+ return "pcm_u24le";
+case CODEC_ID_PCM_U24BE:
+ return "pcm_u24be";
+case CODEC_ID_PCM_S24DAUD:
+ return "pcm_s24daud";
+case CODEC_ID_PCM_ZORK:
+ return "pcm_zork";
+case CODEC_ID_PCM_S16LE_PLANAR:
+ return "pcm_s16le_planar";
+case CODEC_ID_PCM_DVD:
+ return "pcm_dvd";
+case CODEC_ID_PCM_F32BE:
+ return "pcm_f32be";
+case CODEC_ID_PCM_F32LE:
+ { extern AVCodec ff_pcm_f32le_decoder;
+ return ff_pcm_f32le_decoder.name; }
+case CODEC_ID_PCM_F64BE:
+ return "pcm_f64be";
+case CODEC_ID_PCM_F64LE:
+ return "pcm_f64le";
+case CODEC_ID_PCM_BLURAY:
+ return "pcm_bluray";
+case CODEC_ID_PCM_LXF:
+ return "pcm_lxf";
+case CODEC_ID_S302M:
+ return "s302m";
+case CODEC_ID_PCM_S8_PLANAR:
+ return "pcm_s8_planar";
+case CODEC_ID_ADPCM_IMA_QT:
+ return "adpcm_ima_qt";
+case CODEC_ID_ADPCM_IMA_WAV:
+ return "adpcm_ima_wav";
+case CODEC_ID_ADPCM_IMA_DK3:
+ return "adpcm_ima_dk3";
+case CODEC_ID_ADPCM_IMA_DK4:
+ return "adpcm_ima_dk4";
+case CODEC_ID_ADPCM_IMA_WS:
+ return "adpcm_ima_ws";
+case CODEC_ID_ADPCM_IMA_SMJPEG:
+ return "adpcm_ima_smjpeg";
+case CODEC_ID_ADPCM_MS:
+ return "adpcm_ms";
+case CODEC_ID_ADPCM_4XM:
+ return "adpcm_4xm";
+case CODEC_ID_ADPCM_XA:
+ return "adpcm_xa";
+case CODEC_ID_ADPCM_ADX:
+ return "adpcm_adx";
+case CODEC_ID_ADPCM_EA:
+ return "adpcm_ea";
+case CODEC_ID_ADPCM_G726:
+ return "adpcm_g726";
+case CODEC_ID_ADPCM_CT:
+ return "adpcm_ct";
+case CODEC_ID_ADPCM_SWF:
+ return "adpcm_swf";
+case CODEC_ID_ADPCM_YAMAHA:
+ return "adpcm_yamaha";
+case CODEC_ID_ADPCM_SBPRO_4:
+ return "adpcm_sbpro_4";
+case CODEC_ID_ADPCM_SBPRO_3:
+ return "adpcm_sbpro_3";
+case CODEC_ID_ADPCM_SBPRO_2:
+ return "adpcm_sbpro_2";
+case CODEC_ID_ADPCM_THP:
+ return "adpcm_thp";
+case CODEC_ID_ADPCM_IMA_AMV:
+ return "adpcm_ima_amv";
+case CODEC_ID_ADPCM_EA_R1:
+ return "adpcm_ea_r1";
+case CODEC_ID_ADPCM_EA_R3:
+ return "adpcm_ea_r3";
+case CODEC_ID_ADPCM_EA_R2:
+ return "adpcm_ea_r2";
+case CODEC_ID_ADPCM_IMA_EA_SEAD:
+ return "adpcm_ima_ea_sead";
+case CODEC_ID_ADPCM_IMA_EA_EACS:
+ return "adpcm_ima_ea_eacs";
+case CODEC_ID_ADPCM_EA_XAS:
+ return "adpcm_ea_xas";
+case CODEC_ID_ADPCM_EA_MAXIS_XA:
+ return "adpcm_ea_maxis_xa";
+case CODEC_ID_ADPCM_IMA_ISS:
+ return "adpcm_ima_iss";
+case CODEC_ID_ADPCM_G722:
+ return "adpcm_g722";
+case CODEC_ID_ADPCM_IMA_APC:
+ return "adpcm_ima_apc";
+case CODEC_ID_VIMA:
+ return "vima";
+case CODEC_ID_AMR_NB:
+ return "amr_nb";
+case CODEC_ID_AMR_WB:
+ return "amr_wb";
+case CODEC_ID_RA_144:
+ return "ra_144";
+case CODEC_ID_RA_288:
+ return "ra_288";
+case CODEC_ID_ROQ_DPCM:
+ return "roq_dpcm";
+case CODEC_ID_INTERPLAY_DPCM:
+ return "interplay_dpcm";
+case CODEC_ID_XAN_DPCM:
+ return "xan_dpcm";
+case CODEC_ID_SOL_DPCM:
+ return "sol_dpcm";
+case CODEC_ID_MP2:
+ return "mp2";
+case CODEC_ID_MP3:
+ return "mp3";
+case CODEC_ID_AAC:
+ return "aac";
+case CODEC_ID_AC3:
+ return "ac3";
+case CODEC_ID_DTS:
+ return "dts";
+case CODEC_ID_VORBIS:
+ { extern AVCodec ff_vorbis_decoder;
+ return ff_vorbis_decoder.name; }
+case CODEC_ID_DVAUDIO:
+ return "dvaudio";
+case CODEC_ID_WMAV1:
+ return "wmav1";
+case CODEC_ID_WMAV2:
+ return "wmav2";
+case CODEC_ID_MACE3:
+ return "mace3";
+case CODEC_ID_MACE6:
+ return "mace6";
+case CODEC_ID_VMDAUDIO:
+ return "vmdaudio";
+case CODEC_ID_FLAC:
+ return "flac";
+case CODEC_ID_MP3ADU:
+ return "mp3adu";
+case CODEC_ID_MP3ON4:
+ return "mp3on4";
+case CODEC_ID_SHORTEN:
+ return "shorten";
+case CODEC_ID_ALAC:
+ return "alac";
+case CODEC_ID_WESTWOOD_SND1:
+ return "westwood_snd1";
+case CODEC_ID_GSM:
+ return "gsm";
+case CODEC_ID_QDM2:
+ return "qdm2";
+case CODEC_ID_COOK:
+ return "cook";
+case CODEC_ID_TRUESPEECH:
+ return "truespeech";
+case CODEC_ID_TTA:
+ return "tta";
+case CODEC_ID_SMACKAUDIO:
+ return "smackaudio";
+case CODEC_ID_QCELP:
+ return "qcelp";
+case CODEC_ID_WAVPACK:
+ return "wavpack";
+case CODEC_ID_DSICINAUDIO:
+ return "dsicinaudio";
+case CODEC_ID_IMC:
+ return "imc";
+case CODEC_ID_MUSEPACK7:
+ return "musepack7";
+case CODEC_ID_MLP:
+ return "mlp";
+case CODEC_ID_GSM_MS:
+ return "gsm_ms";
+case CODEC_ID_ATRAC3:
+ return "atrac3";
+case CODEC_ID_VOXWARE:
+ return "voxware";
+case CODEC_ID_APE:
+ return "ape";
+case CODEC_ID_NELLYMOSER:
+ return "nellymoser";
+case CODEC_ID_MUSEPACK8:
+ return "musepack8";
+case CODEC_ID_SPEEX:
+ return "speex";
+case CODEC_ID_WMAVOICE:
+ return "wmavoice";
+case CODEC_ID_WMAPRO:
+ return "wmapro";
+case CODEC_ID_WMALOSSLESS:
+ return "wmalossless";
+case CODEC_ID_ATRAC3P:
+ return "atrac3p";
+case CODEC_ID_EAC3:
+ return "eac3";
+case CODEC_ID_SIPR:
+ return "sipr";
+case CODEC_ID_MP1:
+ return "mp1";
+case CODEC_ID_TWINVQ:
+ return "twinvq";
+case CODEC_ID_TRUEHD:
+ return "truehd";
+case CODEC_ID_MP4ALS:
+ return "mp4als";
+case CODEC_ID_ATRAC1:
+ return "atrac1";
+case CODEC_ID_BINKAUDIO_RDFT:
+ return "binkaudio_rdft";
+case CODEC_ID_BINKAUDIO_DCT:
+ return "binkaudio_dct";
+case CODEC_ID_AAC_LATM:
+ return "aac_latm";
+case CODEC_ID_QDMC:
+ return "qdmc";
+case CODEC_ID_CELT:
+ return "celt";
+case CODEC_ID_G723_1:
+ return "g723_1";
+case CODEC_ID_G729:
+ return "g729";
+case CODEC_ID_8SVX_EXP:
+ return "8svx_exp";
+case CODEC_ID_8SVX_FIB:
+ return "8svx_fib";
+case CODEC_ID_BMV_AUDIO:
+ return "bmv_audio";
+case CODEC_ID_RALF:
+ return "ralf";
+case CODEC_ID_IAC:
+ return "iac";
+case CODEC_ID_ILBC:
+ return "ilbc";
+case CODEC_ID_FFWAVESYNTH:
+ return "ffwavesynth";
+case CODEC_ID_8SVX_RAW:
+ return "8svx_raw";
+case CODEC_ID_SONIC:
+ return "sonic";
+case CODEC_ID_SONIC_LS:
+ return "sonic_ls";
+case CODEC_ID_PAF_AUDIO:
+ return "paf_audio";
+case CODEC_ID_OPUS:
+ return "opus";
+case CODEC_ID_DVD_SUBTITLE:
+ return "dvd_subtitle";
+case CODEC_ID_DVB_SUBTITLE:
+ return "dvb_subtitle";
+case CODEC_ID_TEXT:
+ return "text";
+case CODEC_ID_XSUB:
+ return "xsub";
+case CODEC_ID_SSA:
+ return "ssa";
+case CODEC_ID_MOV_TEXT:
+ return "mov_text";
+case CODEC_ID_HDMV_PGS_SUBTITLE:
+ return "hdmv_pgs_subtitle";
+case CODEC_ID_DVB_TELETEXT:
+ return "dvb_teletext";
+case CODEC_ID_SRT:
+ return "srt";
+case CODEC_ID_MICRODVD:
+ return "microdvd";
+case CODEC_ID_EIA_608:
+ return "eia_608";
+case CODEC_ID_JACOSUB:
+ return "jacosub";
+case CODEC_ID_SAMI:
+ return "sami";
+case CODEC_ID_REALTEXT:
+ return "realtext";
+case CODEC_ID_TTF:
+ return "ttf";
+case CODEC_ID_BINTEXT:
+ return "bintext";
+case CODEC_ID_XBIN:
+ return "xbin";
+case CODEC_ID_IDF:
+ return "idf";
+case CODEC_ID_PROBE:
+ return "probe";
+case CODEC_ID_MPEG2TS:
+ return "mpeg2ts";
+case CODEC_ID_MPEG4SYSTEMS:
+ return "mpeg4systems";
+case CODEC_ID_FFMETADATA:
+ return "ffmetadata";
+

118
www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_asm
View File

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_asm,v 1.3 2012/10/12 16:46:10 robert Exp $
--- third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.asm.orig Tue Sep 25 15:03:20 2012
+++ third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.asm Thu Oct 11 12:48:28 2012
@@ -1,97 +1,1287 @@
-%define ARCH_X86
-%define ARCH_X86_64
-%define HAVE_AVX
@ -121,8 +121,8 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define ARCH_X86_32 0
+%define ARCH_X86_64 1
+%define HAVE_ALTIVEC 0
+%define HAVE_AMD3DNOW 0
+%define HAVE_AMD3DNOWEXT 0
+%define HAVE_AMD3DNOW 1
+%define HAVE_AMD3DNOWEXT 1
+%define HAVE_ARMV5TE 0
+%define HAVE_ARMV6 0
+%define HAVE_ARMV6T2 0
@ -137,11 +137,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define HAVE_SSSE3 0
+%define HAVE_VFPV3 0
+%define HAVE_VIS 0
+%define HAVE_MIPSFPU 0
+%define HAVE_MIPS32R2 0
+%define HAVE_MIPSDSPR1 0
+%define HAVE_MIPSDSPR2 0
+%define HAVE_BIGENDIAN 0
+%define HAVE_FAST_UNALIGNED 1
+%define HAVE_PTHREADS 1
+%define HAVE_W32THREADS 0
+%define HAVE_OS2THREADS 0
+%define HAVE_ALIGNED_MALLOC 0
+%define HAVE_ALIGNED_STACK 1
+%define HAVE_ALSA_ASOUNDLIB_H 0
+%define HAVE_ALTIVEC_H 0
@ -154,6 +159,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define HAVE_CLOCK_GETTIME 1
+%define HAVE_CLOSESOCKET 0
+%define HAVE_CMOV 1
+%define HAVE_CPUID 0
+%define HAVE_DCBZL 0
+%define HAVE_DEV_BKTR_IOCTL_BT848_H 0
+%define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
@ -163,27 +169,34 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define HAVE_DLFCN_H 1
+%define HAVE_DLOPEN 1
+%define HAVE_DOS_PATHS 0
+%define HAVE_DXVA_H 0
+%define HAVE_EBP_AVAILABLE 1
+%define HAVE_EBX_AVAILABLE 1
+%define HAVE_EXP2 1
+%define HAVE_EXP2F 1
+%define HAVE_FAST_64BIT 1
+%define HAVE_FAST_CLZ 1
+%define HAVE_FAST_CMOV 0
+%define HAVE_FAST_CMOV 1
+%define HAVE_FCNTL 1
+%define HAVE_FORK 1
+%define HAVE_GETADDRINFO 1
+%define HAVE_GETADDRINFO 0
+%define HAVE_GETHRTIME 0
+%define HAVE_GETOPT 1
+%define HAVE_GETPROCESSAFFINITYMASK 0
+%define HAVE_GETPROCESSMEMORYINFO 0
+%define HAVE_GETPROCESSTIMES 0
+%define HAVE_GETSYSTEMTIMEASFILETIME 0
+%define HAVE_GETRUSAGE 1
+%define HAVE_GETTIMEOFDAY 1
+%define HAVE_GLOB 1
+%define HAVE_GNU_AS 1
+%define HAVE_IBM_ASM 0
+%define HAVE_INET_ATON 1
+%define HAVE_INLINE_ASM 1
+%define HAVE_ISATTY 1
+%define HAVE_ISINF 1
+%define HAVE_ISNAN 1
+%define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
+%define HAVE_KBHIT 0
+%define HAVE_LDBRX 0
+%define HAVE_LIBDC1394_1 0
@ -206,26 +219,36 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define HAVE_MAPVIEWOFFILE 0
+%define HAVE_MEMALIGN 0
+%define HAVE_MKSTEMP 1
+%define HAVE_MM_EMPTY 1
+%define HAVE_MMAP 1
+%define HAVE_NANOSLEEP 1
+%define HAVE_NETINET_SCTP_H 0
+%define HAVE_PEEKNAMEDPIPE 0
+%define HAVE_POD2MAN 1
+%define HAVE_POLL_H 1
+%define HAVE_POSIX_MEMALIGN 1
+%define HAVE_PTHREAD_CANCEL 1
+%define HAVE_RDTSC 0
+%define HAVE_RINT 1
+%define HAVE_ROUND 1
+%define HAVE_ROUNDF 1
+%define HAVE_RWEFLAGS 0
+%define HAVE_SCHED_GETAFFINITY 0
+%define HAVE_SDL 0
+%define HAVE_SDL_VIDEO_SIZE 0
+%define HAVE_SDL 1
+%define HAVE_SDL_VIDEO_SIZE 1
+%define HAVE_SETMODE 0
+%define HAVE_SETRLIMIT 1
+%define HAVE_SLEEP 0
+%define HAVE_SNDIO_H 1
+%define HAVE_SOCKLEN_T 0
+%define HAVE_SOUNDCARD_H 1
+%define HAVE_STRERROR_R 1
+%define HAVE_STRPTIME 1
+%define HAVE_STRUCT_ADDRINFO 0
+%define HAVE_STRUCT_GROUP_SOURCE_REQ 0
+%define HAVE_STRUCT_IP_MREQ_SOURCE 0
+%define HAVE_STRUCT_IPV6_MREQ 0
+%define HAVE_STRUCT_POLLFD 0
+%define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
+%define HAVE_STRUCT_SOCKADDR_IN6 0
+%define HAVE_STRUCT_SOCKADDR_SA_LEN 0
@ -241,15 +264,21 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define HAVE_SYS_RESOURCE_H 1
+%define HAVE_SYS_SELECT_H 1
+%define HAVE_SYS_SOUNDCARD_H 0
+%define HAVE_SYS_TIME_H 1
+%define HAVE_SYS_VIDEOIO_H 1
+%define HAVE_TERMIOS_H 1
+%define HAVE_TEXI2HTML 0
+%define HAVE_THREADS 1
+%define HAVE_TRUNC 1
+%define HAVE_TRUNCF 1
+%define HAVE_UNISTD_H 1
+%define HAVE_USLEEP 1
+%define HAVE_VFP_ARGS 0
+%define HAVE_VIRTUALALLOC 0
+%define HAVE_WINDOWS_H 0
+%define HAVE_WINSOCK2_H 0
+%define HAVE_XFORM_ASM 0
+%define HAVE_XGETBV 0
+%define HAVE_XMM_CLOBBERS 1
+%define HAVE_YASM 1
+%define CONFIG_BSFS 0
@ -269,7 +298,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_FFMPEG 0
+%define CONFIG_AC3DSP 0
+%define CONFIG_AVCODEC 1
+%define CONFIG_AVDEVICE 1
+%define CONFIG_AVDEVICE 0
+%define CONFIG_AVFILTER 0
+%define CONFIG_AVFORMAT 1
+%define CONFIG_AVRESAMPLE 0
@ -280,10 +309,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_DOC 0
+%define CONFIG_DWT 0
+%define CONFIG_DXVA2 0
+%define CONFIG_FAST_UNALIGNED 1
+%define CONFIG_FASTDIV 1
+%define CONFIG_FFT 1
+%define CONFIG_FONTCONFIG 0
+%define CONFIG_FREI0R 0
+%define CONFIG_GCRYPT 0
+%define CONFIG_GNUTLS 0
+%define CONFIG_GPL 0
+%define CONFIG_GRAY 0
@ -291,12 +322,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_LIBAACPLUS 0
+%define CONFIG_LIBASS 0
+%define CONFIG_LIBBLURAY 0
+%define CONFIG_LIBCACA 0
+%define CONFIG_LIBCDIO 0
+%define CONFIG_LIBCELT 0
+%define CONFIG_LIBDC1394 0
+%define CONFIG_LIBFAAC 0
+%define CONFIG_LIBFDK_AAC 0
+%define CONFIG_LIBFREETYPE 0
+%define CONFIG_LIBGSM 0
+%define CONFIG_LIBIEC61883 0
+%define CONFIG_LIBILBC 0
+%define CONFIG_LIBMODPLUG 0
+%define CONFIG_LIBMP3LAME 0
+%define CONFIG_LIBNUT 0
@ -304,6 +339,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_LIBOPENCORE_AMRWB 0
+%define CONFIG_LIBOPENCV 0
+%define CONFIG_LIBOPENJPEG 0
+%define CONFIG_LIBOPUS 0
+%define CONFIG_LIBPULSE 0
+%define CONFIG_LIBRTMP 0
+%define CONFIG_LIBSCHROEDINGER 0
@ -322,7 +358,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_LSP 0
+%define CONFIG_MDCT 1
+%define CONFIG_MEMALIGN_HACK 0
+%define CONFIG_MEMORY_POISONING 0
+%define CONFIG_MPEGAUDIODSP 0
+%define CONFIG_NETTLE 0
+%define CONFIG_NETWORK 0
+%define CONFIG_NONFREE 0
+%define CONFIG_OPENAL 0
@ -338,7 +376,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_SMALL 0
+%define CONFIG_SRAM 0
+%define CONFIG_STATIC 1
+%define CONFIG_SWRESAMPLE 1
+%define CONFIG_SWRESAMPLE 0
+%define CONFIG_SWSCALE 0
+%define CONFIG_SWSCALE_ALPHA 1
+%define CONFIG_THUMB 0
@ -360,6 +398,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_HUFFMAN 0
+%define CONFIG_LGPLV3 0
+%define CONFIG_LPC 0
+%define CONFIG_VP3DSP 1
+%define CONFIG_AAC_ADTSTOASC_BSF 0
+%define CONFIG_CHOMP_BSF 0
+%define CONFIG_DUMP_EXTRADATA_BSF 0
@ -430,6 +469,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_H261_DECODER 0
+%define CONFIG_H263_DECODER 0
+%define CONFIG_H263I_DECODER 0
+%define CONFIG_H263P_DECODER 0
+%define CONFIG_H264_DECODER 0
+%define CONFIG_H264_CRYSTALHD_DECODER 0
+%define CONFIG_H264_VDPAU_DECODER 0
@ -465,15 +505,19 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_MPEG_VDPAU_DECODER 0
+%define CONFIG_MPEG1_VDPAU_DECODER 0
+%define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+%define CONFIG_MSA1_DECODER 0
+%define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
+%define CONFIG_MSMPEG4V1_DECODER 0
+%define CONFIG_MSMPEG4V2_DECODER 0
+%define CONFIG_MSMPEG4V3_DECODER 0
+%define CONFIG_MSRLE_DECODER 0
+%define CONFIG_MSS1_DECODER 0
+%define CONFIG_MSVIDEO1_DECODER 0
+%define CONFIG_MSZH_DECODER 0
+%define CONFIG_MTS2_DECODER 0
+%define CONFIG_MXPEG_DECODER 0
+%define CONFIG_NUV_DECODER 0
+%define CONFIG_PAF_VIDEO_DECODER 0
+%define CONFIG_PAM_DECODER 0
+%define CONFIG_PBM_DECODER 0
+%define CONFIG_PCX_DECODER 0
@ -499,6 +543,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_RV30_DECODER 0
+%define CONFIG_RV40_DECODER 0
+%define CONFIG_S302M_DECODER 0
+%define CONFIG_SANM_DECODER 0
+%define CONFIG_SGI_DECODER 0
+%define CONFIG_SMACKER_DECODER 0
+%define CONFIG_SMC_DECODER 0
@ -516,6 +561,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_TRUEMOTION1_DECODER 0
+%define CONFIG_TRUEMOTION2_DECODER 0
+%define CONFIG_TSCC_DECODER 0
+%define CONFIG_TSCC2_DECODER 0
+%define CONFIG_TXD_DECODER 0
+%define CONFIG_ULTI_DECODER 0
+%define CONFIG_UTVIDEO_DECODER 0
@ -581,6 +627,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_G729_DECODER 0
+%define CONFIG_GSM_DECODER 0
+%define CONFIG_GSM_MS_DECODER 0
+%define CONFIG_IAC_DECODER 0
+%define CONFIG_IMC_DECODER 0
+%define CONFIG_MACE3_DECODER 0
+%define CONFIG_MACE6_DECODER 0
@ -598,6 +645,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_MPC7_DECODER 0
+%define CONFIG_MPC8_DECODER 0
+%define CONFIG_NELLYMOSER_DECODER 0
+%define CONFIG_PAF_AUDIO_DECODER 0
+%define CONFIG_QCELP_DECODER 0
+%define CONFIG_QDM2_DECODER 0
+%define CONFIG_RA_144_DECODER 0
@ -631,12 +679,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_PCM_MULAW_DECODER 0
+%define CONFIG_PCM_S8_DECODER 0
+%define CONFIG_PCM_S8_PLANAR_DECODER 0
+%define CONFIG_PCM_S16BE_DECODER 0
+%define CONFIG_PCM_S16BE_DECODER 1
+%define CONFIG_PCM_S16LE_DECODER 1
+%define CONFIG_PCM_S16LE_PLANAR_DECODER 0
+%define CONFIG_PCM_S24BE_DECODER 0
+%define CONFIG_PCM_S24BE_DECODER 1
+%define CONFIG_PCM_S24DAUD_DECODER 0
+%define CONFIG_PCM_S24LE_DECODER 0
+%define CONFIG_PCM_S24LE_DECODER 1
+%define CONFIG_PCM_S32BE_DECODER 0
+%define CONFIG_PCM_S32LE_DECODER 0
+%define CONFIG_PCM_U8_DECODER 1
@ -681,20 +729,26 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_ADPCM_THP_DECODER 0
+%define CONFIG_ADPCM_XA_DECODER 0
+%define CONFIG_ADPCM_YAMAHA_DECODER 0
+%define CONFIG_VIMA_DECODER 0
+%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_MOVTEXT_DECODER 0
+%define CONFIG_PGSSUB_DECODER 0
+%define CONFIG_REALTEXT_DECODER 0
+%define CONFIG_SAMI_DECODER 0
+%define CONFIG_SRT_DECODER 0
+%define CONFIG_XSUB_DECODER 0
+%define CONFIG_LIBCELT_DECODER 0
+%define CONFIG_LIBGSM_DECODER 0
+%define CONFIG_LIBGSM_MS_DECODER 0
+%define CONFIG_LIBILBC_DECODER 0
+%define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
+%define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
+%define CONFIG_LIBOPENJPEG_DECODER 0
+%define CONFIG_LIBOPUS_DECODER 0
+%define CONFIG_LIBSCHROEDINGER_DECODER 0
+%define CONFIG_LIBSPEEX_DECODER 0
+%define CONFIG_LIBSTAGEFRIGHT_H264_DECODER 0
@ -763,6 +817,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_IDCIN_DEMUXER 0
+%define CONFIG_IDF_DEMUXER 0
+%define CONFIG_IFF_DEMUXER 0
+%define CONFIG_ILBC_DEMUXER 0
+%define CONFIG_IMAGE2_DEMUXER 0
+%define CONFIG_IMAGE2PIPE_DEMUXER 0
+%define CONFIG_INGENIENT_DEMUXER 0
@ -803,6 +858,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_NUV_DEMUXER 0
+%define CONFIG_OGG_DEMUXER 1
+%define CONFIG_OMA_DEMUXER 0
+%define CONFIG_PAF_DEMUXER 0
+%define CONFIG_PCM_ALAW_DEMUXER 0
+%define CONFIG_PCM_MULAW_DEMUXER 0
+%define CONFIG_PCM_F64BE_DEMUXER 0
@ -828,6 +884,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_QCP_DEMUXER 0
+%define CONFIG_R3D_DEMUXER 0
+%define CONFIG_RAWVIDEO_DEMUXER 0
+%define CONFIG_REALTEXT_DEMUXER 0
+%define CONFIG_RL2_DEMUXER 0
+%define CONFIG_RM_DEMUXER 0
+%define CONFIG_ROQ_DEMUXER 0
@ -835,6 +892,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_RSO_DEMUXER 0
+%define CONFIG_RTP_DEMUXER 0
+%define CONFIG_RTSP_DEMUXER 0
+%define CONFIG_SAMI_DEMUXER 0
+%define CONFIG_SAP_DEMUXER 0
+%define CONFIG_SBG_DEMUXER 0
+%define CONFIG_SDP_DEMUXER 0
@ -843,6 +901,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_SIFF_DEMUXER 0
+%define CONFIG_SMACKER_DEMUXER 0
+%define CONFIG_SMJPEG_DEMUXER 0
+%define CONFIG_SMUSH_DEMUXER 0
+%define CONFIG_SOL_DEMUXER 0
+%define CONFIG_SOX_DEMUXER 0
+%define CONFIG_SPDIF_DEMUXER 0
@ -996,8 +1055,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_SRT_ENCODER 0
+%define CONFIG_XSUB_ENCODER 0
+%define CONFIG_LIBFAAC_ENCODER 0
+%define CONFIG_LIBFDK_AAC_ENCODER 0
+%define CONFIG_LIBGSM_ENCODER 0
+%define CONFIG_LIBGSM_MS_ENCODER 0
+%define CONFIG_LIBILBC_ENCODER 0
+%define CONFIG_LIBMP3LAME_ENCODER 0
+%define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
+%define CONFIG_LIBOPENJPEG_ENCODER 0
@ -1015,16 +1076,23 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_LIBXVID_ENCODER 0
+%define CONFIG_LIBAACPLUS_ENCODER 0
+%define CONFIG_ACONVERT_FILTER 0
+%define CONFIG_AFIFO_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_ASETNSAMPLES_FILTER 0
+%define CONFIG_ASETTB_FILTER 0
+%define CONFIG_ASHOWINFO_FILTER 0
+%define CONFIG_ASPLIT_FILTER 0
+%define CONFIG_ASTREAMSYNC_FILTER 0
+%define CONFIG_ASYNCTS_FILTER 0
+%define CONFIG_ATEMPO_FILTER 0
+%define CONFIG_CHANNELMAP_FILTER 0
+%define CONFIG_CHANNELSPLIT_FILTER 0
+%define CONFIG_EARWAX_FILTER 0
+%define CONFIG_JOIN_FILTER 0
+%define CONFIG_PAN_FILTER 0
+%define CONFIG_SILENCEDETECT_FILTER 0
+%define CONFIG_VOLUME_FILTER 0
@ -1034,6 +1102,8 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_ANULLSRC_FILTER 0
+%define CONFIG_ABUFFERSINK_FILTER 0
+%define CONFIG_ANULLSINK_FILTER 0
+%define CONFIG_ALPHAEXTRACT_FILTER 0
+%define CONFIG_ALPHAMERGE_FILTER 0
+%define CONFIG_ASS_FILTER 0
+%define CONFIG_BBOX_FILTER 0
+%define CONFIG_BLACKDETECT_FILTER 0
@ -1069,6 +1139,7 @@ $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
@ -1099,6 +1170,8 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_TESTSRC_FILTER 0
+%define CONFIG_BUFFERSINK_FILTER 0
+%define CONFIG_NULLSINK_FILTER 0
+%define CONFIG_CONCAT_FILTER 0
+%define CONFIG_SHOWWAVES_FILTER 0
+%define CONFIG_H263_VAAPI_HWACCEL 0
+%define CONFIG_H264_DXVA2_HWACCEL 0
+%define CONFIG_H264_VAAPI_HWACCEL 0
@ -1117,6 +1190,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_DSHOW_INDEV 0
+%define CONFIG_DV1394_INDEV 0
+%define CONFIG_FBDEV_INDEV 0
+%define CONFIG_IEC61883_INDEV 0
+%define CONFIG_JACK_INDEV 0
+%define CONFIG_LAVFI_INDEV 0
+%define CONFIG_OPENAL_INDEV 0
@ -1164,6 +1238,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_H261_MUXER 0
+%define CONFIG_H263_MUXER 0
+%define CONFIG_H264_MUXER 0
+%define CONFIG_ILBC_MUXER 0
+%define CONFIG_IMAGE2_MUXER 0
+%define CONFIG_IMAGE2PIPE_MUXER 0
+%define CONFIG_IPOD_MUXER 0
@ -1227,6 +1302,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_RTSP_MUXER 0
+%define CONFIG_SAP_MUXER 0
+%define CONFIG_SEGMENT_MUXER 0
+%define CONFIG_STREAM_SEGMENT_MUXER 0
+%define CONFIG_SMJPEG_MUXER 0
+%define CONFIG_SOX_MUXER 0
+%define CONFIG_SPDIF_MUXER 0
@ -1244,6 +1320,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_YUV4MPEGPIPE_MUXER 0
+%define CONFIG_LIBNUT_MUXER 0
+%define CONFIG_ALSA_OUTDEV 0
+%define CONFIG_CACA_OUTDEV 0
+%define CONFIG_OSS_OUTDEV 0
+%define CONFIG_SDL_OUTDEV 0
+%define CONFIG_SNDIO_OUTDEV 0
@ -1273,14 +1350,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_RV30_PARSER 0
+%define CONFIG_RV40_PARSER 0
+%define CONFIG_VC1_PARSER 0
+%define CONFIG_VORBIS_PARSER 0
+%define CONFIG_VP3_PARSER 0
+%define CONFIG_VORBIS_PARSER 1
+%define CONFIG_VP3_PARSER 1
+%define CONFIG_VP8_PARSER 1
+%define CONFIG_APPLEHTTP_PROTOCOL 0
+%define CONFIG_BLURAY_PROTOCOL 0
+%define CONFIG_CACHE_PROTOCOL 0
+%define CONFIG_CONCAT_PROTOCOL 0
+%define CONFIG_CRYPTO_PROTOCOL 0
+%define CONFIG_FFRTMPCRYPT_PROTOCOL 0
+%define CONFIG_FFRTMPHTTP_PROTOCOL 0
+%define CONFIG_FILE_PROTOCOL 0
+%define CONFIG_GOPHER_PROTOCOL 0
+%define CONFIG_HLS_PROTOCOL 0
@ -1292,6 +1371,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_a
+%define CONFIG_MD5_PROTOCOL 0
+%define CONFIG_PIPE_PROTOCOL 0
+%define CONFIG_RTMP_PROTOCOL 0
+%define CONFIG_RTMPE_PROTOCOL 0
+%define CONFIG_RTMPS_PROTOCOL 0
+%define CONFIG_RTMPT_PROTOCOL 0
+%define CONFIG_RTMPTE_PROTOCOL 0
+%define CONFIG_RTMPTS_PROTOCOL 0
+%define CONFIG_RTP_PROTOCOL 0
+%define CONFIG_SCTP_PROTOCOL 0
+%define CONFIG_TCP_PROTOCOL 0

283
www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
View File

@ -1,19 +1,32 @@
$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 @@
$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h,v 1.3 2012/10/12 16:46:10 robert Exp $
--- third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.h.orig Tue Sep 25 15:03:20 2012
+++ third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/config.h Thu Oct 11 12:48:23 2012
@@ -1,12 +1,12 @@
/* Automatically generated by configure - do not modify! */
#ifndef FFMPEG_CONFIG_H
#define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-everything --enable-fft --enable-rdft --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_f32le' --enable-demuxer='ogg,matroska,wav' --enable-parser=vp8"
+#define FFMPEG_CONFIGURATION "--disable-everything --enable-fft --enable-rdft --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --optflags=-O2 --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_f32le' --enable-demuxer='ogg,matroska,wav' --enable-parser=vp8 --enable-pic"
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-avdevice --disable-avfilter --disable-bzlib --disable-doc --disable-network --disable-postproc --disable-swresample --disable-swscale --disable-zlib --enable-fft --enable-rdft --enable-shared --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --optflags=-O2 --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be' --enable-demuxer='ogg,matroska,wav' --enable-parser='vp3,vorbis,vp8' --enable-pic"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-#define CC_TYPE "gcc"
-#define CC_VERSION __VERSION__
-#define restrict restrict
+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
#define CC_TYPE "gcc"
#define CC_VERSION __VERSION__
#define restrict restrict
@@ -38,8 +39,7 @@
+#define CC_IDENT "gcc 4.2.1 (GCC) 20070719"
+#define av_restrict restrict
#define EXTERN_PREFIX ""
#define EXTERN_ASM
#define SLIBSUF ".so"
@@ -32,14 +32,13 @@
#define ARCH_X86_32 0
#define ARCH_X86_64 1
#define HAVE_ALTIVEC 0
-#define HAVE_AMD3DNOW 0
-#define HAVE_AMD3DNOWEXT 0
+#define HAVE_AMD3DNOW 1
+#define HAVE_AMD3DNOWEXT 1
#define HAVE_ARMV5TE 0
#define HAVE_ARMV6 0
#define HAVE_ARMV6T2 0
#define HAVE_ARMVFP 0
@ -23,11 +36,20 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define HAVE_MMI 0
#define HAVE_MMX 1
#define HAVE_MMX2 1
@@ -53,21 +53,25 @@
@@ -49,50 +48,70 @@
#define HAVE_SSSE3 0
#define HAVE_VFPV3 0
#define HAVE_VIS 0
+#define HAVE_MIPSFPU 0
+#define HAVE_MIPS32R2 0
+#define HAVE_MIPSDSPR1 0
+#define HAVE_MIPSDSPR2 0
#define HAVE_BIGENDIAN 0
#define HAVE_FAST_UNALIGNED 1
#define HAVE_PTHREADS 1
#define HAVE_W32THREADS 0
+#define HAVE_OS2THREADS 0
+#define HAVE_ALIGNED_MALLOC 0
#define HAVE_ALIGNED_STACK 1
#define HAVE_ALSA_ASOUNDLIB_H 0
#define HAVE_ALTIVEC_H 0
@ -42,6 +64,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define HAVE_CLOSESOCKET 0
-#define HAVE_CMOV 0
+#define HAVE_CMOV 1
+#define HAVE_CPUID 0
#define HAVE_DCBZL 0
#define HAVE_DEV_BKTR_IOCTL_BT848_H 0
#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
@ -53,14 +76,27 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define HAVE_DLFCN_H 1
#define HAVE_DLOPEN 1
#define HAVE_DOS_PATHS 0
@@ -82,17 +86,20 @@
+#define HAVE_DXVA_H 0
#define HAVE_EBP_AVAILABLE 1
#define HAVE_EBX_AVAILABLE 1
#define HAVE_EXP2 1
#define HAVE_EXP2F 1
#define HAVE_FAST_64BIT 1
#define HAVE_FAST_CLZ 1
-#define HAVE_FAST_CMOV 0
+#define HAVE_FAST_CMOV 1
#define HAVE_FCNTL 1
#define HAVE_FORK 1
#define HAVE_GETADDRINFO 1
-#define HAVE_GETADDRINFO 1
+#define HAVE_GETADDRINFO 0
#define HAVE_GETHRTIME 0
+#define HAVE_GETOPT 1
+#define HAVE_GETPROCESSAFFINITYMASK 0
#define HAVE_GETPROCESSMEMORYINFO 0
#define HAVE_GETPROCESSTIMES 0
+#define HAVE_GETSYSTEMTIMEASFILETIME 0
#define HAVE_GETRUSAGE 1
+#define HAVE_GETTIMEOFDAY 1
+#define HAVE_GLOB 1
#define HAVE_GNU_AS 1
-#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
@ -68,6 +104,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define HAVE_INET_ATON 1
#define HAVE_INLINE_ASM 1
#define HAVE_ISATTY 1
+#define HAVE_ISINF 1
+#define HAVE_ISNAN 1
+#define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
#define HAVE_KBHIT 0
#define HAVE_LDBRX 0
+#define HAVE_LIBDC1394_1 0
@ -75,7 +114,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,47 @@
@@ -106,45 +125,71 @@
#define HAVE_LZO1X_999_COMPRESS 0
#define HAVE_MACHINE_IOCTL_BT848_H 0
#define HAVE_MACHINE_IOCTL_METEOR_H 0
@ -85,25 +124,30 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
-#define HAVE_MEMALIGN 1
+#define HAVE_MEMALIGN 0
#define HAVE_MKSTEMP 1
+#define HAVE_MM_EMPTY 1
#define HAVE_MMAP 1
+#define HAVE_NANOSLEEP 1
+#define HAVE_NETINET_SCTP_H 0
+#define HAVE_PEEKNAMEDPIPE 0
+#define HAVE_POD2MAN 1
+#define HAVE_POLL_H 1
#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_PTHREAD_CANCEL 1
+#define HAVE_RDTSC 0
+#define HAVE_RINT 1
#define HAVE_ROUND 1
#define HAVE_ROUNDF 1
-#define HAVE_SDL 1
-#define HAVE_SDL_VIDEO_SIZE 1
+#define HAVE_RWEFLAGS 0
+#define HAVE_SCHED_GETAFFINITY 0
+#define HAVE_SDL 0
+#define HAVE_SDL_VIDEO_SIZE 0
#define HAVE_SDL 1
#define HAVE_SDL_VIDEO_SIZE 1
#define HAVE_SETMODE 0
-#define HAVE_SNDIO_H 0
-#define HAVE_SOCKLEN_T 0
-#define HAVE_SOUNDCARD_H 0
-#define HAVE_POLL_H 1
#define HAVE_SETRLIMIT 1
+#define HAVE_SLEEP 0
+#define HAVE_SNDIO_H 1
+#define HAVE_SOCKLEN_T 0
+#define HAVE_SOUNDCARD_H 1
@ -111,7 +155,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
-#define HAVE_STRTOK_R 1
+#define HAVE_STRPTIME 1
#define HAVE_STRUCT_ADDRINFO 0
+#define HAVE_STRUCT_GROUP_SOURCE_REQ 0
+#define HAVE_STRUCT_IP_MREQ_SOURCE 0
#define HAVE_STRUCT_IPV6_MREQ 0
+#define HAVE_STRUCT_POLLFD 0
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
#define HAVE_STRUCT_SOCKADDR_IN6 0
#define HAVE_STRUCT_SOCKADDR_SA_LEN 0
@ -131,11 +178,25 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
-#define HAVE_SYS_SOUNDCARD_H 1
-#define HAVE_SYS_VIDEOIO_H 0
+#define HAVE_SYS_SOUNDCARD_H 0
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_VIDEOIO_H 1
#define HAVE_TERMIOS_H 1
+#define HAVE_TEXI2HTML 0
#define HAVE_THREADS 1
#define HAVE_TRUNC 1
@@ -157,13 +174,17 @@
#define HAVE_TRUNCF 1
+#define HAVE_UNISTD_H 1
+#define HAVE_USLEEP 1
#define HAVE_VFP_ARGS 0
#define HAVE_VIRTUALALLOC 0
+#define HAVE_WINDOWS_H 0
#define HAVE_WINSOCK2_H 0
#define HAVE_XFORM_ASM 0
+#define HAVE_XGETBV 0
#define HAVE_XMM_CLOBBERS 1
#define HAVE_YASM 1
#define CONFIG_BSFS 0
@@ -157,13 +202,17 @@
#define CONFIG_MUXERS 0
#define CONFIG_OUTDEVS 0
#define CONFIG_PARSERS 1
@ -148,17 +209,20 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_FFMPEG 0
#define CONFIG_AC3DSP 0
#define CONFIG_AVCODEC 1
#define CONFIG_AVDEVICE 1
-#define CONFIG_AVDEVICE 1
-#define CONFIG_AVFILTER 1
+#define CONFIG_AVDEVICE 0
+#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 @@
@@ -171,36 +220,45 @@
#define CONFIG_DOC 0
#define CONFIG_DWT 0
#define CONFIG_DXVA2 0
+#define CONFIG_FAST_UNALIGNED 1
#define CONFIG_FASTDIV 1
-#define CONFIG_FFMPEG 0
-#define CONFIG_FFPLAY 0
@ -168,6 +232,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_FONTCONFIG 0
#define CONFIG_FREI0R 0
-#define CONFIG_GOLOMB 1
+#define CONFIG_GCRYPT 0
+#define CONFIG_GNUTLS 0
#define CONFIG_GPL 0
#define CONFIG_GRAY 0
@ -178,13 +243,17 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_LIBAACPLUS 0
+#define CONFIG_LIBASS 0
+#define CONFIG_LIBBLURAY 0
+#define CONFIG_LIBCACA 0
+#define CONFIG_LIBCDIO 0
#define CONFIG_LIBCELT 0
#define CONFIG_LIBDC1394 0
-#define CONFIG_LIBDIRAC 0
#define CONFIG_LIBFAAC 0
+#define CONFIG_LIBFDK_AAC 0
#define CONFIG_LIBFREETYPE 0
#define CONFIG_LIBGSM 0
+#define CONFIG_LIBIEC61883 0
+#define CONFIG_LIBILBC 0
+#define CONFIG_LIBMODPLUG 0
#define CONFIG_LIBMP3LAME 0
#define CONFIG_LIBNUT 0
@ -192,6 +261,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define CONFIG_LIBOPENCORE_AMRWB 0
#define CONFIG_LIBOPENCV 0
#define CONFIG_LIBOPENJPEG 0
+#define CONFIG_LIBOPUS 0
+#define CONFIG_LIBPULSE 0
#define CONFIG_LIBRTMP 0
#define CONFIG_LIBSCHROEDINGER 0
@ -203,7 +273,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 +231,60 @@
@@ -208,36 +266,63 @@
#define CONFIG_LIBX264 0
#define CONFIG_LIBXAVS 0
#define CONFIG_LIBXVID 0
@ -212,7 +282,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define CONFIG_MDCT 1
#define CONFIG_MEMALIGN_HACK 0
-#define CONFIG_MLIB 0
+#define CONFIG_MEMORY_POISONING 0
#define CONFIG_MPEGAUDIODSP 0
+#define CONFIG_NETTLE 0
#define CONFIG_NETWORK 0
#define CONFIG_NONFREE 0
#define CONFIG_OPENAL 0
@ -228,7 +300,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define CONFIG_SMALL 0
#define CONFIG_SRAM 0
#define CONFIG_STATIC 1
+#define CONFIG_SWRESAMPLE 1
+#define CONFIG_SWRESAMPLE 0
#define CONFIG_SWSCALE 0
#define CONFIG_SWSCALE_ALPHA 1
#define CONFIG_THUMB 0
@ -250,6 +322,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_HUFFMAN 0
#define CONFIG_LGPLV3 0
+#define CONFIG_LPC 0
+#define CONFIG_VP3DSP 1
+#define CONFIG_AAC_ADTSTOASC_BSF 0
+#define CONFIG_CHOMP_BSF 0
+#define CONFIG_DUMP_EXTRADATA_BSF 0
@ -266,7 +339,7 @@ $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 +293,31 @@
@@ -246,24 +331,31 @@
#define CONFIG_ASV2_DECODER 0
#define CONFIG_AURA_DECODER 0
#define CONFIG_AURA2_DECODER 0
@ -298,7 +371,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 +326,13 @@
@@ -272,11 +364,13 @@
#define CONFIG_EIGHTBPS_DECODER 0
#define CONFIG_EIGHTSVX_EXP_DECODER 0
#define CONFIG_EIGHTSVX_FIB_DECODER 0
@ -313,7 +386,15 @@ $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 +351,7 @@
@@ -286,6 +380,7 @@
#define CONFIG_H261_DECODER 0
#define CONFIG_H263_DECODER 0
#define CONFIG_H263I_DECODER 0
+#define CONFIG_H263P_DECODER 0
#define CONFIG_H264_DECODER 0
#define CONFIG_H264_CRYSTALHD_DECODER 0
#define CONFIG_H264_VDPAU_DECODER 0
@@ -295,6 +390,7 @@
#define CONFIG_IFF_ILBM_DECODER 0
#define CONFIG_INDEO2_DECODER 0
#define CONFIG_INDEO3_DECODER 0
@ -321,7 +402,27 @@ $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 +394,8 @@
@@ -320,15 +416,19 @@
#define CONFIG_MPEG_VDPAU_DECODER 0
#define CONFIG_MPEG1_VDPAU_DECODER 0
#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+#define CONFIG_MSA1_DECODER 0
#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
#define CONFIG_MSMPEG4V1_DECODER 0
#define CONFIG_MSMPEG4V2_DECODER 0
#define CONFIG_MSMPEG4V3_DECODER 0
#define CONFIG_MSRLE_DECODER 0
+#define CONFIG_MSS1_DECODER 0
#define CONFIG_MSVIDEO1_DECODER 0
#define CONFIG_MSZH_DECODER 0
+#define CONFIG_MTS2_DECODER 0
#define CONFIG_MXPEG_DECODER 0
#define CONFIG_NUV_DECODER 0
+#define CONFIG_PAF_VIDEO_DECODER 0
#define CONFIG_PAM_DECODER 0
#define CONFIG_PBM_DECODER 0
#define CONFIG_PCX_DECODER 0
@@ -337,6 +437,8 @@
#define CONFIG_PICTOR_DECODER 0
#define CONFIG_PNG_DECODER 0
#define CONFIG_PPM_DECODER 0
@ -330,8 +431,19 @@ $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 +430,18 @@
@@ -352,6 +454,7 @@
#define CONFIG_RV30_DECODER 0
#define CONFIG_RV40_DECODER 0
#define CONFIG_S302M_DECODER 0
+#define CONFIG_SANM_DECODER 0
#define CONFIG_SGI_DECODER 0
#define CONFIG_SMACKER_DECODER 0
#define CONFIG_SMC_DECODER 0
@@ -369,14 +472,21 @@
#define CONFIG_TRUEMOTION1_DECODER 0
#define CONFIG_TRUEMOTION2_DECODER 0
#define CONFIG_TSCC_DECODER 0
+#define CONFIG_TSCC2_DECODER 0
#define CONFIG_TXD_DECODER 0
#define CONFIG_ULTI_DECODER 0
+#define CONFIG_UTVIDEO_DECODER 0
@ -349,7 +461,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 +457,17 @@
@@ -392,11 +502,17 @@
#define CONFIG_WMV3_DECODER 0
#define CONFIG_WMV3_CRYSTALHD_DECODER 0
#define CONFIG_WMV3_VDPAU_DECODER 0
@ -367,7 +479,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 +482,15 @@
@@ -411,13 +527,18 @@
#define CONFIG_ATRAC3_DECODER 0
#define CONFIG_BINKAUDIO_DCT_DECODER 0
#define CONFIG_BINKAUDIO_RDFT_DECODER 0
@ -382,8 +494,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_G729_DECODER 0
#define CONFIG_GSM_DECODER 0
#define CONFIG_GSM_MS_DECODER 0
+#define CONFIG_IAC_DECODER 0
#define CONFIG_IMC_DECODER 0
@@ -439,6 +514,7 @@
#define CONFIG_MACE3_DECODER 0
#define CONFIG_MACE6_DECODER 0
@@ -435,10 +556,12 @@
#define CONFIG_MPC7_DECODER 0
#define CONFIG_MPC8_DECODER 0
#define CONFIG_NELLYMOSER_DECODER 0
+#define CONFIG_PAF_AUDIO_DECODER 0
#define CONFIG_QCELP_DECODER 0
#define CONFIG_QDM2_DECODER 0
#define CONFIG_RA_144_DECODER 0
#define CONFIG_RA_288_DECODER 0
@ -391,7 +511,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 +526,7 @@
@@ -450,6 +573,7 @@
#define CONFIG_VMDAUDIO_DECODER 0
#define CONFIG_VORBIS_DECODER 1
#define CONFIG_WAVPACK_DECODER 0
@ -399,15 +519,24 @@ $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 +542,7 @@
@@ -465,12 +589,13 @@
#define CONFIG_PCM_LXF_DECODER 0
#define CONFIG_PCM_MULAW_DECODER 0
#define CONFIG_PCM_S8_DECODER 0
-#define CONFIG_PCM_S16BE_DECODER 0
+#define CONFIG_PCM_S8_PLANAR_DECODER 0
#define CONFIG_PCM_S16BE_DECODER 0
+#define CONFIG_PCM_S16BE_DECODER 1
#define CONFIG_PCM_S16LE_DECODER 1
#define CONFIG_PCM_S16LE_PLANAR_DECODER 0
@@ -497,6 +575,7 @@
-#define CONFIG_PCM_S24BE_DECODER 0
+#define CONFIG_PCM_S24BE_DECODER 1
#define CONFIG_PCM_S24DAUD_DECODER 0
-#define CONFIG_PCM_S24LE_DECODER 0
+#define CONFIG_PCM_S24LE_DECODER 1
#define CONFIG_PCM_S32BE_DECODER 0
#define CONFIG_PCM_S32LE_DECODER 0
#define CONFIG_PCM_U8_DECODER 1
@@ -497,6 +622,7 @@
#define CONFIG_ADPCM_G722_DECODER 0
#define CONFIG_ADPCM_G726_DECODER 0
#define CONFIG_ADPCM_IMA_AMV_DECODER 0
@ -415,22 +544,31 @@ $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
@@ -517,11 +596,12 @@
@@ -514,194 +640,46 @@
#define CONFIG_ADPCM_THP_DECODER 0
#define CONFIG_ADPCM_XA_DECODER 0
#define CONFIG_ADPCM_YAMAHA_DECODER 0
+#define CONFIG_VIMA_DECODER 0
#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_MOVTEXT_DECODER 0
#define CONFIG_PGSSUB_DECODER 0
+#define CONFIG_REALTEXT_DECODER 0
+#define CONFIG_SAMI_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_LIBILBC_DECODER 0
#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
@@ -529,179 +609,24 @@
#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
#define CONFIG_LIBOPENJPEG_DECODER 0
+#define CONFIG_LIBOPUS_DECODER 0
#define CONFIG_LIBSCHROEDINGER_DECODER 0
#define CONFIG_LIBSPEEX_DECODER 0
+#define CONFIG_LIBSTAGEFRIGHT_H264_DECODER 0
@ -618,7 +756,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 +635,15 @@
@@ -710,11 +688,15 @@
#define CONFIG_AVS_DEMUXER 0
#define CONFIG_BETHSOFTVID_DEMUXER 0
#define CONFIG_BFI_DEMUXER 0
@ -634,7 +772,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 +663,17 @@
@@ -734,13 +716,19 @@
#define CONFIG_FLV_DEMUXER 0
#define CONFIG_FOURXM_DEMUXER 0
#define CONFIG_G722_DEMUXER 0
@ -650,9 +788,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define CONFIG_IDCIN_DEMUXER 0
+#define CONFIG_IDF_DEMUXER 0
#define CONFIG_IFF_DEMUXER 0
+#define CONFIG_ILBC_DEMUXER 0
#define CONFIG_IMAGE2_DEMUXER 0
#define CONFIG_IMAGE2PIPE_DEMUXER 0
@@ -748,11 +682,15 @@
#define CONFIG_INGENIENT_DEMUXER 0
@@ -748,11 +736,15 @@
#define CONFIG_ISS_DEMUXER 0
#define CONFIG_IV8_DEMUXER 0
#define CONFIG_IVF_DEMUXER 0
@ -668,9 +808,27 @@ $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 +748,13 @@
@@ -777,6 +769,7 @@
#define CONFIG_NUV_DEMUXER 0
#define CONFIG_OGG_DEMUXER 1
#define CONFIG_OMA_DEMUXER 0
+#define CONFIG_PAF_DEMUXER 0
#define CONFIG_PCM_ALAW_DEMUXER 0
#define CONFIG_PCM_MULAW_DEMUXER 0
#define CONFIG_PCM_F64BE_DEMUXER 0
@@ -802,6 +795,7 @@
#define CONFIG_QCP_DEMUXER 0
#define CONFIG_R3D_DEMUXER 0
#define CONFIG_RAWVIDEO_DEMUXER 0
+#define CONFIG_REALTEXT_DEMUXER 0
#define CONFIG_RL2_DEMUXER 0
#define CONFIG_RM_DEMUXER 0
#define CONFIG_ROQ_DEMUXER 0
@@ -809,12 +803,16 @@
#define CONFIG_RSO_DEMUXER 0
#define CONFIG_RTP_DEMUXER 0
#define CONFIG_RTSP_DEMUXER 0
+#define CONFIG_SAMI_DEMUXER 0
#define CONFIG_SAP_DEMUXER 0
+#define CONFIG_SBG_DEMUXER 0
#define CONFIG_SDP_DEMUXER 0
@ -679,10 +837,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define CONFIG_SIFF_DEMUXER 0
#define CONFIG_SMACKER_DEMUXER 0
+#define CONFIG_SMJPEG_DEMUXER 0
+#define CONFIG_SMUSH_DEMUXER 0
#define CONFIG_SOL_DEMUXER 0
#define CONFIG_SOX_DEMUXER 0
#define CONFIG_SPDIF_DEMUXER 0
@@ -836,19 +776,274 @@
@@ -836,19 +834,289 @@
#define CONFIG_W64_DEMUXER 0
#define CONFIG_WAV_DEMUXER 1
#define CONFIG_WC3_DEMUXER 0
@ -819,8 +978,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_SRT_ENCODER 0
+#define CONFIG_XSUB_ENCODER 0
+#define CONFIG_LIBFAAC_ENCODER 0
+#define CONFIG_LIBFDK_AAC_ENCODER 0
+#define CONFIG_LIBGSM_ENCODER 0
+#define CONFIG_LIBGSM_MS_ENCODER 0
+#define CONFIG_LIBILBC_ENCODER 0
+#define CONFIG_LIBMP3LAME_ENCODER 0
+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
+#define CONFIG_LIBOPENJPEG_ENCODER 0
@ -838,16 +999,23 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_LIBXVID_ENCODER 0
+#define CONFIG_LIBAACPLUS_ENCODER 0
+#define CONFIG_ACONVERT_FILTER 0
+#define CONFIG_AFIFO_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_ASETNSAMPLES_FILTER 0
+#define CONFIG_ASETTB_FILTER 0
+#define CONFIG_ASHOWINFO_FILTER 0
+#define CONFIG_ASPLIT_FILTER 0
+#define CONFIG_ASTREAMSYNC_FILTER 0
+#define CONFIG_ASYNCTS_FILTER 0
+#define CONFIG_ATEMPO_FILTER 0
+#define CONFIG_CHANNELMAP_FILTER 0
+#define CONFIG_CHANNELSPLIT_FILTER 0
+#define CONFIG_EARWAX_FILTER 0
+#define CONFIG_JOIN_FILTER 0
+#define CONFIG_PAN_FILTER 0
+#define CONFIG_SILENCEDETECT_FILTER 0
+#define CONFIG_VOLUME_FILTER 0
@ -857,6 +1025,8 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_ANULLSRC_FILTER 0
+#define CONFIG_ABUFFERSINK_FILTER 0
+#define CONFIG_ANULLSINK_FILTER 0
+#define CONFIG_ALPHAEXTRACT_FILTER 0
+#define CONFIG_ALPHAMERGE_FILTER 0
+#define CONFIG_ASS_FILTER 0
+#define CONFIG_BBOX_FILTER 0
+#define CONFIG_BLACKDETECT_FILTER 0
@ -892,6 +1062,7 @@ $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
@ -922,6 +1093,8 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_TESTSRC_FILTER 0
+#define CONFIG_BUFFERSINK_FILTER 0
+#define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_CONCAT_FILTER 0
+#define CONFIG_SHOWWAVES_FILTER 0
+#define CONFIG_H263_VAAPI_HWACCEL 0
+#define CONFIG_H264_DXVA2_HWACCEL 0
+#define CONFIG_H264_VAAPI_HWACCEL 0
@ -940,6 +1113,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_DSHOW_INDEV 0
+#define CONFIG_DV1394_INDEV 0
+#define CONFIG_FBDEV_INDEV 0
+#define CONFIG_IEC61883_INDEV 0
+#define CONFIG_JACK_INDEV 0
+#define CONFIG_LAVFI_INDEV 0
+#define CONFIG_OPENAL_INDEV 0
@ -958,7 +1132,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 +1052,7 @@
@@ -857,6 +1125,7 @@
#define CONFIG_AU_MUXER 0
#define CONFIG_AVI_MUXER 0
#define CONFIG_AVM2_MUXER 0
@ -966,7 +1140,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 +1070,7 @@
@@ -874,15 +1143,20 @@
#define CONFIG_FRAMECRC_MUXER 0
#define CONFIG_FRAMEMD5_MUXER 0
#define CONFIG_G722_MUXER 0
@ -974,7 +1148,9 @@ $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 +1079,10 @@
#define CONFIG_H263_MUXER 0
#define CONFIG_H264_MUXER 0
+#define CONFIG_ILBC_MUXER 0
#define CONFIG_IMAGE2_MUXER 0
#define CONFIG_IMAGE2PIPE_MUXER 0
#define CONFIG_IPOD_MUXER 0
@ -985,7 +1161,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define CONFIG_M4V_MUXER 0
#define CONFIG_MD5_MUXER 0
#define CONFIG_MATROSKA_MUXER 0
@@ -909,6 +1109,7 @@
@@ -909,6 +1183,7 @@
#define CONFIG_NULL_MUXER 0
#define CONFIG_NUT_MUXER 0
#define CONFIG_OGG_MUXER 0
@ -993,11 +1169,12 @@ $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 +1138,80 @@
@@ -937,103 +1212,89 @@
#define CONFIG_RTP_MUXER 0
#define CONFIG_RTSP_MUXER 0
#define CONFIG_SAP_MUXER 0
+#define CONFIG_SEGMENT_MUXER 0
+#define CONFIG_STREAM_SEGMENT_MUXER 0
+#define CONFIG_SMJPEG_MUXER 0
#define CONFIG_SOX_MUXER 0
#define CONFIG_SPDIF_MUXER 0
@ -1065,6 +1242,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
-#define CONFIG_BUFFERSINK_FILTER 0
-#define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_ALSA_OUTDEV 0
+#define CONFIG_CACA_OUTDEV 0
+#define CONFIG_OSS_OUTDEV 0
+#define CONFIG_SDL_OUTDEV 0
+#define CONFIG_SNDIO_OUTDEV 0
@ -1094,14 +1272,16 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
+#define CONFIG_RV30_PARSER 0
+#define CONFIG_RV40_PARSER 0
+#define CONFIG_VC1_PARSER 0
+#define CONFIG_VORBIS_PARSER 0
+#define CONFIG_VP3_PARSER 0
+#define CONFIG_VORBIS_PARSER 1
+#define CONFIG_VP3_PARSER 1
+#define CONFIG_VP8_PARSER 1
#define CONFIG_APPLEHTTP_PROTOCOL 0
+#define CONFIG_BLURAY_PROTOCOL 0
+#define CONFIG_CACHE_PROTOCOL 0
#define CONFIG_CONCAT_PROTOCOL 0
#define CONFIG_CRYPTO_PROTOCOL 0
+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
#define CONFIG_FILE_PROTOCOL 0
#define CONFIG_GOPHER_PROTOCOL 0
+#define CONFIG_HLS_PROTOCOL 0
@ -1114,9 +1294,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_config_h
#define CONFIG_PIPE_PROTOCOL 0
#define CONFIG_RTMP_PROTOCOL 0
-#define CONFIG_RTMPT_PROTOCOL 0
-#define CONFIG_RTMPE_PROTOCOL 0
#define CONFIG_RTMPE_PROTOCOL 0
-#define CONFIG_RTMPTE_PROTOCOL 0
-#define CONFIG_RTMPS_PROTOCOL 0
#define CONFIG_RTMPS_PROTOCOL 0
+#define CONFIG_RTMPT_PROTOCOL 0
+#define CONFIG_RTMPTE_PROTOCOL 0
+#define CONFIG_RTMPTS_PROTOCOL 0
#define CONFIG_RTP_PROTOCOL 0
+#define CONFIG_SCTP_PROTOCOL 0
#define CONFIG_TCP_PROTOCOL 0

687
www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_libavcodec_codec_names_h Normal file
View File

@ -0,0 +1,687 @@
$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chromium_openbsd_x64_libavcodec_codec_names_h,v 1.1 2012/10/12 16:46:10 robert Exp $
--- third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/libavcodec/codec_names.h.orig Fri Oct 12 20:35:18 2012
+++ third_party/ffmpeg/chromium/config/Chromium/openbsd/x64/libavcodec/codec_names.h Fri Oct 12 20:35:21 2012
@@ -0,0 +1,683 @@
+case CODEC_ID_NONE:
+ return "none";
+case CODEC_ID_MPEG1VIDEO:
+ return "mpeg1video";
+case CODEC_ID_MPEG2VIDEO:
+ return "mpeg2video";
+case CODEC_ID_MPEG2VIDEO_XVMC:
+ return "mpeg2video_xvmc";
+case CODEC_ID_H261:
+ return "h261";
+case CODEC_ID_H263:
+ return "h263";
+case CODEC_ID_RV10:
+ return "rv10";
+case CODEC_ID_RV20:
+ return "rv20";
+case CODEC_ID_MJPEG:
+ return "mjpeg";
+case CODEC_ID_MJPEGB:
+ return "mjpegb";
+case CODEC_ID_LJPEG:
+ return "ljpeg";
+case CODEC_ID_SP5X:
+ return "sp5x";
+case CODEC_ID_JPEGLS:
+ return "jpegls";
+case CODEC_ID_MPEG4:
+ return "mpeg4";
+case CODEC_ID_RAWVIDEO:
+ return "rawvideo";
+case CODEC_ID_MSMPEG4V1:
+ return "msmpeg4v1";
+case CODEC_ID_MSMPEG4V2:
+ return "msmpeg4v2";
+case CODEC_ID_MSMPEG4V3:
+ return "msmpeg4v3";
+case CODEC_ID_WMV1:
+ return "wmv1";
+case CODEC_ID_WMV2:
+ return "wmv2";
+case CODEC_ID_H263P:
+ return "h263p";
+case CODEC_ID_H263I:
+ return "h263i";
+case CODEC_ID_FLV1:
+ return "flv1";
+case CODEC_ID_SVQ1:
+ return "svq1";
+case CODEC_ID_SVQ3:
+ return "svq3";
+case CODEC_ID_DVVIDEO:
+ return "dvvideo";
+case CODEC_ID_HUFFYUV:
+ return "huffyuv";
+case CODEC_ID_CYUV:
+ return "cyuv";
+case CODEC_ID_H264:
+ return "h264";
+case CODEC_ID_INDEO3:
+ return "indeo3";
+case CODEC_ID_VP3:
+ { extern AVCodec ff_vp3_decoder;
+ return ff_vp3_decoder.name; }
+case CODEC_ID_THEORA:
+ { extern AVCodec ff_theora_decoder;
+ return ff_theora_decoder.name; }
+case CODEC_ID_ASV1:
+ return "asv1";
+case CODEC_ID_ASV2:
+ return "asv2";
+case CODEC_ID_FFV1:
+ return "ffv1";
+case CODEC_ID_4XM:
+ return "4xm";
+case CODEC_ID_VCR1:
+ return "vcr1";
+case CODEC_ID_CLJR:
+ return "cljr";
+case CODEC_ID_MDEC:
+ return "mdec";
+case CODEC_ID_ROQ:
+ return "roq";
+case CODEC_ID_INTERPLAY_VIDEO:
+ return "interplay_video";
+case CODEC_ID_XAN_WC3:
+ return "xan_wc3";
+case CODEC_ID_XAN_WC4:
+ return "xan_wc4";
+case CODEC_ID_RPZA:
+ return "rpza";
+case CODEC_ID_CINEPAK:
+ return "cinepak";
+case CODEC_ID_WS_VQA:
+ return "ws_vqa";
+case CODEC_ID_MSRLE:
+ return "msrle";
+case CODEC_ID_MSVIDEO1:
+ return "msvideo1";
+case CODEC_ID_IDCIN:
+ return "idcin";
+case CODEC_ID_8BPS:
+ return "8bps";
+case CODEC_ID_SMC:
+ return "smc";
+case CODEC_ID_FLIC:
+ return "flic";
+case CODEC_ID_TRUEMOTION1:
+ return "truemotion1";
+case CODEC_ID_VMDVIDEO:
+ return "vmdvideo";
+case CODEC_ID_MSZH:
+ return "mszh";
+case CODEC_ID_ZLIB:
+ return "zlib";
+case CODEC_ID_QTRLE:
+ return "qtrle";
+case CODEC_ID_SNOW:
+ return "snow";
+case CODEC_ID_TSCC:
+ return "tscc";
+case CODEC_ID_ULTI:
+ return "ulti";
+case CODEC_ID_QDRAW:
+ return "qdraw";
+case CODEC_ID_VIXL:
+ return "vixl";
+case CODEC_ID_QPEG:
+ return "qpeg";
+case CODEC_ID_PNG:
+ return "png";
+case CODEC_ID_PPM:
+ return "ppm";
+case CODEC_ID_PBM:
+ return "pbm";
+case CODEC_ID_PGM:
+ return "pgm";
+case CODEC_ID_PGMYUV:
+ return "pgmyuv";
+case CODEC_ID_PAM:
+ return "pam";
+case CODEC_ID_FFVHUFF:
+ return "ffvhuff";
+case CODEC_ID_RV30:
+ return "rv30";
+case CODEC_ID_RV40:
+ return "rv40";
+case CODEC_ID_VC1:
+ return "vc1";
+case CODEC_ID_WMV3:
+ return "wmv3";
+case CODEC_ID_LOCO:
+ return "loco";
+case CODEC_ID_WNV1:
+ return "wnv1";
+case CODEC_ID_AASC:
+ return "aasc";
+case CODEC_ID_INDEO2:
+ return "indeo2";
+case CODEC_ID_FRAPS:
+ return "fraps";
+case CODEC_ID_TRUEMOTION2:
+ return "truemotion2";
+case CODEC_ID_BMP:
+ return "bmp";
+case CODEC_ID_CSCD:
+ return "cscd";
+case CODEC_ID_MMVIDEO:
+ return "mmvideo";
+case CODEC_ID_ZMBV:
+ return "zmbv";
+case CODEC_ID_AVS:
+ return "avs";
+case CODEC_ID_SMACKVIDEO:
+ return "smackvideo";
+case CODEC_ID_NUV:
+ return "nuv";
+case CODEC_ID_KMVC:
+ return "kmvc";
+case CODEC_ID_FLASHSV:
+ return "flashsv";
+case CODEC_ID_CAVS:
+ return "cavs";
+case CODEC_ID_JPEG2000:
+ return "jpeg2000";
+case CODEC_ID_VMNC:
+ return "vmnc";
+case CODEC_ID_VP5:
+ return "vp5";
+case CODEC_ID_VP6:
+ return "vp6";
+case CODEC_ID_VP6F:
+ return "vp6f";
+case CODEC_ID_TARGA:
+ return "targa";
+case CODEC_ID_DSICINVIDEO:
+ return "dsicinvideo";
+case CODEC_ID_TIERTEXSEQVIDEO:
+ return "tiertexseqvideo";
+case CODEC_ID_TIFF:
+ return "tiff";
+case CODEC_ID_GIF:
+ return "gif";
+case CODEC_ID_DXA:
+ return "dxa";
+case CODEC_ID_DNXHD:
+ return "dnxhd";
+case CODEC_ID_THP:
+ return "thp";
+case CODEC_ID_SGI:
+ return "sgi";
+case CODEC_ID_C93:
+ return "c93";
+case CODEC_ID_BETHSOFTVID:
+ return "bethsoftvid";
+case CODEC_ID_PTX:
+ return "ptx";
+case CODEC_ID_TXD:
+ return "txd";
+case CODEC_ID_VP6A:
+ return "vp6a";
+case CODEC_ID_AMV:
+ return "amv";
+case CODEC_ID_VB:
+ return "vb";
+case CODEC_ID_PCX:
+ return "pcx";
+case CODEC_ID_SUNRAST:
+ return "sunrast";
+case CODEC_ID_INDEO4:
+ return "indeo4";
+case CODEC_ID_INDEO5:
+ return "indeo5";
+case CODEC_ID_MIMIC:
+ return "mimic";
+case CODEC_ID_RL2:
+ return "rl2";
+case CODEC_ID_ESCAPE124:
+ return "escape124";
+case CODEC_ID_DIRAC:
+ return "dirac";
+case CODEC_ID_BFI:
+ return "bfi";
+case CODEC_ID_CMV:
+ return "cmv";
+case CODEC_ID_MOTIONPIXELS:
+ return "motionpixels";
+case CODEC_ID_TGV:
+ return "tgv";
+case CODEC_ID_TGQ:
+ return "tgq";
+case CODEC_ID_TQI:
+ return "tqi";
+case CODEC_ID_AURA:
+ return "aura";
+case CODEC_ID_AURA2:
+ return "aura2";
+case CODEC_ID_V210X:
+ return "v210x";
+case CODEC_ID_TMV:
+ return "tmv";
+case CODEC_ID_V210:
+ return "v210";
+case CODEC_ID_DPX:
+ return "dpx";
+case CODEC_ID_MAD:
+ return "mad";
+case CODEC_ID_FRWU:
+ return "frwu";
+case CODEC_ID_FLASHSV2:
+ return "flashsv2";
+case CODEC_ID_CDGRAPHICS:
+ return "cdgraphics";
+case CODEC_ID_R210:
+ return "r210";
+case CODEC_ID_ANM:
+ return "anm";
+case CODEC_ID_BINKVIDEO:
+ return "binkvideo";
+case CODEC_ID_IFF_ILBM:
+ return "iff_ilbm";
+case CODEC_ID_IFF_BYTERUN1:
+ return "iff_byterun1";
+case CODEC_ID_KGV1:
+ return "kgv1";
+case CODEC_ID_YOP:
+ return "yop";
+case CODEC_ID_VP8:
+ { extern AVCodec ff_vp8_decoder;
+ return ff_vp8_decoder.name; }
+case CODEC_ID_PICTOR:
+ return "pictor";
+case CODEC_ID_ANSI:
+ return "ansi";
+case CODEC_ID_A64_MULTI:
+ return "a64_multi";
+case CODEC_ID_A64_MULTI5:
+ return "a64_multi5";
+case CODEC_ID_R10K:
+ return "r10k";
+case CODEC_ID_MXPEG:
+ return "mxpeg";
+case CODEC_ID_LAGARITH:
+ return "lagarith";
+case CODEC_ID_PRORES:
+ return "prores";
+case CODEC_ID_JV:
+ return "jv";
+case CODEC_ID_DFA:
+ return "dfa";
+case CODEC_ID_WMV3IMAGE:
+ return "wmv3image";
+case CODEC_ID_VC1IMAGE:
+ return "vc1image";
+case CODEC_ID_UTVIDEO:
+ return "utvideo";
+case CODEC_ID_BMV_VIDEO:
+ return "bmv_video";
+case CODEC_ID_VBLE:
+ return "vble";
+case CODEC_ID_DXTORY:
+ return "dxtory";
+case CODEC_ID_V410:
+ return "v410";
+case CODEC_ID_XWD:
+ return "xwd";
+case CODEC_ID_CDXL:
+ return "cdxl";
+case CODEC_ID_XBM:
+ return "xbm";
+case CODEC_ID_ZEROCODEC:
+ return "zerocodec";
+case CODEC_ID_MSS1:
+ return "mss1";
+case CODEC_ID_MSA1:
+ return "msa1";
+case CODEC_ID_TSCC2:
+ return "tscc2";
+case CODEC_ID_MTS2:
+ return "mts2";
+case CODEC_ID_Y41P:
+ return "y41p";
+case CODEC_ID_ESCAPE130:
+ return "escape130";
+case CODEC_ID_EXR:
+ return "exr";
+case CODEC_ID_AVRP:
+ return "avrp";
+case CODEC_ID_G2M:
+ return "g2m";
+case CODEC_ID_AVUI:
+ return "avui";
+case CODEC_ID_AYUV:
+ return "ayuv";
+case CODEC_ID_V308:
+ return "v308";
+case CODEC_ID_V408:
+ return "v408";
+case CODEC_ID_YUV4:
+ return "yuv4";
+case CODEC_ID_SANM:
+ return "sanm";
+case CODEC_ID_PAF_VIDEO:
+ return "paf_video";
+case CODEC_ID_PCM_S16LE:
+ { extern AVCodec ff_pcm_s16le_decoder;
+ return ff_pcm_s16le_decoder.name; }
+case CODEC_ID_PCM_S16BE:
+ { extern AVCodec ff_pcm_s16be_decoder;
+ return ff_pcm_s16be_decoder.name; }
+case CODEC_ID_PCM_U16LE:
+ return "pcm_u16le";
+case CODEC_ID_PCM_U16BE:
+ return "pcm_u16be";
+case CODEC_ID_PCM_S8:
+ return "pcm_s8";
+case CODEC_ID_PCM_U8:
+ { extern AVCodec ff_pcm_u8_decoder;
+ return ff_pcm_u8_decoder.name; }
+case CODEC_ID_PCM_MULAW:
+ return "pcm_mulaw";
+case CODEC_ID_PCM_ALAW:
+ return "pcm_alaw";
+case CODEC_ID_PCM_S32LE:
+ return "pcm_s32le";
+case CODEC_ID_PCM_S32BE:
+ return "pcm_s32be";
+case CODEC_ID_PCM_U32LE:
+ return "pcm_u32le";
+case CODEC_ID_PCM_U32BE:
+ return "pcm_u32be";
+case CODEC_ID_PCM_S24LE:
+ { extern AVCodec ff_pcm_s24le_decoder;
+ return ff_pcm_s24le_decoder.name; }
+case CODEC_ID_PCM_S24BE:
+ { extern AVCodec ff_pcm_s24be_decoder;
+ return ff_pcm_s24be_decoder.name; }
+case CODEC_ID_PCM_U24LE:
+ return "pcm_u24le";
+case CODEC_ID_PCM_U24BE:
+ return "pcm_u24be";
+case CODEC_ID_PCM_S24DAUD:
+ return "pcm_s24daud";
+case CODEC_ID_PCM_ZORK:
+ return "pcm_zork";
+case CODEC_ID_PCM_S16LE_PLANAR:
+ return "pcm_s16le_planar";
+case CODEC_ID_PCM_DVD:
+ return "pcm_dvd";
+case CODEC_ID_PCM_F32BE:
+ return "pcm_f32be";
+case CODEC_ID_PCM_F32LE:
+ { extern AVCodec ff_pcm_f32le_decoder;
+ return ff_pcm_f32le_decoder.name; }
+case CODEC_ID_PCM_F64BE:
+ return "pcm_f64be";
+case CODEC_ID_PCM_F64LE:
+ return "pcm_f64le";
+case CODEC_ID_PCM_BLURAY:
+ return "pcm_bluray";
+case CODEC_ID_PCM_LXF:
+ return "pcm_lxf";
+case CODEC_ID_S302M:
+ return "s302m";
+case CODEC_ID_PCM_S8_PLANAR:
+ return "pcm_s8_planar";
+case CODEC_ID_ADPCM_IMA_QT:
+ return "adpcm_ima_qt";
+case CODEC_ID_ADPCM_IMA_WAV:
+ return "adpcm_ima_wav";
+case CODEC_ID_ADPCM_IMA_DK3:
+ return "adpcm_ima_dk3";
+case CODEC_ID_ADPCM_IMA_DK4:
+ return "adpcm_ima_dk4";
+case CODEC_ID_ADPCM_IMA_WS:
+ return "adpcm_ima_ws";
+case CODEC_ID_ADPCM_IMA_SMJPEG:
+ return "adpcm_ima_smjpeg";
+case CODEC_ID_ADPCM_MS:
+ return "adpcm_ms";
+case CODEC_ID_ADPCM_4XM:
+ return "adpcm_4xm";
+case CODEC_ID_ADPCM_XA:
+ return "adpcm_xa";
+case CODEC_ID_ADPCM_ADX:
+ return "adpcm_adx";
+case CODEC_ID_ADPCM_EA:
+ return "adpcm_ea";
+case CODEC_ID_ADPCM_G726:
+ return "adpcm_g726";
+case CODEC_ID_ADPCM_CT:
+ return "adpcm_ct";
+case CODEC_ID_ADPCM_SWF:
+ return "adpcm_swf";
+case CODEC_ID_ADPCM_YAMAHA:
+ return "adpcm_yamaha";
+case CODEC_ID_ADPCM_SBPRO_4:
+ return "adpcm_sbpro_4";
+case CODEC_ID_ADPCM_SBPRO_3:
+ return "adpcm_sbpro_3";
+case CODEC_ID_ADPCM_SBPRO_2:
+ return "adpcm_sbpro_2";
+case CODEC_ID_ADPCM_THP:
+ return "adpcm_thp";
+case CODEC_ID_ADPCM_IMA_AMV:
+ return "adpcm_ima_amv";
+case CODEC_ID_ADPCM_EA_R1:
+ return "adpcm_ea_r1";
+case CODEC_ID_ADPCM_EA_R3:
+ return "adpcm_ea_r3";
+case CODEC_ID_ADPCM_EA_R2:
+ return "adpcm_ea_r2";
+case CODEC_ID_ADPCM_IMA_EA_SEAD:
+ return "adpcm_ima_ea_sead";
+case CODEC_ID_ADPCM_IMA_EA_EACS:
+ return "adpcm_ima_ea_eacs";
+case CODEC_ID_ADPCM_EA_XAS:
+ return "adpcm_ea_xas";
+case CODEC_ID_ADPCM_EA_MAXIS_XA:
+ return "adpcm_ea_maxis_xa";
+case CODEC_ID_ADPCM_IMA_ISS:
+ return "adpcm_ima_iss";
+case CODEC_ID_ADPCM_G722:
+ return "adpcm_g722";
+case CODEC_ID_ADPCM_IMA_APC:
+ return "adpcm_ima_apc";
+case CODEC_ID_VIMA:
+ return "vima";
+case CODEC_ID_AMR_NB:
+ return "amr_nb";
+case CODEC_ID_AMR_WB:
+ return "amr_wb";
+case CODEC_ID_RA_144:
+ return "ra_144";
+case CODEC_ID_RA_288:
+ return "ra_288";
+case CODEC_ID_ROQ_DPCM:
+ return "roq_dpcm";
+case CODEC_ID_INTERPLAY_DPCM:
+ return "interplay_dpcm";
+case CODEC_ID_XAN_DPCM:
+ return "xan_dpcm";
+case CODEC_ID_SOL_DPCM:
+ return "sol_dpcm";
+case CODEC_ID_MP2:
+ return "mp2";
+case CODEC_ID_MP3:
+ return "mp3";
+case CODEC_ID_AAC:
+ return "aac";
+case CODEC_ID_AC3:
+ return "ac3";
+case CODEC_ID_DTS:
+ return "dts";
+case CODEC_ID_VORBIS:
+ { extern AVCodec ff_vorbis_decoder;
+ return ff_vorbis_decoder.name; }
+case CODEC_ID_DVAUDIO:
+ return "dvaudio";
+case CODEC_ID_WMAV1:
+ return "wmav1";
+case CODEC_ID_WMAV2:
+ return "wmav2";
+case CODEC_ID_MACE3:
+ return "mace3";
+case CODEC_ID_MACE6:
+ return "mace6";
+case CODEC_ID_VMDAUDIO:
+ return "vmdaudio";
+case CODEC_ID_FLAC:
+ return "flac";
+case CODEC_ID_MP3ADU:
+ return "mp3adu";
+case CODEC_ID_MP3ON4:
+ return "mp3on4";
+case CODEC_ID_SHORTEN:
+ return "shorten";
+case CODEC_ID_ALAC:
+ return "alac";
+case CODEC_ID_WESTWOOD_SND1:
+ return "westwood_snd1";
+case CODEC_ID_GSM:
+ return "gsm";
+case CODEC_ID_QDM2:
+ return "qdm2";
+case CODEC_ID_COOK:
+ return "cook";
+case CODEC_ID_TRUESPEECH:
+ return "truespeech";
+case CODEC_ID_TTA:
+ return "tta";
+case CODEC_ID_SMACKAUDIO:
+ return "smackaudio";
+case CODEC_ID_QCELP:
+ return "qcelp";
+case CODEC_ID_WAVPACK:
+ return "wavpack";
+case CODEC_ID_DSICINAUDIO:
+ return "dsicinaudio";
+case CODEC_ID_IMC:
+ return "imc";
+case CODEC_ID_MUSEPACK7:
+ return "musepack7";
+case CODEC_ID_MLP:
+ return "mlp";
+case CODEC_ID_GSM_MS:
+ return "gsm_ms";
+case CODEC_ID_ATRAC3:
+ return "atrac3";
+case CODEC_ID_VOXWARE:
+ return "voxware";
+case CODEC_ID_APE:
+ return "ape";
+case CODEC_ID_NELLYMOSER:
+ return "nellymoser";
+case CODEC_ID_MUSEPACK8:
+ return "musepack8";
+case CODEC_ID_SPEEX:
+ return "speex";
+case CODEC_ID_WMAVOICE:
+ return "wmavoice";
+case CODEC_ID_WMAPRO:
+ return "wmapro";
+case CODEC_ID_WMALOSSLESS:
+ return "wmalossless";
+case CODEC_ID_ATRAC3P:
+ return "atrac3p";
+case CODEC_ID_EAC3:
+ return "eac3";
+case CODEC_ID_SIPR:
+ return "sipr";
+case CODEC_ID_MP1:
+ return "mp1";
+case CODEC_ID_TWINVQ:
+ return "twinvq";
+case CODEC_ID_TRUEHD:
+ return "truehd";
+case CODEC_ID_MP4ALS:
+ return "mp4als";
+case CODEC_ID_ATRAC1:
+ return "atrac1";
+case CODEC_ID_BINKAUDIO_RDFT:
+ return "binkaudio_rdft";
+case CODEC_ID_BINKAUDIO_DCT:
+ return "binkaudio_dct";
+case CODEC_ID_AAC_LATM:
+ return "aac_latm";
+case CODEC_ID_QDMC:
+ return "qdmc";
+case CODEC_ID_CELT:
+ return "celt";
+case CODEC_ID_G723_1:
+ return "g723_1";
+case CODEC_ID_G729:
+ return "g729";
+case CODEC_ID_8SVX_EXP:
+ return "8svx_exp";
+case CODEC_ID_8SVX_FIB:
+ return "8svx_fib";
+case CODEC_ID_BMV_AUDIO:
+ return "bmv_audio";
+case CODEC_ID_RALF:
+ return "ralf";
+case CODEC_ID_IAC:
+ return "iac";
+case CODEC_ID_ILBC:
+ return "ilbc";
+case CODEC_ID_FFWAVESYNTH:
+ return "ffwavesynth";
+case CODEC_ID_8SVX_RAW:
+ return "8svx_raw";
+case CODEC_ID_SONIC:
+ return "sonic";
+case CODEC_ID_SONIC_LS:
+ return "sonic_ls";
+case CODEC_ID_PAF_AUDIO:
+ return "paf_audio";
+case CODEC_ID_OPUS:
+ return "opus";
+case CODEC_ID_DVD_SUBTITLE:
+ return "dvd_subtitle";
+case CODEC_ID_DVB_SUBTITLE:
+ return "dvb_subtitle";
+case CODEC_ID_TEXT:
+ return "text";
+case CODEC_ID_XSUB:
+ return "xsub";
+case CODEC_ID_SSA:
+ return "ssa";
+case CODEC_ID_MOV_TEXT:
+ return "mov_text";
+case CODEC_ID_HDMV_PGS_SUBTITLE:
+ return "hdmv_pgs_subtitle";
+case CODEC_ID_DVB_TELETEXT:
+ return "dvb_teletext";
+case CODEC_ID_SRT:
+ return "srt";
+case CODEC_ID_MICRODVD:
+ return "microdvd";
+case CODEC_ID_EIA_608:
+ return "eia_608";
+case CODEC_ID_JACOSUB:
+ return "jacosub";
+case CODEC_ID_SAMI:
+ return "sami";
+case CODEC_ID_REALTEXT:
+ return "realtext";
+case CODEC_ID_TTF:
+ return "ttf";
+case CODEC_ID_BINTEXT:
+ return "bintext";
+case CODEC_ID_XBIN:
+ return "xbin";
+case CODEC_ID_IDF:
+ return "idf";
+case CODEC_ID_PROBE:
+ return "probe";
+case CODEC_ID_MPEG2TS:
+ return "mpeg2ts";
+case CODEC_ID_MPEG4SYSTEMS:
+ return "mpeg4systems";
+case CODEC_ID_FFMETADATA:
+ return "ffmetadata";
+

12
www/chromium/patches/patch-third_party_ffmpeg_libavcodec_x86_vp56_arith_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-third_party_ffmpeg_libavcodec_x86_vp56_arith_h,v 1.1 2012/10/12 16:46:10 robert Exp $
--- third_party/ffmpeg/libavcodec/x86/vp56_arith.h.orig Thu Oct 11 09:58:55 2012
+++ third_party/ffmpeg/libavcodec/x86/vp56_arith.h Thu Oct 11 09:59:05 2012
@@ -24,7 +24,7 @@
#ifndef AVCODEC_X86_VP56_ARITH_H
#define AVCODEC_X86_VP56_ARITH_H
-#if HAVE_FAST_CMOV
+#if HAVE_FAST_CMOV && !ARCH_X86_64
#define vp56_rac_get_prob vp56_rac_get_prob
static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob)
{

12
www/chromium/patches/patch-third_party_iccjpeg_iccjpeg_gyp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-third_party_iccjpeg_iccjpeg_gyp,v 1.2 2012/02/17 10:19:51 robert Exp $
--- third_party/iccjpeg/iccjpeg.gyp.orig Fri Jan 27 09:02:02 2012
+++ third_party/iccjpeg/iccjpeg.gyp Thu Feb 9 09:31:06 2012
@@ -21,6 +21,13 @@
],
}],
$OpenBSD: patch-third_party_iccjpeg_iccjpeg_gyp,v 1.3 2012/10/12 16:46:10 robert Exp $
--- third_party/iccjpeg/iccjpeg.gyp.orig Tue Sep 25 15:01:53 2012
+++ third_party/iccjpeg/iccjpeg.gyp Wed Oct 10 17:19:29 2012
@@ -14,6 +14,13 @@
'iccjpeg.c',
'iccjpeg.h',
],
+ 'conditions': [
+ ['OS=="openbsd" and use_system_libjpeg==1', {

13
www/chromium/patches/patch-third_party_libXNVCtrl_libXNVCtrl_gyp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-third_party_libXNVCtrl_libXNVCtrl_gyp,v 1.1 2012/10/12 16:46:10 robert Exp $
--- third_party/libXNVCtrl/libXNVCtrl.gyp.orig Thu Oct 11 23:35:59 2012
+++ third_party/libXNVCtrl/libXNVCtrl.gyp Thu Oct 11 23:41:14 2012
@@ -13,6 +13,9 @@
'NVCtrlLib.h',
'nv_control.h',
],
+ 'cflags': [
+ '-I/usr/X11R6/include',
+ ],
},
],
}

9
www/chromium/patches/patch-third_party_libvpx_obj_int_extract_sh Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-third_party_libvpx_obj_int_extract_sh,v 1.1 2012/10/12 16:46:10 robert Exp $
--- third_party/libvpx/obj_int_extract.sh.orig Wed Oct 10 23:01:00 2012
+++ third_party/libvpx/obj_int_extract.sh Wed Oct 10 23:01:15 2012
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
#
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be

15
www/chromium/patches/patch-third_party_libvpx_source_libvpx_build_make_obj_int_extract_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-third_party_libvpx_source_libvpx_build_make_obj_int_extract_c,v 1.1 2012/10/12 16:46:10 robert Exp $
--- third_party/libvpx/source/libvpx/build/make/obj_int_extract.c.orig Wed Oct 10 19:32:55 2012
+++ third_party/libvpx/source/libvpx/build/make/obj_int_extract.c Wed Oct 10 19:33:27 2012
@@ -213,7 +213,11 @@ bail:
}
#elif defined(__ELF__)
+#if defined(__OpenBSD__)
+#include <sys/exec_elf.h>
+#else
#include "elf.h"
+#endif
#define COPY_STRUCT(dst, buf, ofst, sz) do {\
if(ofst + sizeof((*(dst))) > sz) goto bail;\

9
www/chromium/patches/patch-third_party_libvpx_unpack_lib_posix_sh Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-third_party_libvpx_unpack_lib_posix_sh,v 1.1 2012/10/12 16:46:10 robert Exp $
--- third_party/libvpx/unpack_lib_posix.sh.orig Wed Oct 10 23:00:29 2012
+++ third_party/libvpx/unpack_lib_posix.sh Wed Oct 10 23:00:42 2012
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
#
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be

8
www/chromium/patches/patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h
View File

@ -1,7 +1,7 @@
$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;
$OpenBSD: patch-third_party_protobuf_src_google_protobuf_stubs_atomicops_h,v 1.2 2012/10/12 16:46:10 robert Exp $
--- third_party/protobuf/src/google/protobuf/stubs/atomicops.h.orig Tue Sep 25 15:01:42 2012
+++ third_party/protobuf/src/google/protobuf/stubs/atomicops.h Wed Oct 10 17:19:29 2012
@@ -77,7 +77,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.

8
www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.12 2012/10/12 16:46:10 robert Exp $
--- tools/gyp/pylib/gyp/generator/make.py.orig Tue Sep 25 15:04:38 2012
+++ tools/gyp/pylib/gyp/generator/make.py Wed Oct 10 17:19:32 2012
@@ -268,13 +268,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.

8
www/chromium/patches/patch-ui_base_l10n_l10n_util_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ui_base_l10n_l10n_util_cc,v 1.5 2012/07/10 09:22:34 robert Exp $
--- ui/base/l10n/l10n_util.cc.orig Sat Jul 7 12:46:25 2012
+++ ui/base/l10n/l10n_util.cc Sat Jul 7 13:01:04 2012
$OpenBSD: patch-ui_base_l10n_l10n_util_cc,v 1.6 2012/10/12 16:46:10 robert Exp $
--- ui/base/l10n/l10n_util.cc.orig Tue Sep 25 15:02:45 2012
+++ ui/base/l10n/l10n_util.cc Wed Oct 10 17:19:32 2012
@@ -33,7 +33,7 @@
#include "base/android/locale_utils.h"
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-ui_base_l10n_l10n_util_cc,v 1.5 2012/07/10 09:22:34 robert Exp $
#include <glib.h>
#endif
@@ -417,7 +417,7 @@ std::string GetApplicationLocale(const std::string& pr
@@ -419,7 +419,7 @@ std::string GetApplicationLocale(const std::string& pr
if (!pref_locale.empty())
candidates.push_back(pref_locale);

8
www/chromium/patches/patch-webkit_plugins_npapi_plugin_list_posix_cc
View File

@ -1,7 +1,7 @@
$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::vector<File
$OpenBSD: patch-webkit_plugins_npapi_plugin_list_posix_cc,v 1.3 2012/10/12 16:46:10 robert Exp $
--- webkit/plugins/npapi/plugin_list_posix.cc.orig Wed Oct 10 15:01:16 2012
+++ webkit/plugins/npapi/plugin_list_posix.cc Fri Oct 12 12:56:08 2012
@@ -182,7 +182,7 @@ void PluginList::GetPluginDirectories(std::vector<File
// 3) NS_SYSTEM_PLUGINS_DIR:
// This varies across different browsers and versions, so check 'em all.
plugin_dirs->push_back(FilePath("/usr/lib/browser-plugins"));

8
www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc
View File

@ -1,7 +1,7 @@
$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_
$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.12 2012/10/12 16:46:10 robert Exp $
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig Tue Sep 25 15:01:17 2012
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc Wed Oct 10 17:19:34 2012
@@ -1485,7 +1485,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_
#endif // defined(OS_WIN)
bool ret = false;

18
www/chromium/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2012/08/26 18:47:01 robert Exp $
@comment $OpenBSD: PLIST,v 1.20 2012/10/12 16:46:10 robert Exp $
bin/chrome
chrome/
@bin chrome/chrome
@ -166,17 +166,7 @@ chrome/resources/inspector/Images/spinnerInactive.gif
chrome/resources/inspector/Images/spinnerInactiveSelected.gif
chrome/resources/inspector/Images/splitviewDimple.png
chrome/resources/inspector/Images/splitviewDividerBackground.png
chrome/resources/inspector/Images/statusbarBackground.png
chrome/resources/inspector/Images/statusbarBackgroundChromium.png
chrome/resources/inspector/Images/statusbarBottomBackground.png
chrome/resources/inspector/Images/statusbarBottomBackgroundChromium.png
chrome/resources/inspector/Images/statusbarButtonGlyphs.png
chrome/resources/inspector/Images/statusbarButtons.png
chrome/resources/inspector/Images/statusbarButtonsChromium.png
chrome/resources/inspector/Images/statusbarMenuButton.png
chrome/resources/inspector/Images/statusbarMenuButtonChromium.png
chrome/resources/inspector/Images/statusbarMenuButtonSelected.png
chrome/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png
chrome/resources/inspector/Images/statusbarResizerHorizontal.png
chrome/resources/inspector/Images/statusbarResizerVertical.png
chrome/resources/inspector/Images/successGreenDot.png
@ -243,11 +233,11 @@ chrome/resources/inspector/revisionHistory.css
chrome/resources/inspector/scriptsPanel.css
chrome/resources/inspector/splitView.css
chrome/resources/inspector/tabbedPane.css
chrome/resources/inspector/textEditor.css
chrome/resources/inspector/textPrompt.css
chrome/resources/inspector/textViewer.css
chrome/resources/inspector/timelinePanel.css
chrome/theme_resources_standard.pak
chrome/ui_resources_standard.pak
chrome/theme_resources_100_percent.pak
chrome/ui_resources_100_percent.pak
@man man/man1/chrome.1
share/applications/chrome.desktop
share/icons/hicolor/128x128/apps/chrome.png