diff options
| author | bapt <bapt@FreeBSD.org> | 2011-09-19 01:11:32 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2011-09-19 01:11:32 +0800 |
| commit | 1c43782f1651155ba41d832124729aefb08984b4 (patch) | |
| tree | 1057adad8b0fbd810ddddcf78a32c86bf888890d /www/chromium | |
| parent | 5edc000089a2a7ace4247f4888e7a3ecbb3250bc (diff) | |
| download | freebsd-ports-gnome-1c43782f1651155ba41d832124729aefb08984b4.tar.gz freebsd-ports-gnome-1c43782f1651155ba41d832124729aefb08984b4.tar.zst freebsd-ports-gnome-1c43782f1651155ba41d832124729aefb08984b4.zip | |
- update to 14.0.835.163
- now use system tcmalloc
Submitted by: George Liaskos
Obtained from: Chromium development repository
With hat: chromium@
Diffstat (limited to 'www/chromium')
71 files changed, 1418 insertions, 5608 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index e3bedbeda56d..a2bdf5e9f36d 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -7,11 +7,13 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 13.0.782.220 +DISTVERSION= 14.0.835.163 CATEGORIES= www MASTER_SITES= http://download.goodking.org/downloads/ \ ftp://rene-ladan.nl/pub/distfiles/ \ - http://files.etoilebsd.net/goodking/ + http://files.etoilebsd.net/goodking/ \ + http://distfiles.cybertron.gr/ + MAINTAINER= chromium@FreeBSD.org COMMENT= A mostly BSD-licensed web browser based on WebKit and Gtk+ @@ -36,7 +38,13 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ nss3.1:${PORTSDIR}/security/nss \ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \ cups.2:${PORTSDIR}/print/cups-client \ - icudata.48:${PORTSDIR}/devel/icu + icuuc.48:${PORTSDIR}/devel/icu \ + icui18n.48:${PORTSDIR}/devel/icu \ + icudata.48:${PORTSDIR}/devel/icu \ + event-1.4:${PORTSDIR}/devel/libevent \ + vpx:${PORTSDIR}/multimedia/libvpx \ + tcmalloc.2:${PORTSDIR}/devel/google-perftools +# TODO(gliaskos): We should add --enable-heap-checker on perftools to set linux_use_heapchecker. RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf \ @@ -57,26 +65,26 @@ DESKTOP_ENTRIES="Chromium" "${COMMENT}" "${DATADIR}/product_logo_48.png" \ ALL_TARGET= chrome -#user tunables showing defaults, some won't compile if changed -#GYP_DEFINES+= use_system_bzip2=1 -#GYP_DEFINES+= use_system_libevent=0 -#GYP_DEFINES+= use_system_libjpeg=1 -#GYP_DEFINES+= use_system_libpng=1 -GYP_DEFINES+= use_system_libxml=1 -GYP_DEFINES+= use_system_ffmpeg=0 -#GYP_DEFINES+= use_system_sqlite=0 -GYP_DEFINES+= use_system_yasm=1 -#GYP_DEFINES+= use_system_zlib=1 -GYP_DEFINES+= use_system_icu=1 -GYP_DEFINES+= python_ver=${PYTHON_VER} -GYP_DEFINES+= disable_nacl=1 -GYP_DEFINES+= linux_use_heapchecker=1 -GYP_DEFINES+= linux_link_gsettings=1 -GYP_DEFINES+= linux_link_gnome_keyring=1 +# See build/common.gypi for all the available variables. +GYP_DEFINES+= use_cups=1 \ + use_system_icu=1 \ + use_system_vpx=1 \ + use_system_yasm=1 \ + use_system_libxml=1 \ + use_system_ffmpeg=0 \ + use_system_libevent=1 \ + use_system_tcmalloc=1 \ + linux_use_heapchecker=0 \ + disable_nacl=1 \ + enable_webrtc=0 \ + enable_openmax=1 \ + os_ver=${OSVERSION} \ + prefix_dir=${LOCALBASE} \ + python_ver=${PYTHON_VER} OPTIONS= CODECS "Compile and enable patented codecs like H.264" on \ GCONF "Use GConf2 for preferences" on \ - VPX "Use system libvpx for VP8 codec" on +# CLANG "Compile Chromium with clang" off .include <bsd.port.options.mk> @@ -110,9 +118,10 @@ GYP_DEFINES+= use_gconf=0 GYP_DEFINES+= disable_sse2=1 .endif -.if defined(WITH_VPX) -LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx -GYP_DEFINES+= use_system_vpx=1 +.if defined(WITH_CLANG) +CC= /usr/bin/clang +CXX= /usr/bin/clang++ +GYP_DEFINES+= clang=1 .endif .if !defined(WITH_DEBUG) @@ -122,6 +131,8 @@ BUILDTYPE= Debug STRIP= .endif +# Override the flock command in make.py +MAKE_ENV+= FLOCK= MAKE_ENV+= BUILDTYPE=${BUILDTYPE} MAKE_JOBS_SAFE= yes @@ -147,10 +158,7 @@ post-patch: ${WRKSRC}/build/common.gypi \ ${WRKSRC}/third_party/libvpx/libvpx.gyp \ ${WRKSRC}/third_party/WebKit/Source/WebCore/plugins/PluginDatabase.cpp \ - ${WRKSRC}/v8/tools/gyp/v8.gyp \ - ${WRKSRC}/third_party/ffmpeg/ffmpeg.gyp - @${REINPLACE_CMD} -e "s|/usr/include/vpx|${LOCALBASE}/include|" \ - ${WRKSRC}/third_party/ffmpeg/ffmpeg.gyp + ${WRKSRC}/v8/tools/gyp/v8.gyp @${REINPLACE_CMD} -e "s|linux|freebsd|" \ ${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py @${REINPLACE_CMD} -e 's|/usr/bin/gcc|${CC}|' \ @@ -163,11 +171,6 @@ post-patch: ${WRKSRC}/third_party/WebKit/Source/WebCore/css/makeprop.pl \ ${WRKSRC}/third_party/WebKit/Source/WebCore/css/makevalues.pl \ ${WRKSRC}/third_party/WebKit/Source/WebCore/make-hash-tools.pl -# kludges just to make it progress for now - @${REINPLACE_CMD} -e "s|/usr/lib|${LOCALBASE}/lib|" \ - -e "s|'python_ver%': '2.5'|'python_ver%': '2.6'|" \ - -e "s|.so.1.0|.so.1|" \ - ${WRKSRC}/build/common.gypi do-configure: cd ${WRKSRC} && \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 96b9b6a5b871..6b273b192845 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,2 +1,2 @@ -SHA256 (chromium-courgette-redacted-13.0.782.220.tar.xz) = 2372d35d875bdedf8549de2005bd640aa0b0074f2e698350ba69619acc4b7ec1 -SIZE (chromium-courgette-redacted-13.0.782.220.tar.xz) = 123845556 +SHA256 (chromium-courgette-redacted-14.0.835.163.tar.xz) = b5c911a38d9611ee102472a67f783cf1c8ebf5e660c572bf7110ff4c889917db +SIZE (chromium-courgette-redacted-14.0.835.163.tar.xz) = 123525524 diff --git a/www/chromium/files/patch-app__app_base.gypi b/www/chromium/files/patch-app__app_base.gypi deleted file mode 100644 index 89ef67b0dc4b..000000000000 --- a/www/chromium/files/patch-app__app_base.gypi +++ /dev/null @@ -1,10 +0,0 @@ ---- app/app_base.gypi.orig 2011-05-06 12:02:51.000000000 +0300 -+++ app/app_base.gypi 2011-06-05 20:27:30.437162962 +0300 -@@ -281,7 +281,6 @@ - 'link_settings': { - 'libraries': [ - '-lX11', -- '-ldl', - ], - }, - }, diff --git a/www/chromium/files/patch-base__allocator__allocator.gyp b/www/chromium/files/patch-base__allocator__allocator.gyp new file mode 100644 index 000000000000..d823d81f65ed --- /dev/null +++ b/www/chromium/files/patch-base__allocator__allocator.gyp @@ -0,0 +1,804 @@ +--- base/allocator/allocator.gyp.orig 2011-09-16 17:00:33.000000000 +0300 ++++ base/allocator/allocator.gyp 2011-09-16 17:03:48.000000000 +0300 +@@ -7,324 +7,196 @@ + 'jemalloc_dir': '../../third_party/jemalloc/chromium', + 'tcmalloc_dir': '../../third_party/tcmalloc/chromium', + }, +- 'targets': [ +- { +- 'target_name': 'allocator', +- 'type': 'static_library', +- 'include_dirs': [ +- '.', +- '<(tcmalloc_dir)/src/base', +- '<(tcmalloc_dir)/src', +- '../..', +- ], +- 'direct_dependent_settings': { +- 'configurations': { +- 'Common_Base': { +- 'msvs_settings': { +- 'VCLinkerTool': { +- 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], +- 'AdditionalDependencies': [ +- '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib' +- ], +- }, +- }, +- }, +- }, +- 'conditions': [ +- ['OS=="win"', { ++ 'conditions': [ ++ ['use_system_tcmalloc == 1', { ++ 'targets': [ ++ { ++ 'target_name': 'allocator', ++ 'type': 'settings', ++ 'direct_dependent_settings': { + 'defines': [ +- ['PERFTOOLS_DLL_DECL', ''] ++ 'USE_SYSTEM_TCMALLOC', ++ ], ++ }, ++ 'link_settings': { ++ 'ldflags': [ ++ '<!@(pkg-config libtcmalloc --libs-only-l)', ++ ], ++ 'libraries': [ ++ '<!@(pkg-config libtcmalloc --libs-only-L)', + ], +- }], +- ], +- }, +- 'sources': [ +- # Generated for our configuration from tcmalloc's build +- # and checked in. +- '<(tcmalloc_dir)/src/config.h', +- '<(tcmalloc_dir)/src/config_linux.h', +- '<(tcmalloc_dir)/src/config_win.h', +- +- # all tcmalloc native and forked files +- '<(tcmalloc_dir)/src/addressmap-inl.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', +- '<(tcmalloc_dir)/src/base/arm_instruction_set_select.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-arm-gcc.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-arm-generic.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-arm-v6plus.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-windows.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc', +- '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h', +- '<(tcmalloc_dir)/src/base/atomicops.h', +- '<(tcmalloc_dir)/src/base/basictypes.h', +- '<(tcmalloc_dir)/src/base/commandlineflags.h', +- '<(tcmalloc_dir)/src/base/cycleclock.h', +- # We don't list dynamic_annotations.c since its copy is already +- # present in the dynamic_annotations target. +- '<(tcmalloc_dir)/src/base/dynamic_annotations.h', +- '<(tcmalloc_dir)/src/base/elfcore.h', +- '<(tcmalloc_dir)/src/base/googleinit.h', +- '<(tcmalloc_dir)/src/base/linux_syscall_support.h', +- '<(tcmalloc_dir)/src/base/linuxthreads.cc', +- '<(tcmalloc_dir)/src/base/linuxthreads.h', +- '<(tcmalloc_dir)/src/base/logging.cc', +- '<(tcmalloc_dir)/src/base/logging.h', +- '<(tcmalloc_dir)/src/base/low_level_alloc.cc', +- '<(tcmalloc_dir)/src/base/low_level_alloc.h', +- '<(tcmalloc_dir)/src/base/simple_mutex.h', +- '<(tcmalloc_dir)/src/base/spinlock.cc', +- '<(tcmalloc_dir)/src/base/spinlock.h', +- '<(tcmalloc_dir)/src/base/spinlock_internal.cc', +- '<(tcmalloc_dir)/src/base/spinlock_internal.h', +- '<(tcmalloc_dir)/src/base/spinlock_linux-inl.h', +- '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h', +- '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h', +- '<(tcmalloc_dir)/src/base/stl_allocator.h', +- '<(tcmalloc_dir)/src/base/src/synchronization_profiling.h', +- '<(tcmalloc_dir)/src/base/sysinfo.cc', +- '<(tcmalloc_dir)/src/base/sysinfo.h', +- '<(tcmalloc_dir)/src/base/thread_annotations.h', +- '<(tcmalloc_dir)/src/base/thread_lister.c', +- '<(tcmalloc_dir)/src/base/thread_lister.h', +- '<(tcmalloc_dir)/src/base/vdso_support.cc', +- '<(tcmalloc_dir)/src/base/vdso_support.h', +- '<(tcmalloc_dir)/src/central_freelist.cc', +- '<(tcmalloc_dir)/src/central_freelist.h', +- '<(tcmalloc_dir)/src/common.cc', +- '<(tcmalloc_dir)/src/common.h', +- '<(tcmalloc_dir)/src/debugallocation.cc', +- '<(tcmalloc_dir)/src/getpc.h', +- '<(tcmalloc_dir)/src/google/heap-checker.h', +- '<(tcmalloc_dir)/src/google/heap-profiler.h', +- '<(tcmalloc_dir)/src/google/malloc_extension.h', +- '<(tcmalloc_dir)/src/google/malloc_extension_c.h', +- '<(tcmalloc_dir)/src/google/malloc_hook.h', +- '<(tcmalloc_dir)/src/google/malloc_hook_c.h', +- '<(tcmalloc_dir)/src/google/profiler.h', +- '<(tcmalloc_dir)/src/google/stacktrace.h', +- '<(tcmalloc_dir)/src/google/tcmalloc.h', +- '<(tcmalloc_dir)/src/heap-checker-bcad.cc', +- '<(tcmalloc_dir)/src/heap-checker.cc', +- '<(tcmalloc_dir)/src/heap-profile-table.cc', +- '<(tcmalloc_dir)/src/heap-profile-table.h', +- '<(tcmalloc_dir)/src/heap-profiler.cc', +- '<(tcmalloc_dir)/src/internal_logging.cc', +- '<(tcmalloc_dir)/src/internal_logging.h', +- '<(tcmalloc_dir)/src/linked_list.h', +- '<(tcmalloc_dir)/src/malloc_extension.cc', +- '<(tcmalloc_dir)/src/malloc_hook-inl.h', +- '<(tcmalloc_dir)/src/malloc_hook.cc', +- '<(tcmalloc_dir)/src/maybe_threads.cc', +- '<(tcmalloc_dir)/src/maybe_threads.h', +- '<(tcmalloc_dir)/src/memfs_malloc.cc', +- '<(tcmalloc_dir)/src/memory_region_map.cc', +- '<(tcmalloc_dir)/src/memory_region_map.h', +- '<(tcmalloc_dir)/src/packed-cache-inl.h', +- '<(tcmalloc_dir)/src/page_heap.cc', +- '<(tcmalloc_dir)/src/page_heap.h', +- '<(tcmalloc_dir)/src/page_heap_allocator.h', +- '<(tcmalloc_dir)/src/pagemap.h', +- '<(tcmalloc_dir)/src/profile-handler.cc', +- '<(tcmalloc_dir)/src/profile-handler.h', +- '<(tcmalloc_dir)/src/profiledata.cc', +- '<(tcmalloc_dir)/src/profiledata.h', +- '<(tcmalloc_dir)/src/profiler.cc', +- '<(tcmalloc_dir)/src/raw_printer.cc', +- '<(tcmalloc_dir)/src/raw_printer.h', +- '<(tcmalloc_dir)/src/sampler.cc', +- '<(tcmalloc_dir)/src/sampler.h', +- '<(tcmalloc_dir)/src/span.cc', +- '<(tcmalloc_dir)/src/span.h', +- '<(tcmalloc_dir)/src/stack_trace_table.cc', +- '<(tcmalloc_dir)/src/stack_trace_table.h', +- '<(tcmalloc_dir)/src/stacktrace.cc', +- '<(tcmalloc_dir)/src/stacktrace_config.h', +- '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', +- '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', +- '<(tcmalloc_dir)/src/stacktrace_powerpc-inl.h', +- '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', +- '<(tcmalloc_dir)/src/stacktrace_with_context.cc', +- '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', +- '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', +- '<(tcmalloc_dir)/src/static_vars.cc', +- '<(tcmalloc_dir)/src/static_vars.h', +- '<(tcmalloc_dir)/src/symbolize.cc', +- '<(tcmalloc_dir)/src/symbolize.h', +- '<(tcmalloc_dir)/src/system-alloc.cc', +- '<(tcmalloc_dir)/src/system-alloc.h', +- '<(tcmalloc_dir)/src/tcmalloc.cc', +- '<(tcmalloc_dir)/src/tcmalloc_guard.h', +- '<(tcmalloc_dir)/src/thread_cache.cc', +- '<(tcmalloc_dir)/src/thread_cache.h', +- '<(tcmalloc_dir)/src/windows/config.h', +- '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', +- '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', +- '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', +- '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', +- '<(tcmalloc_dir)/src/windows/mingw.h', +- '<(tcmalloc_dir)/src/windows/mini_disassembler.cc', +- '<(tcmalloc_dir)/src/windows/mini_disassembler.h', +- '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h', +- '<(tcmalloc_dir)/src/windows/override_functions.cc', +- '<(tcmalloc_dir)/src/windows/patch_functions.cc', +- '<(tcmalloc_dir)/src/windows/port.cc', +- '<(tcmalloc_dir)/src/windows/port.h', +- '<(tcmalloc_dir)/src/windows/preamble_patcher.cc', +- '<(tcmalloc_dir)/src/windows/preamble_patcher.h', +- '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', +- +- # jemalloc files +- '<(jemalloc_dir)/jemalloc.c', +- '<(jemalloc_dir)/jemalloc.h', +- '<(jemalloc_dir)/ql.h', +- '<(jemalloc_dir)/qr.h', +- '<(jemalloc_dir)/rb.h', +- +- 'allocator_shim.cc', +- 'allocator_shim.h', +- 'generic_allocators.cc', +- 'win_allocator.cc', +- ], +- # sources! means that these are not compiled directly. +- 'sources!': [ +- # Included by allocator_shim.cc for maximal inlining. +- 'generic_allocators.cc', +- 'win_allocator.cc', +- +- # We simply don't use these, but list them above so that IDE +- # users can view the full available source for reference, etc. +- '<(tcmalloc_dir)/src/addressmap-inl.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h', +- '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc', +- '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h', +- '<(tcmalloc_dir)/src/base/atomicops.h', +- '<(tcmalloc_dir)/src/base/basictypes.h', +- '<(tcmalloc_dir)/src/base/commandlineflags.h', +- '<(tcmalloc_dir)/src/base/cycleclock.h', +- '<(tcmalloc_dir)/src/base/elfcore.h', +- '<(tcmalloc_dir)/src/base/googleinit.h', +- '<(tcmalloc_dir)/src/base/linux_syscall_support.h', +- '<(tcmalloc_dir)/src/base/simple_mutex.h', +- '<(tcmalloc_dir)/src/base/spinlock_linux-inl.h', +- '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h', +- '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h', +- '<(tcmalloc_dir)/src/base/stl_allocator.h', +- '<(tcmalloc_dir)/src/base/thread_annotations.h', +- '<(tcmalloc_dir)/src/getpc.h', +- '<(tcmalloc_dir)/src/google/heap-checker.h', +- '<(tcmalloc_dir)/src/google/heap-profiler.h', +- '<(tcmalloc_dir)/src/google/malloc_extension_c.h', +- '<(tcmalloc_dir)/src/google/malloc_hook.h', +- '<(tcmalloc_dir)/src/google/malloc_hook_c.h', +- '<(tcmalloc_dir)/src/google/profiler.h', +- '<(tcmalloc_dir)/src/google/stacktrace.h', +- '<(tcmalloc_dir)/src/memfs_malloc.cc', +- '<(tcmalloc_dir)/src/packed-cache-inl.h', +- '<(tcmalloc_dir)/src/page_heap_allocator.h', +- '<(tcmalloc_dir)/src/pagemap.h', +- '<(tcmalloc_dir)/src/stacktrace_config.h', +- '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', +- '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', +- '<(tcmalloc_dir)/src/stacktrace_powerpc-inl.h', +- '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', +- '<(tcmalloc_dir)/src/stacktrace_with_context.cc', +- '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', +- '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', +- '<(tcmalloc_dir)/src/tcmalloc_guard.h', +- '<(tcmalloc_dir)/src/windows/config.h', +- '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', +- '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', +- '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', +- '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', +- '<(tcmalloc_dir)/src/windows/mingw.h', +- '<(tcmalloc_dir)/src/windows/mini_disassembler.cc', +- '<(tcmalloc_dir)/src/windows/mini_disassembler.h', +- '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h', +- '<(tcmalloc_dir)/src/windows/override_functions.cc', +- '<(tcmalloc_dir)/src/windows/patch_functions.cc', +- '<(tcmalloc_dir)/src/windows/preamble_patcher.cc', +- '<(tcmalloc_dir)/src/windows/preamble_patcher.h', +- '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', +- ], +- 'dependencies': [ +- '../third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', +- ], +- 'msvs_settings': { +- # TODO(sgk): merge this with build/common.gypi settings +- 'VCLibrarianTool': { +- 'AdditionalOptions': ['/ignore:4006,4221'], +- 'AdditionalLibraryDirectories': +- ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], +- }, +- 'VCLinkerTool': { +- 'AdditionalOptions': ['/ignore:4006'], +- }, +- }, +- 'configurations': { +- 'Debug_Base': { +- 'msvs_settings': { +- 'VCCLCompilerTool': { +- 'RuntimeLibrary': '0', +- }, + }, + }, +- }, +- 'conditions': [ +- ['OS=="win"', { +- 'defines': [ +- ['PERFTOOLS_DLL_DECL', ''] +- ], +- 'dependencies': [ +- 'libcmt', +- ], ++ ], ++ }, { ++ 'targets': [ ++ { ++ 'target_name': 'allocator', ++ 'type': 'static_library', + 'include_dirs': [ +- '<(tcmalloc_dir)/src/windows', +- ], +- 'sources!': [ ++ '.', ++ '<(tcmalloc_dir)/src/base', ++ '<(tcmalloc_dir)/src', ++ '../..', ++ ], ++ 'direct_dependent_settings': { ++ 'configurations': { ++ 'Common_Base': { ++ 'msvs_settings': { ++ 'VCLinkerTool': { ++ 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], ++ 'AdditionalDependencies': [ ++ '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib' ++ ], ++ }, ++ }, ++ }, ++ }, ++ 'conditions': [ ++ ['OS=="win"', { ++ 'defines': [ ++ ['PERFTOOLS_DLL_DECL', ''] ++ ], ++ }], ++ ], ++ }, ++ 'sources': [ ++ # Generated for our configuration from tcmalloc's build ++ # and checked in. ++ '<(tcmalloc_dir)/src/config.h', ++ '<(tcmalloc_dir)/src/config_linux.h', ++ '<(tcmalloc_dir)/src/config_win.h', ++ '<(tcmalloc_dir)/src/config_freebsd.h', ++ ++ # all tcmalloc native and forked files ++ '<(tcmalloc_dir)/src/addressmap-inl.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', ++ '<(tcmalloc_dir)/src/base/arm_instruction_set_select.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-arm-gcc.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-arm-generic.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-arm-v6plus.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-windows.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h', ++ '<(tcmalloc_dir)/src/base/atomicops.h', ++ '<(tcmalloc_dir)/src/base/basictypes.h', ++ '<(tcmalloc_dir)/src/base/commandlineflags.h', ++ '<(tcmalloc_dir)/src/base/cycleclock.h', ++ # We don't list dynamic_annotations.c since its copy is already ++ # present in the dynamic_annotations target. ++ '<(tcmalloc_dir)/src/base/dynamic_annotations.h', ++ '<(tcmalloc_dir)/src/base/elfcore.h', ++ '<(tcmalloc_dir)/src/base/googleinit.h', ++ '<(tcmalloc_dir)/src/base/linux_syscall_support.h', + '<(tcmalloc_dir)/src/base/linuxthreads.cc', + '<(tcmalloc_dir)/src/base/linuxthreads.h', +- '<(tcmalloc_dir)/src/base/vdso_support.cc', +- '<(tcmalloc_dir)/src/base/vdso_support.h', +- '<(tcmalloc_dir)/src/maybe_threads.cc', +- '<(tcmalloc_dir)/src/maybe_threads.h', +- '<(tcmalloc_dir)/src/symbolize.h', +- '<(tcmalloc_dir)/src/system-alloc.cc', +- '<(tcmalloc_dir)/src/system-alloc.h', +- +- # included by allocator_shim.cc +- '<(tcmalloc_dir)/src/tcmalloc.cc', +- +- # heap-profiler/checker/cpuprofiler ++ '<(tcmalloc_dir)/src/base/logging.cc', ++ '<(tcmalloc_dir)/src/base/logging.h', ++ '<(tcmalloc_dir)/src/base/low_level_alloc.cc', ++ '<(tcmalloc_dir)/src/base/low_level_alloc.h', ++ '<(tcmalloc_dir)/src/base/simple_mutex.h', ++ '<(tcmalloc_dir)/src/base/spinlock.cc', ++ '<(tcmalloc_dir)/src/base/spinlock.h', ++ '<(tcmalloc_dir)/src/base/spinlock_internal.cc', ++ '<(tcmalloc_dir)/src/base/spinlock_internal.h', ++ '<(tcmalloc_dir)/src/base/spinlock_linux-inl.h', ++ '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h', ++ '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h', ++ '<(tcmalloc_dir)/src/base/stl_allocator.h', ++ '<(tcmalloc_dir)/src/base/src/synchronization_profiling.h', ++ '<(tcmalloc_dir)/src/base/sysinfo.cc', ++ '<(tcmalloc_dir)/src/base/sysinfo.h', ++ '<(tcmalloc_dir)/src/base/thread_annotations.h', + '<(tcmalloc_dir)/src/base/thread_lister.c', + '<(tcmalloc_dir)/src/base/thread_lister.h', ++ '<(tcmalloc_dir)/src/base/vdso_support.cc', ++ '<(tcmalloc_dir)/src/base/vdso_support.h', ++ '<(tcmalloc_dir)/src/central_freelist.cc', ++ '<(tcmalloc_dir)/src/central_freelist.h', ++ '<(tcmalloc_dir)/src/common.cc', ++ '<(tcmalloc_dir)/src/common.h', ++ '<(tcmalloc_dir)/src/debugallocation.cc', ++ '<(tcmalloc_dir)/src/getpc.h', ++ '<(tcmalloc_dir)/src/google/heap-checker.h', ++ '<(tcmalloc_dir)/src/google/heap-profiler.h', ++ '<(tcmalloc_dir)/src/google/malloc_extension.h', ++ '<(tcmalloc_dir)/src/google/malloc_extension_c.h', ++ '<(tcmalloc_dir)/src/google/malloc_hook.h', ++ '<(tcmalloc_dir)/src/google/malloc_hook_c.h', ++ '<(tcmalloc_dir)/src/google/profiler.h', ++ '<(tcmalloc_dir)/src/google/stacktrace.h', ++ '<(tcmalloc_dir)/src/google/tcmalloc.h', + '<(tcmalloc_dir)/src/heap-checker-bcad.cc', + '<(tcmalloc_dir)/src/heap-checker.cc', ++ '<(tcmalloc_dir)/src/heap-profile-table.cc', ++ '<(tcmalloc_dir)/src/heap-profile-table.h', + '<(tcmalloc_dir)/src/heap-profiler.cc', ++ '<(tcmalloc_dir)/src/internal_logging.cc', ++ '<(tcmalloc_dir)/src/internal_logging.h', ++ '<(tcmalloc_dir)/src/linked_list.h', ++ '<(tcmalloc_dir)/src/malloc_extension.cc', ++ '<(tcmalloc_dir)/src/malloc_hook-inl.h', ++ '<(tcmalloc_dir)/src/malloc_hook.cc', ++ '<(tcmalloc_dir)/src/maybe_threads.cc', ++ '<(tcmalloc_dir)/src/maybe_threads.h', ++ '<(tcmalloc_dir)/src/memfs_malloc.cc', + '<(tcmalloc_dir)/src/memory_region_map.cc', + '<(tcmalloc_dir)/src/memory_region_map.h', +- '<(tcmalloc_dir)/src/profiledata.cc', +- '<(tcmalloc_dir)/src/profiledata.h', ++ '<(tcmalloc_dir)/src/packed-cache-inl.h', ++ '<(tcmalloc_dir)/src/page_heap.cc', ++ '<(tcmalloc_dir)/src/page_heap.h', ++ '<(tcmalloc_dir)/src/page_heap_allocator.h', ++ '<(tcmalloc_dir)/src/pagemap.h', + '<(tcmalloc_dir)/src/profile-handler.cc', + '<(tcmalloc_dir)/src/profile-handler.h', ++ '<(tcmalloc_dir)/src/profiledata.cc', ++ '<(tcmalloc_dir)/src/profiledata.h', + '<(tcmalloc_dir)/src/profiler.cc', +- +- # debugallocation +- '<(tcmalloc_dir)/src/debugallocation.cc', +- ], +- }], +- ['OS=="linux" or OS=="freebsd" or OS=="solaris"', { +- 'sources!': [ ++ '<(tcmalloc_dir)/src/raw_printer.cc', ++ '<(tcmalloc_dir)/src/raw_printer.h', ++ '<(tcmalloc_dir)/src/sampler.cc', ++ '<(tcmalloc_dir)/src/sampler.h', ++ '<(tcmalloc_dir)/src/span.cc', ++ '<(tcmalloc_dir)/src/span.h', ++ '<(tcmalloc_dir)/src/stack_trace_table.cc', ++ '<(tcmalloc_dir)/src/stack_trace_table.h', ++ '<(tcmalloc_dir)/src/stacktrace.cc', ++ '<(tcmalloc_dir)/src/stacktrace_config.h', ++ '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', ++ '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', ++ '<(tcmalloc_dir)/src/stacktrace_powerpc-inl.h', ++ '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', ++ '<(tcmalloc_dir)/src/stacktrace_with_context.cc', ++ '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', ++ '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', ++ '<(tcmalloc_dir)/src/static_vars.cc', ++ '<(tcmalloc_dir)/src/static_vars.h', ++ '<(tcmalloc_dir)/src/symbolize.cc', ++ '<(tcmalloc_dir)/src/symbolize.h', ++ '<(tcmalloc_dir)/src/system-alloc.cc', + '<(tcmalloc_dir)/src/system-alloc.h', ++ '<(tcmalloc_dir)/src/tcmalloc.cc', ++ '<(tcmalloc_dir)/src/tcmalloc_guard.h', ++ '<(tcmalloc_dir)/src/thread_cache.cc', ++ '<(tcmalloc_dir)/src/thread_cache.h', ++ '<(tcmalloc_dir)/src/windows/config.h', ++ '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', ++ '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', ++ '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', ++ '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', ++ '<(tcmalloc_dir)/src/windows/mingw.h', ++ '<(tcmalloc_dir)/src/windows/mini_disassembler.cc', ++ '<(tcmalloc_dir)/src/windows/mini_disassembler.h', ++ '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h', ++ '<(tcmalloc_dir)/src/windows/override_functions.cc', ++ '<(tcmalloc_dir)/src/windows/patch_functions.cc', + '<(tcmalloc_dir)/src/windows/port.cc', + '<(tcmalloc_dir)/src/windows/port.h', ++ '<(tcmalloc_dir)/src/windows/preamble_patcher.cc', ++ '<(tcmalloc_dir)/src/windows/preamble_patcher.h', ++ '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', + +- # TODO(willchan): Support allocator shim later on. +- 'allocator_shim.cc', +- +- # TODO(willchan): support jemalloc on other platforms + # jemalloc files + '<(jemalloc_dir)/jemalloc.c', + '<(jemalloc_dir)/jemalloc.h', +@@ -332,85 +204,239 @@ + '<(jemalloc_dir)/qr.h', + '<(jemalloc_dir)/rb.h', + ++ 'allocator_shim.cc', ++ 'allocator_shim.h', ++ 'generic_allocators.cc', ++ 'win_allocator.cc', + ], +- # We enable all warnings by default, but upstream disables a few. +- # Keep "-Wno-*" flags in sync with upstream by comparing against: +- # http://code.google.com/p/google-perftools/source/browse/trunk/Makefile.am +- 'cflags': [ +- '-Wno-sign-compare', +- '-Wno-unused-result', +- ], +- 'cflags!': [ +- '-fvisibility=hidden', +- ], +- 'link_settings': { +- 'ldflags': [ +- # Don't let linker rip this symbol out, otherwise the heap&cpu +- # profilers will not initialize properly on startup. +- '-Wl,-uIsHeapProfilerRunning,-uProfilerStart', +- # Do the same for heap leak checker. +- '-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi', +- '-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl', +- '-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv', +- ]}, +- }], +- [ 'linux_use_debugallocation==1', { ++ # sources! means that these are not compiled directly. + 'sources!': [ +- # debugallocation.cc #includes tcmalloc.cc, +- # so only one of them should be used. +- '<(tcmalloc_dir)/src/tcmalloc.cc', ++ # Included by allocator_shim.cc for maximal inlining. ++ 'generic_allocators.cc', ++ 'win_allocator.cc', ++ ++ # We simply don't use these, but list them above so that IDE ++ # users can view the full available source for reference, etc. ++ '<(tcmalloc_dir)/src/addressmap-inl.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc', ++ '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h', ++ '<(tcmalloc_dir)/src/base/atomicops.h', ++ '<(tcmalloc_dir)/src/base/basictypes.h', ++ '<(tcmalloc_dir)/src/base/commandlineflags.h', ++ '<(tcmalloc_dir)/src/base/cycleclock.h', ++ '<(tcmalloc_dir)/src/base/elfcore.h', ++ '<(tcmalloc_dir)/src/base/googleinit.h', ++ '<(tcmalloc_dir)/src/base/linux_syscall_support.h', ++ '<(tcmalloc_dir)/src/base/simple_mutex.h', ++ '<(tcmalloc_dir)/src/base/spinlock_linux-inl.h', ++ '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h', ++ '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h', ++ '<(tcmalloc_dir)/src/base/stl_allocator.h', ++ '<(tcmalloc_dir)/src/base/thread_annotations.h', ++ '<(tcmalloc_dir)/src/getpc.h', ++ '<(tcmalloc_dir)/src/google/heap-checker.h', ++ '<(tcmalloc_dir)/src/google/heap-profiler.h', ++ '<(tcmalloc_dir)/src/google/malloc_extension_c.h', ++ '<(tcmalloc_dir)/src/google/malloc_hook.h', ++ '<(tcmalloc_dir)/src/google/malloc_hook_c.h', ++ '<(tcmalloc_dir)/src/google/profiler.h', ++ '<(tcmalloc_dir)/src/google/stacktrace.h', ++ '<(tcmalloc_dir)/src/memfs_malloc.cc', ++ '<(tcmalloc_dir)/src/packed-cache-inl.h', ++ '<(tcmalloc_dir)/src/page_heap_allocator.h', ++ '<(tcmalloc_dir)/src/pagemap.h', ++ '<(tcmalloc_dir)/src/stacktrace_config.h', ++ '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', ++ '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', ++ '<(tcmalloc_dir)/src/stacktrace_powerpc-inl.h', ++ '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', ++ '<(tcmalloc_dir)/src/stacktrace_with_context.cc', ++ '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', ++ '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', ++ '<(tcmalloc_dir)/src/tcmalloc_guard.h', ++ '<(tcmalloc_dir)/src/windows/config.h', ++ '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', ++ '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', ++ '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', ++ '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', ++ '<(tcmalloc_dir)/src/windows/mingw.h', ++ '<(tcmalloc_dir)/src/windows/mini_disassembler.cc', ++ '<(tcmalloc_dir)/src/windows/mini_disassembler.h', ++ '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h', ++ '<(tcmalloc_dir)/src/windows/override_functions.cc', ++ '<(tcmalloc_dir)/src/windows/patch_functions.cc', ++ '<(tcmalloc_dir)/src/windows/preamble_patcher.cc', ++ '<(tcmalloc_dir)/src/windows/preamble_patcher.h', ++ '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', + ], +- 'cflags': [ +- '-DTCMALLOC_FOR_DEBUGALLOCATION', ++ 'dependencies': [ ++ '../third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + ], +- }, { # linux_use_debugallocation != 1 +- 'sources!': [ +- '<(tcmalloc_dir)/src/debugallocation.cc', ++ 'msvs_settings': { ++ # TODO(sgk): merge this with build/common.gypi settings ++ 'VCLibrarianTool': { ++ 'AdditionalOptions': ['/ignore:4006,4221'], ++ 'AdditionalLibraryDirectories': ++ ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], ++ }, ++ 'VCLinkerTool': { ++ 'AdditionalOptions': ['/ignore:4006'], ++ }, ++ }, ++ 'configurations': { ++ 'Debug_Base': { ++ 'msvs_settings': { ++ 'VCCLCompilerTool': { ++ 'RuntimeLibrary': '0', ++ }, ++ }, ++ }, ++ }, ++ 'conditions': [ ++ ['OS=="win"', { ++ 'defines': [ ++ ['PERFTOOLS_DLL_DECL', ''] ++ ], ++ 'dependencies': [ ++ 'libcmt', ++ ], ++ 'include_dirs': [ ++ '<(tcmalloc_dir)/src/windows', ++ ], ++ 'sources!': [ ++ '<(tcmalloc_dir)/src/base/linuxthreads.cc', ++ '<(tcmalloc_dir)/src/base/linuxthreads.h', ++ '<(tcmalloc_dir)/src/base/vdso_support.cc', ++ '<(tcmalloc_dir)/src/base/vdso_support.h', ++ '<(tcmalloc_dir)/src/maybe_threads.cc', ++ '<(tcmalloc_dir)/src/maybe_threads.h', ++ '<(tcmalloc_dir)/src/symbolize.h', ++ '<(tcmalloc_dir)/src/system-alloc.cc', ++ '<(tcmalloc_dir)/src/system-alloc.h', ++ ++ # included by allocator_shim.cc ++ '<(tcmalloc_dir)/src/tcmalloc.cc', ++ ++ # heap-profiler/checker/cpuprofiler ++ '<(tcmalloc_dir)/src/base/thread_lister.c', ++ '<(tcmalloc_dir)/src/base/thread_lister.h', ++ '<(tcmalloc_dir)/src/heap-checker-bcad.cc', ++ '<(tcmalloc_dir)/src/heap-checker.cc', ++ '<(tcmalloc_dir)/src/heap-profiler.cc', ++ '<(tcmalloc_dir)/src/memory_region_map.cc', ++ '<(tcmalloc_dir)/src/memory_region_map.h', ++ '<(tcmalloc_dir)/src/profiledata.cc', ++ '<(tcmalloc_dir)/src/profiledata.h', ++ '<(tcmalloc_dir)/src/profile-handler.cc', ++ '<(tcmalloc_dir)/src/profile-handler.h', ++ '<(tcmalloc_dir)/src/profiler.cc', ++ ++ # debugallocation ++ '<(tcmalloc_dir)/src/debugallocation.cc', ++ ], ++ }], ++ ['OS=="linux" or OS=="freebsd" or OS=="solaris"', { ++ 'sources!': [ ++ '<(tcmalloc_dir)/src/system-alloc.h', ++ '<(tcmalloc_dir)/src/windows/port.cc', ++ '<(tcmalloc_dir)/src/windows/port.h', ++ ++ # TODO(willchan): Support allocator shim later on. ++ 'allocator_shim.cc', ++ ++ # TODO(willchan): support jemalloc on other platforms ++ # jemalloc files ++ '<(jemalloc_dir)/jemalloc.c', ++ '<(jemalloc_dir)/jemalloc.h', ++ '<(jemalloc_dir)/ql.h', ++ '<(jemalloc_dir)/qr.h', ++ '<(jemalloc_dir)/rb.h', ++ ++ ], ++ # We enable all warnings by default, but upstream disables a few. ++ # Keep "-Wno-*" flags in sync with upstream by comparing against: ++ # http://code.google.com/p/google-perftools/source/browse/trunk/Makefile.am ++ 'cflags': [ ++ '-Wno-sign-compare', ++ '-Wno-unused-result', ++ ], ++ 'cflags!': [ ++ '-fvisibility=hidden', ++ ], ++ 'link_settings': { ++ 'ldflags': [ ++ # Don't let linker rip this symbol out, otherwise the heap&cpu ++ # profilers will not initialize properly on startup. ++ '-Wl,-uIsHeapProfilerRunning,-uProfilerStart', ++ # Do the same for heap leak checker. ++ '-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi', ++ '-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl', ++ '-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv', ++ ]}, ++ }], ++ [ 'linux_use_debugallocation==1', { ++ 'sources!': [ ++ # debugallocation.cc #includes tcmalloc.cc, ++ # so only one of them should be used. ++ '<(tcmalloc_dir)/src/tcmalloc.cc', ++ ], ++ 'cflags': [ ++ '-DTCMALLOC_FOR_DEBUGALLOCATION', ++ ], ++ }, { # linux_use_debugallocation != 1 ++ 'sources!': [ ++ '<(tcmalloc_dir)/src/debugallocation.cc', ++ ], ++ }], ++ [ 'linux_keep_shadow_stacks==1', { ++ 'sources': [ ++ '<(tcmalloc_dir)/src/linux_shadow_stacks.cc', ++ '<(tcmalloc_dir)/src/linux_shadow_stacks.h', ++ '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h', ++ ], ++ 'cflags': [ ++ '-finstrument-functions', ++ '-DKEEP_SHADOW_STACKS', ++ ], ++ }], ++ [ 'linux_use_heapchecker==0', { ++ # Do not compile and link the heapchecker source. ++ 'sources!': [ ++ '<(tcmalloc_dir)/src/heap-checker-bcad.cc', ++ '<(tcmalloc_dir)/src/heap-checker.cc', ++ ], ++ # Disable the heap checker in tcmalloc. ++ 'cflags': [ ++ '-DNO_HEAP_CHECK', ++ ], ++ }], + ], +- }], +- [ 'linux_keep_shadow_stacks==1', { +- 'sources': [ +- '<(tcmalloc_dir)/src/linux_shadow_stacks.cc', +- '<(tcmalloc_dir)/src/linux_shadow_stacks.h', +- '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h', ++ }, ++ { ++ 'target_name': 'allocator_unittests', ++ 'type': 'executable', ++ 'dependencies': [ ++ 'allocator', ++ '../../testing/gtest.gyp:gtest', + ], +- 'cflags': [ +- '-finstrument-functions', +- '-DKEEP_SHADOW_STACKS', ++ 'include_dirs': [ ++ '.', ++ '<(tcmalloc_dir)/src/base', ++ '<(tcmalloc_dir)/src', ++ '../..', + ], +- }], +- [ 'linux_use_heapchecker==0', { +- # Do not compile and link the heapchecker source. +- 'sources!': [ +- '<(tcmalloc_dir)/src/heap-checker-bcad.cc', +- '<(tcmalloc_dir)/src/heap-checker.cc', ++ 'sources': [ ++ 'allocator_unittests.cc', + ], +- # Disable the heap checker in tcmalloc. + 'cflags': [ +- '-DNO_HEAP_CHECK', ++ '-fexceptions', + ], +- }], +- ], +- }, +- { +- 'target_name': 'allocator_unittests', +- 'type': 'executable', +- 'dependencies': [ +- 'allocator', +- '../../testing/gtest.gyp:gtest', +- ], +- 'include_dirs': [ +- '.', +- '<(tcmalloc_dir)/src/base', +- '<(tcmalloc_dir)/src', +- '../..', +- ], +- 'sources': [ +- 'allocator_unittests.cc', ++ }, + ], +- }, +- ], +- 'conditions': [ ++ }], + ['OS=="win"', { + 'targets': [ + { diff --git a/www/chromium/files/patch-base__base.gyp b/www/chromium/files/patch-base__base.gyp index 6bb673e112eb..0d36ac824a92 100644 --- a/www/chromium/files/patch-base__base.gyp +++ b/www/chromium/files/patch-base__base.gyp @@ -1,16 +1,14 @@ ---- ./base/base.gyp.orig 2010-12-16 02:11:49.000000000 +0100 -+++ ./base/base.gyp 2010-12-20 20:15:07.000000000 +0100 -@@ -241,6 +241,13 @@ +--- base/base.gyp.orig 2011-09-11 11:01:29.000000000 +0300 ++++ base/base.gyp 2011-09-14 00:13:24.000000000 +0300 +@@ -320,6 +320,11 @@ + 'test/scoped_locale.h', ], }], ++ ['OS=="freebsd"', { ++ 'sources!': [ ++ 'test/test_file_util_linux.cc', ++ ], ++ }], ], -+ 'conditions': [ -+ [ 'OS == "freebsd"', { -+ # fdatasync is not implemented on FreeBSD -+ 'sources/': [ ['exclude', '^test/test_file_util_linux.cc$'] ], -+ }, -+ ], -+ ], - }, - { - 'target_name': 'test_support_base', + 'sources': [ + 'perftimer.cc', diff --git a/www/chromium/files/patch-base__debug__debugger_posix.cc b/www/chromium/files/patch-base__debug__debugger_posix.cc index a8a7712c3c63..50c834945b45 100644 --- a/www/chromium/files/patch-base__debug__debugger_posix.cc +++ b/www/chromium/files/patch-base__debug__debugger_posix.cc @@ -1,14 +1,14 @@ ---- base/debug/debugger_posix.cc.orig 2011-02-03 10:01:35.000000000 +0100 -+++ base/debug/debugger_posix.cc 2011-02-06 17:07:57.000000000 +0100 -@@ -15,6 +15,7 @@ - #include <sys/sysctl.h> - #endif +--- base/debug/debugger_posix.cc.orig 2011-07-28 11:01:28.000000000 +0300 ++++ base/debug/debugger_posix.cc 2011-08-28 20:25:41.000000000 +0300 +@@ -13,6 +13,7 @@ + #include <sys/param.h> + #include <sys/stat.h> #include <sys/types.h> +#include <sys/user.h> #include <unistd.h> #include <string> -@@ -50,7 +51,7 @@ +@@ -57,7 +58,7 @@ return false; } @@ -17,7 +17,7 @@ // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -88,7 +89,11 @@ +@@ -95,7 +96,11 @@ // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -29,18 +29,15 @@ return being_debugged; } -@@ -135,15 +140,7 @@ +@@ -145,12 +150,11 @@ + #else + + bool BeingDebugged() { +- // TODO(benl): can we determine this under FreeBSD? + NOTIMPLEMENTED(); return false; } --#elif defined(OS_FREEBSD) -- --bool BeingDebugged() { -- // TODO(benl): can we determine this under FreeBSD? -- NOTIMPLEMENTED(); -- return false; --} -- -#endif // defined(OS_FREEBSD) +#endif diff --git a/www/chromium/files/patch-base__debug__leak_annotations.h b/www/chromium/files/patch-base__debug__leak_annotations.h deleted file mode 100644 index bf1a1edbf921..000000000000 --- a/www/chromium/files/patch-base__debug__leak_annotations.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./base/debug/leak_annotations.h.orig 2010-12-16 02:11:48.000000000 +0100 -+++ ./base/debug/leak_annotations.h 2010-12-20 20:15:07.000000000 +0100 -@@ -8,7 +8,7 @@ - - #include "build/build_config.h" - --#if defined(OS_LINUX) && defined(USE_HEAPCHECKER) -+#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && defined(USE_HEAPCHECKER) - - #include "third_party/tcmalloc/chromium/src/google/heap-checker.h" - diff --git a/www/chromium/files/patch-base__process_util_posix.cc b/www/chromium/files/patch-base__process_util_posix.cc index aca6e21a0304..98ff3dde62ca 100644 --- a/www/chromium/files/patch-base__process_util_posix.cc +++ b/www/chromium/files/patch-base__process_util_posix.cc @@ -1,16 +1,49 @@ ---- ./base/process_util_posix.cc.orig 2010-12-16 02:11:49.000000000 +0100 -+++ ./base/process_util_posix.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -102,11 +102,11 @@ - return status; +--- base/process_util_posix.cc.orig 2011-09-12 11:35:34.000000000 +0300 ++++ base/process_util_posix.cc 2011-09-15 02:07:17.000000000 +0300 +@@ -33,6 +33,11 @@ + #include "base/threading/thread_restrictions.h" + #include "base/time.h" + ++#if defined(OS_FREEBSD) ++#include <sys/event.h> ++#include <sys/ucontext.h> ++#endif ++ + #if defined(OS_MACOSX) + #include <crt_externs.h> + #include <sys/event.h> +@@ -767,8 +772,8 @@ + return false; } --void StackDumpSignalHandler(int signal, siginfo_t* info, ucontext_t* context) { -+void StackDumpSignalHandler(int signal, siginfo_t* info /*, ucontext_t* context */) { - LOG(ERROR) << "Received signal " << signal; - debug::StackTrace().PrintBacktrace(); +-#if defined(OS_MACOSX) +-// Using kqueue on Mac so that we can wait on non-child processes. ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) ++// Using kqueue on BSD so that we can wait on non-child processes. + // We can't use kqueues on child processes because we need to reap + // our own children using wait. + static bool WaitForSingleNonChildProcess(ProcessHandle handle, +@@ -826,19 +831,19 @@ + } + } + } +-#endif // OS_MACOSX ++#endif // OS_MACOSX || OS_FREEBSD -- // TODO(shess): Port to Linux. -+ // TODO(shess): Port to Linux and FreeBSD. - #if defined(OS_MACOSX) - // TODO(shess): Port to 64-bit. - #if ARCH_CPU_32_BITS + bool WaitForSingleProcess(ProcessHandle handle, int64 wait_milliseconds) { + ProcessHandle parent_pid = GetParentProcessId(handle); + ProcessHandle our_pid = Process::Current().handle(); + if (parent_pid != our_pid) { +-#if defined(OS_MACOSX) +- // On Mac we can wait on non child processes. ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) ++ // On BSD we can wait on non child processes. + return WaitForSingleNonChildProcess(handle, wait_milliseconds); + #else + // Currently on Linux we can't handle non child processes. + NOTIMPLEMENTED(); +-#endif // OS_MACOSX ++#endif // OS_MACOSX || OS_FREEBSD + } + bool waitpid_success; + int status; diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi index 7376a4ca29cf..2ac944f4ff02 100644 --- a/www/chromium/files/patch-build__common.gypi +++ b/www/chromium/files/patch-build__common.gypi @@ -1,15 +1,26 @@ ---- build/common.gypi.orig 2011-06-26 17:27:43.439782011 +0300 -+++ build/common.gypi 2011-06-26 17:27:57.372781037 +0300 -@@ -445,7 +445,7 @@ +--- build/common.gypi.orig 2011-09-12 11:35:33.000000000 +0300 ++++ build/common.gypi 2011-09-16 19:05:37.000000000 +0300 +@@ -303,6 +303,10 @@ + 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', + 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', + ++ 'os_ver%': 0, ++ 'prefix_dir%': '/usr', ++ 'use_system_tcmalloc%': 0, ++ + # The release channel that this build targets. This is used to restrict + # channel-specific build options, like which installer packages to create. + # The default is 'all', which does no channel-specific filtering. +@@ -516,7 +520,7 @@ # This is used to tweak build flags for gcc 4.4. 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', # Figure out the python architecture to decide if we build pyauto. - 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/lib/libpython<(python_ver).so.1.0)', -+ 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/local/lib/libpython<(python_ver).so.1.0)', ++ 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)<(prefix_dir)/lib/libpython<(python_ver).so.1)', 'conditions': [ ['branding=="Chrome"', { 'linux_breakpad%': 1, -@@ -850,7 +850,7 @@ +@@ -956,7 +960,7 @@ ['exclude', '(^|/)(gtk|x11)_[^/]*\\.(h|cc)$'], ], }], @@ -18,3 +29,19 @@ 'sources/': [ ['exclude', '_linux(_unittest)?\\.(h|cc)$'], ['exclude', '(^|/)linux/'], +@@ -1536,6 +1540,15 @@ + 'ldflags': [ + '-Wl,--no-keep-memory', + ], ++ 'ldflags!': [ ++ '-ldl', ++ ], ++ 'libraries!': [ ++ '-ldl', ++ ], ++ 'cflags!': [ ++ '-fno-signed-zeros', ++ ], + }, + }], + ['OS=="solaris"', { diff --git a/www/chromium/files/patch-build__features_override.gypi b/www/chromium/files/patch-build__features_override.gypi deleted file mode 100644 index 2f8dce309cf9..000000000000 --- a/www/chromium/files/patch-build__features_override.gypi +++ /dev/null @@ -1,11 +0,0 @@ ---- build/features_override.gypi.orig 2011-06-24 11:30:52.000000000 +0300 -+++ build/features_override.gypi 2011-06-26 17:35:55.815781753 +0300 -@@ -110,7 +110,7 @@ - # TODO(crogers): For the moment Windows is only enabled for - # Google-branded build, since the FFmpeg DLLs need to be re-built - # for chromium. -- ['OS=="mac" or OS=="linux" or (OS=="win" and branding=="Chrome")', { -+ ['OS=="mac" or OS=="linux" or OS=="freebsd" or (OS=="win" and branding=="Chrome")', { - 'feature_defines': [ - 'ENABLE_WEB_AUDIO=1', - ], diff --git a/www/chromium/files/patch-build__linux__system.gyp b/www/chromium/files/patch-build__linux__system.gyp deleted file mode 100644 index 902ad94a0252..000000000000 --- a/www/chromium/files/patch-build__linux__system.gyp +++ /dev/null @@ -1,15 +0,0 @@ ---- build/linux/system.gyp.orig 2011-04-17 22:18:20.000000000 +0200 -+++ build/linux/system.gyp 2011-04-17 22:18:57.000000000 +0200 -@@ -309,12 +309,6 @@ - '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)', - ], - }, -- }, { -- 'link_settings': { -- 'libraries': [ -- '-ldl', -- ], -- }, - }], - ], - }], diff --git a/www/chromium/files/patch-chrome__browser__browser_about_handler.cc b/www/chromium/files/patch-chrome__browser__browser_about_handler.cc index 7f3a7b87e817..9a90243508cf 100644 --- a/www/chromium/files/patch-chrome__browser__browser_about_handler.cc +++ b/www/chromium/files/patch-chrome__browser__browser_about_handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_about_handler.cc.orig 2011-04-15 11:01:47.000000000 +0300 -+++ chrome/browser/browser_about_handler.cc 2011-04-15 21:51:24.189641560 +0300 -@@ -71,7 +71,7 @@ +--- chrome/browser/browser_about_handler.cc.orig 2011-07-28 11:01:59.000000000 +0300 ++++ chrome/browser/browser_about_handler.cc 2011-08-28 20:55:56.000000000 +0300 +@@ -76,7 +76,7 @@ #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/version_loader.h" #include "content/browser/zygote_host_linux.h" @@ -9,25 +9,25 @@ #include "content/browser/zygote_host_linux.h" #endif -@@ -126,7 +126,7 @@ - const char kPluginsPath[] = "plugins"; - const char kSyncInternalsPath[] = "sync-internals"; - +@@ -146,7 +146,7 @@ + #if defined(OS_WIN) + chrome::kChromeUIConflictsHost, + #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) - const char kLinuxProxyConfigPath[] = "linux-proxy-config"; - const char kSandboxPath[] = "sandbox"; + chrome::kChromeUILinuxProxyConfigHost, + chrome::kChromeUISandboxHost, + #endif +@@ -194,7 +194,7 @@ + #if defined(USE_TCMALLOC) + chrome::kChromeUITCMallocHost, #endif -@@ -160,7 +160,7 @@ - kTcmallocPath, - kTermsPath, - kVersionPath, -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) - kSandboxPath, + chrome::kChromeUILinuxProxyConfigHost, + chrome::kChromeUISandboxHost, #endif - #if defined(OS_CHROMEOS) -@@ -648,7 +648,7 @@ +@@ -993,7 +993,7 @@ return data; } @@ -35,13 +35,13 @@ +#if defined(OS_LINUX) || defined(OS_FREEBSD) std::string AboutLinuxProxyConfig() { std::string data; - data.append("<!DOCTYPE HTML>\n"); -@@ -863,7 +863,7 @@ + AppendHeader(&data, 0, +@@ -1409,7 +1409,7 @@ response = ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_TERMS_HTML).as_string(); #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) - } else if (path == kLinuxProxyConfigPath) { + } else if (host == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); - } else if (path == kSandboxPath) { + } else if (host == chrome::kChromeUISandboxHost) { diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi deleted file mode 100644 index 8137f17d50ad..000000000000 --- a/www/chromium/files/patch-chrome__chrome_browser.gypi +++ /dev/null @@ -1,15 +0,0 @@ ---- chrome/chrome_browser.gypi.orig 2011-06-24 11:31:19.000000000 +0300 -+++ chrome/chrome_browser.gypi 2011-06-26 20:14:19.677781532 +0300 -@@ -3679,12 +3679,6 @@ - '../build/linux/system.gyp:x11', - '../third_party/undoview/undoview.gyp:undoview', - ], -- 'link_settings': { -- 'libraries': [ -- # For dlsym() in 'browser/zygote_main_linux.cc' -- '-ldl', -- ], -- }, - 'sources!': [ - 'browser/ui/views/extensions/extension_view.cc', - 'browser/ui/views/extensions/extension_view.h', diff --git a/www/chromium/files/patch-chrome__chrome_tests.gypi b/www/chromium/files/patch-chrome__chrome_tests.gypi index 1cd190cce41f..dfc3760c37cc 100644 --- a/www/chromium/files/patch-chrome__chrome_tests.gypi +++ b/www/chromium/files/patch-chrome__chrome_tests.gypi @@ -1,15 +1,6 @@ ---- chrome/chrome_tests.gypi.orig 2011-06-24 11:31:19.000000000 +0300 -+++ chrome/chrome_tests.gypi 2011-06-26 20:25:42.958784006 +0300 -@@ -2963,7 +2963,7 @@ - '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', -@@ -3964,7 +3964,7 @@ +--- chrome/chrome_tests.gypi.orig 2011-07-28 11:02:03.000000000 +0300 ++++ chrome/chrome_tests.gypi 2011-09-06 22:02:18.000000000 +0300 +@@ -4266,7 +4266,7 @@ '../courgette/courgette.gyp:courgette_unittests', 'browser_tests', ]}], diff --git a/www/chromium/files/patch-chrome__common__chrome_constants.cc b/www/chromium/files/patch-chrome__common__chrome_constants.cc deleted file mode 100644 index b29f65fee3f1..000000000000 --- a/www/chromium/files/patch-chrome__common__chrome_constants.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/common/chrome_constants.cc.orig 2011-01-06 10:02:01.000000000 +0100 -+++ chrome/common/chrome_constants.cc 2011-01-09 20:43:41.000000000 +0100 -@@ -27,7 +27,7 @@ - #if defined(OS_WIN) - const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome.exe"); - const FilePath::CharType kHelperProcessExecutableName[] = FPL("chrome.exe"); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) - const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome"); - // Helper processes end up with a name of "exe" due to execing via - // /proc/self/exe. See bug 22703. -@@ -40,7 +40,7 @@ - #if defined(OS_WIN) - const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome.exe"); - const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome.exe"); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) - const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome"); - const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome"); - #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-chrome__common__url_constants.cc b/www/chromium/files/patch-chrome__common__url_constants.cc new file mode 100644 index 000000000000..48aca293ccb5 --- /dev/null +++ b/www/chromium/files/patch-chrome__common__url_constants.cc @@ -0,0 +1,11 @@ +--- chrome/common/url_constants.cc.orig 2011-09-10 15:16:44.000000000 +0300 ++++ chrome/common/url_constants.cc 2011-09-10 15:17:50.000000000 +0300 +@@ -158,7 +158,7 @@ + const char kChromeUIThemePath[] = "theme"; + const char kChromeUIThumbnailPath[] = "thumb"; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; + const char kChromeUISandboxHost[] = "sandbox"; + #endif diff --git a/www/chromium/files/patch-chrome__common__url_constants.h b/www/chromium/files/patch-chrome__common__url_constants.h new file mode 100644 index 000000000000..fb8e8ac9892a --- /dev/null +++ b/www/chromium/files/patch-chrome__common__url_constants.h @@ -0,0 +1,11 @@ +--- chrome/common/url_constants.h.orig 2011-09-10 15:16:51.000000000 +0300 ++++ chrome/common/url_constants.h 2011-09-10 15:17:26.000000000 +0300 +@@ -156,7 +156,7 @@ + extern const char kChromeUIThemePath[]; + extern const char kChromeUIThumbnailPath[]; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + extern const char kChromeUILinuxProxyConfigHost[]; + extern const char kChromeUISandboxHost[]; + #endif diff --git a/www/chromium/files/patch-chrome__test__automation__automation_proxy_uitest.cc b/www/chromium/files/patch-chrome__test__automation__automation_proxy_uitest.cc deleted file mode 100644 index 46f9d39234c8..000000000000 --- a/www/chromium/files/patch-chrome__test__automation__automation_proxy_uitest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./chrome/test/automation/automation_proxy_uitest.cc.orig 2010-12-16 02:12:11.000000000 +0100 -+++ ./chrome/test/automation/automation_proxy_uitest.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -1327,7 +1327,7 @@ - #endif // defined(OS_WIN) - - // TODO(port): Need to port autocomplete_edit_proxy.* first. --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD) - TEST_F(AutomationProxyTest, AutocompleteGetSetText) { - scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); - ASSERT_TRUE(browser.get()); -@@ -1371,7 +1371,7 @@ - EXPECT_EQ(text_to_set2, actual_text2); - } - --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD) - - #if defined(OS_MACOSX) - // Disabled, http://crbug.com/48601. diff --git a/www/chromium/files/patch-chrome__test__chrome_process_util.cc b/www/chromium/files/patch-chrome__test__chrome_process_util.cc deleted file mode 100644 index a4899669fadf..000000000000 --- a/www/chromium/files/patch-chrome__test__chrome_process_util.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- ./chrome/test/chrome_process_util.cc.orig 2010-12-16 02:12:11.000000000 +0100 -+++ ./chrome/test/chrome_process_util.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -61,7 +61,7 @@ - result.push_back(process_entry->pid()); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - // On Linux we might be running with a zygote process for the renderers. - // Because of that we sweep the list of processes again and pick those which - // are children of one of the processes that we've already seen. -@@ -72,9 +72,9 @@ - while (const base::ProcessEntry* process_entry = it.NextProcessEntry()) - result.push_back(process_entry->pid()); - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_FREEBSD) - --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_POSIX) - // On Mac OS X we run the subprocesses with a different bundle, and - // on Linux via /proc/self/exe, so they end up with a different - // name. We must collect them in a second pass. diff --git a/www/chromium/files/patch-chrome__test__in_process_browser_test.cc b/www/chromium/files/patch-chrome__test__in_process_browser_test.cc new file mode 100644 index 000000000000..4493056a2649 --- /dev/null +++ b/www/chromium/files/patch-chrome__test__in_process_browser_test.cc @@ -0,0 +1,13 @@ +--- chrome/test/in_process_browser_test.cc.orig 2011-09-14 00:41:45.000000000 +0300 ++++ chrome/test/in_process_browser_test.cc 2011-09-14 00:46:15.000000000 +0300 +@@ -41,6 +41,10 @@ + #include "net/test/test_server.h" + #include "sandbox/src/dep.h" + ++#if defined(OS_FREEBSD) ++#include <signal.h> ++#endif ++ + #if defined(OS_MACOSX) + #include "base/mac/mac_util.h" + #include "base/system_monitor/system_monitor.h" diff --git a/www/chromium/files/patch-chrome__test__page_cycler__page_cycler_test.cc b/www/chromium/files/patch-chrome__test__page_cycler__page_cycler_test.cc deleted file mode 100644 index 4d9fecf63a89..000000000000 --- a/www/chromium/files/patch-chrome__test__page_cycler__page_cycler_test.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/test/page_cycler/page_cycler_test.cc.orig 2010-12-16 02:12:11.000000000 +0100 -+++ ./chrome/test/page_cycler/page_cycler_test.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -298,7 +298,7 @@ - dir = dir.AppendASCII("reference_build"); - #if defined(OS_WIN) - dir = dir.AppendASCII("chrome"); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) - dir = dir.AppendASCII("chrome_linux"); - #elif defined(OS_MACOSX) - dir = dir.AppendASCII("chrome_mac"); diff --git a/www/chromium/files/patch-chrome__test__reliability__page_load_test.cc b/www/chromium/files/patch-chrome__test__reliability__page_load_test.cc deleted file mode 100644 index 438201690b45..000000000000 --- a/www/chromium/files/patch-chrome__test__reliability__page_load_test.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/test/reliability/page_load_test.cc.orig 2010-12-16 02:12:11.000000000 +0100 -+++ ./chrome/test/reliability/page_load_test.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -165,7 +165,7 @@ - scoped_ptr<FileVersionInfo> file_info; - file_info.reset(FileVersionInfo::CreateFileVersionInfo(kChromeDll)); - last_change = WideToASCII(file_info->last_change()); --#elif defined(OS_LINUX) || defined(OS_MACOSX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_MACOSX) - // TODO(fmeawad): On Mac, the version retrieved here belongs to the test - // module and not the chrome binary, need to be changed to chrome binary - // instead. diff --git a/www/chromium/files/patch-chrome__test__startup__feature_startup_test.cc b/www/chromium/files/patch-chrome__test__startup__feature_startup_test.cc deleted file mode 100644 index a9e54c079dc4..000000000000 --- a/www/chromium/files/patch-chrome__test__startup__feature_startup_test.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/test/startup/feature_startup_test.cc.orig 2010-12-16 02:12:00.000000000 +0100 -+++ ./chrome/test/startup/feature_startup_test.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -192,7 +192,7 @@ - RunNewTabTimingTest(); - } - --#if defined(OS_LINUX) -+#if defined(TOOLKIT_GTK) - TEST_F(NewTabUIStartupTest, GtkThemeCold) { - RunStartupTest("tab_gtk_theme_cold", false /* cold */, - false /* not important */, diff --git a/www/chromium/files/patch-chrome__test__testing_browser_process.h b/www/chromium/files/patch-chrome__test__testing_browser_process.h index d86647e47e9f..77a2ab0e2e4d 100644 --- a/www/chromium/files/patch-chrome__test__testing_browser_process.h +++ b/www/chromium/files/patch-chrome__test__testing_browser_process.h @@ -1,16 +1,7 @@ ---- chrome/test/testing_browser_process.h.orig 2011-04-15 11:02:00.000000000 +0300 -+++ chrome/test/testing_browser_process.h 2011-04-16 21:00:37.080070649 +0300 -@@ -49,7 +49,7 @@ - - virtual IOThread* io_thread(); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - virtual base::Thread* background_x11_thread(); - #endif - -@@ -120,7 +120,7 @@ - +--- chrome/test/testing_browser_process.h.orig 2011-07-28 11:01:47.000000000 +0300 ++++ chrome/test/testing_browser_process.h 2011-09-06 22:56:31.000000000 +0300 +@@ -104,7 +104,7 @@ + virtual bool plugin_finder_disabled() const; virtual void CheckForInspectorFiles() {} -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome__test__ui__sunspider_uitest.cc b/www/chromium/files/patch-chrome__test__ui__sunspider_uitest.cc deleted file mode 100644 index 2a3bbf8e14a4..000000000000 --- a/www/chromium/files/patch-chrome__test__ui__sunspider_uitest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/test/ui/sunspider_uitest.cc.orig 2010-12-16 02:12:11.000000000 +0100 -+++ ./chrome/test/ui/sunspider_uitest.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -129,7 +129,7 @@ - dir = dir.AppendASCII("reference_build"); - #if defined(OS_WIN) - dir = dir.AppendASCII("chrome"); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) - dir = dir.AppendASCII("chrome_linux"); - #elif defined(OS_MACOSX) - dir = dir.AppendASCII("chrome_mac"); diff --git a/www/chromium/files/patch-chrome__test__ui__v8_benchmark_uitest.cc b/www/chromium/files/patch-chrome__test__ui__v8_benchmark_uitest.cc deleted file mode 100644 index fa3c78a7074a..000000000000 --- a/www/chromium/files/patch-chrome__test__ui__v8_benchmark_uitest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/test/ui/v8_benchmark_uitest.cc.orig 2010-12-16 02:12:11.000000000 +0100 -+++ ./chrome/test/ui/v8_benchmark_uitest.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -131,7 +131,7 @@ - dir = dir.AppendASCII("reference_build"); - #if defined(OS_WIN) - dir = dir.AppendASCII("chrome"); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) - dir = dir.AppendASCII("chrome_linux"); - #elif defined(OS_MACOSX) - dir = dir.AppendASCII("chrome_mac"); diff --git a/www/chromium/files/patch-chrome__test__ui_test_utils.cc b/www/chromium/files/patch-chrome__test__ui_test_utils.cc deleted file mode 100644 index 774c2921d008..000000000000 --- a/www/chromium/files/patch-chrome__test__ui_test_utils.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/test/ui_test_utils.cc.orig 2010-12-16 02:12:11.000000000 +0100 -+++ ./chrome/test/ui_test_utils.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -357,7 +357,7 @@ - #if defined(TOOLKIT_VIEWS) - views::AcceleratorHandler handler; - loop->Run(&handler); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) - loop->Run(NULL); - #else - loop->Run(); diff --git a/www/chromium/files/patch-chrome__test__url_fetch_test__url_fetch_test.cc b/www/chromium/files/patch-chrome__test__url_fetch_test__url_fetch_test.cc deleted file mode 100644 index 9fade75373dd..000000000000 --- a/www/chromium/files/patch-chrome__test__url_fetch_test__url_fetch_test.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./chrome/test/url_fetch_test/url_fetch_test.cc.orig 2010-12-16 02:12:11.000000000 +0100 -+++ ./chrome/test/url_fetch_test/url_fetch_test.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -35,7 +35,7 @@ - dir = dir.AppendASCII("reference_build"); - #if defined(OS_WIN) - dir = dir.AppendASCII("chrome"); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) - dir = dir.AppendASCII("chrome_linux"); - #elif defined(OS_MACOSX) - dir = dir.AppendASCII("chrome_mac"); diff --git a/www/chromium/files/patch-content__browser__geolocation__location_provider.cc b/www/chromium/files/patch-content__browser__geolocation__location_provider.cc new file mode 100644 index 000000000000..db03211bf341 --- /dev/null +++ b/www/chromium/files/patch-content__browser__geolocation__location_provider.cc @@ -0,0 +1,11 @@ +--- content/browser/geolocation/location_provider.cc.orig 2011-09-15 01:38:39.000000000 +0300 ++++ content/browser/geolocation/location_provider.cc 2011-09-15 01:39:07.000000000 +0300 +@@ -56,7 +56,7 @@ + } + } + +-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN) ++#if !defined(OS_LINUX) && !defined(OS_FREEBSD) && !defined(OS_MACOSX) && !defined(OS_WIN) + LocationProviderBase* NewSystemLocationProvider() { + return NULL; + } diff --git a/www/chromium/files/patch-content__common__plugin_messages.h b/www/chromium/files/patch-content__common__plugin_messages.h index 4222f37a9ec1..bed300ec9240 100644 --- a/www/chromium/files/patch-content__common__plugin_messages.h +++ b/www/chromium/files/patch-content__common__plugin_messages.h @@ -1,11 +1,38 @@ ---- content/common/plugin_messages.h.orig 2010-12-16 02:12:13.000000000 +0100 -+++ content/common/plugin_messages.h 2010-12-20 20:15:08.000000000 +0100 -@@ -116,7 +116,7 @@ - TransportDIB::Handle windowless_buffer; - TransportDIB::Handle background_buffer; +--- content/common/plugin_messages.h.orig 2011-07-28 11:01:09.000000000 +0300 ++++ content/common/plugin_messages.h 2011-09-06 23:29:54.000000000 +0300 +@@ -111,7 +111,7 @@ + gfx::PluginWindowHandle /* output: X window id */) + #endif -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_FREEBSD) - // This field contains a key that the plug-in process is expected to return - // to the renderer in its ACK message, unless the value is -1, in which case - // no ACK message is required. Other than the special -1 value, the values + // On Mac OS X, we need the browser to keep track of plugin windows so + // that it can add and remove them from stacking groups, hide and show the + // menu bar, etc. We pass the window rect for convenience so that the +@@ -206,7 +206,7 @@ + IPC_MESSAGE_ROUTED1(PluginMsg_SetContentAreaFocus, + bool /* has_focus */) + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + IPC_MESSAGE_ROUTED1(PluginMsg_SetWindowFocus, + bool /* has_focus */) + +@@ -278,7 +278,7 @@ + IPC_MESSAGE_CONTROL1(PluginMsg_ResetModalDialogEvent, + gfx::NativeViewId /* containing_window */) + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + // This message, used only on 10.6 and later, transmits the "fake" + // window handle allocated by the browser on behalf of the renderer + // to the GPU plugin. +@@ -358,7 +358,7 @@ + + IPC_MESSAGE_CONTROL0(PluginHostMsg_PluginShuttingDown) + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + IPC_MESSAGE_ROUTED1(PluginHostMsg_FocusChanged, + bool /* focused */) + diff --git a/www/chromium/files/patch-content__renderer__render_view.cc b/www/chromium/files/patch-content__renderer__render_view.cc new file mode 100644 index 000000000000..71157cce85e5 --- /dev/null +++ b/www/chromium/files/patch-content__renderer__render_view.cc @@ -0,0 +1,29 @@ +--- content/renderer/render_view.cc.orig 2011-08-30 11:58:21.000000000 +0300 ++++ content/renderer/render_view.cc 2011-09-11 22:31:33.000000000 +0300 +@@ -437,7 +437,7 @@ + file_chooser_completions_.pop_front(); + } + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + // Destroy all fake plugin window handles on the browser side. + while (!fake_plugin_window_handles_.empty()) { + // Make sure no NULL plugin window handles were inserted into this list. +@@ -1522,7 +1522,7 @@ + } + + bool RenderView::isSmartInsertDeleteEnabled() { +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + return true; + #else + return false; +@@ -4187,7 +4187,7 @@ + return true; + } + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + void RenderView::PluginFocusChanged(bool focused, int plugin_id) { + IPC::Message* msg = new ViewHostMsg_PluginFocusChanged(routing_id(), + focused, plugin_id); diff --git a/www/chromium/files/patch-content__renderer__render_view.h b/www/chromium/files/patch-content__renderer__render_view.h new file mode 100644 index 000000000000..17b9d7ca4971 --- /dev/null +++ b/www/chromium/files/patch-content__renderer__render_view.h @@ -0,0 +1,29 @@ +--- content/renderer/render_view.h.orig 2011-09-10 18:40:54.000000000 +0300 ++++ content/renderer/render_view.h 2011-09-10 19:13:46.000000000 +0300 +@@ -312,7 +312,7 @@ + // Request updated policy regarding firewall NAT traversal being enabled. + void RequestRemoteAccessClientFirewallTraversal(); + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + // Informs the render view that the given plugin has gained or lost focus. + void PluginFocusChanged(bool focused, int plugin_id); + +@@ -654,7 +654,7 @@ + FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnSetTextDirection); + FRIEND_TEST_ALL_PREFIXES(RenderViewTest, StaleNavigationsIgnored); + FRIEND_TEST_ALL_PREFIXES(RenderViewTest, UpdateTargetURLWithInvalidURL); +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp); + #endif + FRIEND_TEST_ALL_PREFIXES(RenderViewTest, SetHistoryLengthAndPrune); +@@ -1079,7 +1079,7 @@ + // states for the sizes). + base::OneShotTimer<RenderView> check_preferred_size_timer_; + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + // Track the fake plugin window handles allocated on the browser side for + // the accelerated compositor and (currently) accelerated plugins so that + // we can discard them when the view goes away. diff --git a/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.cc b/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.cc index d89d2fff037d..772b38d5ca50 100644 --- a/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.cc +++ b/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.cc @@ -1,51 +1,15 @@ ---- content/renderer/webplugin_delegate_proxy.cc.orig Mon Mar 14 19:30:50 2011 -+++ content/renderer/webplugin_delegate_proxy.cc Mon Mar 14 19:39:56 2011 -@@ -158,7 +158,7 @@ class ResourceClientProxy : public webkit::npapi::WebP - bool multibyte_response_expected_; - }; - +--- content/renderer/webplugin_delegate_proxy.cc.orig 2011-08-30 11:58:21.000000000 +0300 ++++ content/renderer/webplugin_delegate_proxy.cc 2011-09-11 22:57:59.000000000 +0300 +@@ -494,7 +494,7 @@ + static void CopyTransportDIBHandleForMessage( + const TransportDIB::Handle& handle_in, + TransportDIB::Handle* handle_out) { -#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) - static void ReleaseTransportDIB(TransportDIB* dib) { - if (dib) { - IPC::Message* message = new ViewHostMsg_FreeTransportDIB(dib->id()); -@@ -184,7 +184,7 @@ WebPluginDelegateProxy::WebPluginDelegateProxy( - } - - WebPluginDelegateProxy::~WebPluginDelegateProxy() { --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) - // Ask the browser to release old TransportDIB objects for which no - // PluginHostMsg_UpdateGeometry_ACK was ever received from the plugin - // process. -@@ -530,7 +530,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx: - bool bitmaps_changed = false; - - PluginMsg_UpdateGeometry_Param param; --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) - param.ack_key = -1; - #endif - -@@ -542,7 +542,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx: - bitmaps_changed = true; - - bool needs_background_store = transparent_; --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) - // We don't support transparency under QuickDraw, and CoreGraphics - // preserves transparency information (and does the compositing itself) - // so plugins don't need access to the page background. -@@ -614,7 +614,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx: - } - - void WebPluginDelegateProxy::ResetWindowlessBitmaps() { --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) - DCHECK(!background_store_.get()); - // The Mac TransportDIB implementation uses base::SharedMemory, which - // cannot be disposed of if an in-flight UpdateGeometry message refers to -@@ -675,12 +675,12 @@ bool WebPluginDelegateProxy::CreateSharedBitmap( ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + // On Mac, TransportDIB::Handle is typedef'ed to FileDescriptor, and + // FileDescriptor message fields needs to remain valid until the message is + // sent or else the sendmsg() call will fail. +@@ -644,12 +644,12 @@ scoped_ptr<TransportDIB>* memory, scoped_ptr<skia::PlatformCanvas>* canvas) { const size_t size = BitmapSizeForPluginRect(plugin_rect_); @@ -58,5 +22,5 @@ -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) TransportDIB::Handle handle; - IPC::Message* msg = new ViewHostMsg_AllocTransportDIB(size, true, &handle); + IPC::Message* msg = new ViewHostMsg_AllocTransportDIB(size, false, &handle); if (!RenderThread::current()->Send(msg)) diff --git a/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.h b/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.h index 03e86fd87dd6..d61b89975e60 100644 --- a/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.h +++ b/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.h @@ -1,5 +1,5 @@ ---- content/renderer/webplugin_delegate_proxy.h.orig 2011-03-23 00:46:31.521939657 +0200 -+++ content/renderer/webplugin_delegate_proxy.h 2011-03-23 00:47:12.163682393 +0200 +--- content/renderer/webplugin_delegate_proxy.h.orig 2011-09-11 19:07:19.000000000 +0300 ++++ content/renderer/webplugin_delegate_proxy.h 2011-09-11 19:07:36.000000000 +0300 @@ -21,7 +21,7 @@ #include "webkit/plugins/npapi/webplugininfo.h" #include "webkit/plugins/npapi/webplugin_delegate.h" @@ -7,9 +7,9 @@ -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_FREEBSD) #include "base/hash_tables.h" - #include "base/linked_ptr.h" + #include "base/memory/linked_ptr.h" #endif -@@ -216,7 +216,7 @@ +@@ -243,7 +243,7 @@ // point the window has already been destroyed). void WillDestroyWindow(); diff --git a/www/chromium/files/patch-crypto__encryptor.cc b/www/chromium/files/patch-crypto__encryptor.cc new file mode 100644 index 000000000000..b0e3fb84e00b --- /dev/null +++ b/www/chromium/files/patch-crypto__encryptor.cc @@ -0,0 +1,14 @@ +--- crypto/encryptor.cc.orig 2011-09-09 01:49:35.000000000 +0300 ++++ crypto/encryptor.cc 2011-09-09 01:56:01.000000000 +0300 +@@ -18,6 +18,11 @@ + #define bswap_16(x) OSSwapInt16(x) + #define bswap_32(x) OSSwapInt32(x) + #define bswap_64(x) OSSwapInt64(x) ++#elif defined(OS_FREEBSD) ++#include <sys/endian.h> ++#define bswap_16(x) bswap16(x) ++#define bswap_32(x) bswap32(x) ++#define bswap_64(x) bswap64(x) + #else + #include <byteswap.h> + #endif diff --git a/www/chromium/files/patch-gpu__demos__demos.gyp b/www/chromium/files/patch-gpu__demos__demos.gyp deleted file mode 100644 index 0643bdfa2786..000000000000 --- a/www/chromium/files/patch-gpu__demos__demos.gyp +++ /dev/null @@ -1,20 +0,0 @@ ---- gpu/demos/demos.gyp.orig 2011-06-24 11:30:31.000000000 +0300 -+++ gpu/demos/demos.gyp 2011-06-26 22:43:26.842781274 +0300 -@@ -14,7 +14,7 @@ - # also be compiled with -fPIC flag. Setting GYP_DEFINES="linux_fpic=1" - # compiles everything with -fPIC. Disable pepper demos on linux/x64 - # unless linux_fpic is 1. -- ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { -+ ['(OS=="linux" or OS=="freebsd") and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { - 'enable_pepper_demos%': 0, - }, { - 'enable_pepper_demos%': 1, -@@ -107,7 +107,7 @@ - ], - }, - 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { - # -gstabs, used in the official builds, causes an ICE. Remove it. - 'cflags!': ['-gstabs'], - }], diff --git a/www/chromium/files/patch-gpu__demos__framework__main_exe.cc b/www/chromium/files/patch-gpu__demos__framework__main_exe.cc deleted file mode 100644 index d937f06e55c6..000000000000 --- a/www/chromium/files/patch-gpu__demos__framework__main_exe.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- ./gpu/demos/framework/main_exe.cc.orig 2010-12-16 02:11:23.000000000 +0100 -+++ ./gpu/demos/framework/main_exe.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -8,9 +8,9 @@ - #include "base/logging.h" - #include "gpu/demos/framework/window.h" - --#if defined(OS_LINUX) -+#if defined(TOOLKIT_USES_GTK) - #include <gtk/gtk.h> --#endif // OS_LINUX -+#endif // TOOLKIT_USES_GTK - - namespace { - static const int kWindowWidth = 512; -@@ -18,9 +18,9 @@ - } // namespace. - - int main(int argc, char** argv) { --#if defined(OS_LINUX) -+#if defined(TOOLKIT_USES_GTK) - gtk_init(&argc, &argv); --#endif // OS_LINUX -+#endif // TOOLKIT_USES_GTK - - // AtExitManager is used by singleton classes to delete themselves when - // the program terminates. diff --git a/www/chromium/files/patch-gpu__gpu.gyp b/www/chromium/files/patch-gpu__gpu.gyp new file mode 100644 index 000000000000..4e4552be6575 --- /dev/null +++ b/www/chromium/files/patch-gpu__gpu.gyp @@ -0,0 +1,10 @@ +--- gpu/gpu.gyp.orig 2011-09-14 00:37:31.000000000 +0300 ++++ gpu/gpu.gyp 2011-09-14 00:36:48.000000000 +0300 +@@ -328,6 +328,7 @@ + ], + 'include_dirs': [ + '..', ++ '<(prefix_dir)/include', + ], + 'sources': [ + 'command_buffer/common/gl_mock.h', diff --git a/www/chromium/files/patch-ipc__sync_socket_unittest.cc b/www/chromium/files/patch-ipc__sync_socket_unittest.cc deleted file mode 100644 index 4e811e586f07..000000000000 --- a/www/chromium/files/patch-ipc__sync_socket_unittest.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- ipc/sync_socket_unittest.cc.orig 2011-01-06 10:01:35.000000000 +0100 -+++ ipc/sync_socket_unittest.cc 2011-01-09 19:49:43.000000000 +0100 -@@ -20,9 +20,9 @@ - #include "testing/gtest/include/gtest/gtest.h" - #include "testing/multiprocess_func_list.h" - --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_POSIX) - #include "base/file_descriptor_posix.h" --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_POSIX) - - enum IPCMessageIds { - UNUSED_IPC_TYPE, diff --git a/www/chromium/files/patch-media__base__media_switches.cc b/www/chromium/files/patch-media__base__media_switches.cc deleted file mode 100644 index 4ab640162e64..000000000000 --- a/www/chromium/files/patch-media__base__media_switches.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./media/base/media_switches.cc.orig 2010-12-16 02:11:21.000000000 +0100 -+++ ./media/base/media_switches.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -6,7 +6,7 @@ - - namespace switches { - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - // The Alsa device to use when opening an audio stream. - const char kAlsaOutputDevice[] = "alsa-output-device"; - // The Alsa device to use when opening an audio input stream. diff --git a/www/chromium/files/patch-media__base__media_switches.h b/www/chromium/files/patch-media__base__media_switches.h deleted file mode 100644 index ca1ef25e9ac6..000000000000 --- a/www/chromium/files/patch-media__base__media_switches.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./media/base/media_switches.h.orig 2010-12-16 02:11:21.000000000 +0100 -+++ ./media/base/media_switches.h 2010-12-20 20:15:08.000000000 +0100 -@@ -11,7 +11,7 @@ - - namespace switches { - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - extern const char kAlsaOutputDevice[]; - extern const char kAlsaInputDevice[]; - #endif diff --git a/www/chromium/files/patch-net__base__host_resolver_impl.cc b/www/chromium/files/patch-net__base__host_resolver_impl.cc deleted file mode 100644 index 8a1b9a487a56..000000000000 --- a/www/chromium/files/patch-net__base__host_resolver_impl.cc +++ /dev/null @@ -1,34 +0,0 @@ ---- ./net/base/host_resolver_impl.cc.orig 2010-12-16 02:11:31.000000000 +0100 -+++ ./net/base/host_resolver_impl.cc 2010-12-20 20:15:08.000000000 +0100 -@@ -199,13 +199,11 @@ - std::vector<int> GetAllGetAddrinfoOSErrors() { - int os_errors[] = { - #if defined(OS_POSIX) -- EAI_ADDRFAMILY, - EAI_AGAIN, - EAI_BADFLAGS, - EAI_FAIL, - EAI_FAMILY, - EAI_MEMORY, -- EAI_NODATA, - EAI_NONAME, - EAI_SERVICE, - EAI_SOCKTYPE, -@@ -919,7 +917,7 @@ - #if defined(OS_WIN) - EnsureWinsockInit(); - #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - if (HaveOnlyLoopbackAddresses()) - additional_resolver_flags_ |= HOST_RESOLVER_LOOPBACK_ONLY; - #endif -@@ -1316,7 +1314,7 @@ - ipv6_probe_job_ = new IPv6ProbeJob(this); - ipv6_probe_job_->Start(); - } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - if (HaveOnlyLoopbackAddresses()) { - additional_resolver_flags_ |= HOST_RESOLVER_LOOPBACK_ONLY; - } else { diff --git a/www/chromium/files/patch-net__base__host_resolver_proc.cc b/www/chromium/files/patch-net__base__host_resolver_proc.cc deleted file mode 100644 index 5035e513624b..000000000000 --- a/www/chromium/files/patch-net__base__host_resolver_proc.cc +++ /dev/null @@ -1,35 +0,0 @@ ---- net/base/host_resolver_proc.cc.orig 2011-03-15 05:50:10.000000000 +0200 -+++ net/base/host_resolver_proc.cc 2011-03-15 05:50:34.000000000 +0200 -@@ -6,15 +6,15 @@ - - #include "build/build_config.h" - --#if defined(OS_POSIX) && !defined(OS_MACOSX) --#include <resolv.h> --#endif -- - #include "base/logging.h" - #include "net/base/address_list.h" - #include "net/base/dns_reload_timer.h" - #include "net/base/net_errors.h" - #include "net/base/sys_addrinfo.h" -+#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#include <netdb.h> /* EAI_NODATA */ -+#include <resolv.h> -+#endif - - namespace net { - -@@ -248,7 +248,11 @@ - #if defined(OS_WIN) - if (err != WSAHOST_NOT_FOUND && err != WSANO_DATA) - return ERR_NAME_RESOLUTION_FAILED; --#elif defined(OS_POSIX) -+#elif defined(OS_FREEBSD) -+ // EAI_NODATA is obsolete [RFC 3493]. -+ if (err != EAI_NONAME) -+ return ERR_NAME_RESOLUTION_FAILED; -+#elif defined(OS_POSIX) - if (err != EAI_NONAME && err != EAI_NODATA) - return ERR_NAME_RESOLUTION_FAILED; - #endif diff --git a/www/chromium/files/patch-remoting__remoting.gyp b/www/chromium/files/patch-remoting__remoting.gyp new file mode 100644 index 000000000000..eaf803408485 --- /dev/null +++ b/www/chromium/files/patch-remoting__remoting.gyp @@ -0,0 +1,23 @@ +--- remoting/remoting.gyp.orig 2011-09-07 02:04:45.000000000 +0300 ++++ remoting/remoting.gyp 2011-09-07 02:08:27.000000000 +0300 +@@ -53,6 +53,20 @@ + 'resources/linux/chromoting16.png', + ], + }], ++ ['OS=="freebsd" and target_arch=="x64"', { ++ 'name_suffix': '- FreeBSD - amd64', ++ 'remoting_it2me_os_files': [ ++ 'resources/linux/chromoting128.png', ++ 'resources/linux/chromoting16.png', ++ ], ++ }], ++ ['OS=="freebsd" and target_arch!="x64"', { ++ 'name_suffix': '- FreeBSD', ++ 'remoting_it2me_os_files': [ ++ 'resources/linux/chromoting128.png', ++ 'resources/linux/chromoting16.png', ++ ], ++ }], + ['OS=="win"', { + 'plugin_extension': 'dll', + 'plugin_prefix': '', diff --git a/www/chromium/files/patch-skia__skia.gyp b/www/chromium/files/patch-skia__skia.gyp deleted file mode 100644 index cd26fdeba279..000000000000 --- a/www/chromium/files/patch-skia__skia.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- skia/skia.gyp.orig 2011-08-06 10:01:12.000000000 +0200 -+++ skia/skia.gyp 2011-08-14 23:28:45.000000000 +0200 -@@ -752,7 +752,7 @@ - '../third_party/skia/src/opts/opts_check_SSE2.cpp' - ], - }], -- ['clang==1', { -+ ['OS=="freebsd"', { - 'defines': [ - # Remove all use of __restrict__ -- skia uses it incorrectly, - # and clang is more strict about it. diff --git a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h new file mode 100644 index 000000000000..f85aa6746568 --- /dev/null +++ b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h @@ -0,0 +1,21 @@ +--- testing/gtest/include/gtest/internal/gtest-port.h.orig 2011-09-15 00:02:57.000000000 +0300 ++++ testing/gtest/include/gtest/internal/gtest-port.h 2011-09-14 23:56:19.000000000 +0300 +@@ -229,6 +229,9 @@ + # ifdef ANDROID + # define GTEST_OS_LINUX_ANDROID 1 + # endif // ANDROID ++#elif defined __FreeBSD__ ++# define GTEST_OS_LINUX 1 ++# define GTEST_OS_FREEBSD 1 + #elif defined __MVS__ + # define GTEST_OS_ZOS 1 + #elif defined(__sun) && defined(__SVR4) +@@ -505,7 +508,7 @@ + #ifndef GTEST_HAS_CLONE + // The user didn't tell us, so we need to figure it out. + +-# if GTEST_OS_LINUX && !defined(__ia64__) ++# if GTEST_OS_LINUX && !GTEST_OS_FREEBSD && !defined(__ia64__) + # define GTEST_HAS_CLONE 1 + # else + # define GTEST_HAS_CLONE 0 diff --git a/www/chromium/files/patch-testing__gtest__src__gtest.cc b/www/chromium/files/patch-testing__gtest__src__gtest.cc new file mode 100644 index 000000000000..e19b35b21c68 --- /dev/null +++ b/www/chromium/files/patch-testing__gtest__src__gtest.cc @@ -0,0 +1,13 @@ +--- testing/gtest/src/gtest.cc.orig 2011-09-14 23:58:20.000000000 +0300 ++++ testing/gtest/src/gtest.cc 2011-09-15 00:01:10.000000000 +0300 +@@ -114,6 +114,10 @@ + + #endif // GTEST_OS_LINUX + ++#if GTEST_OS_FREEBSD ++# include <sys/socket.h> ++#endif ++ + #if GTEST_HAS_EXCEPTIONS + # include <stdexcept> + #endif diff --git a/www/chromium/files/patch-third_party__WebKit__Source__WebKit__chromium__WebKit.gyp b/www/chromium/files/patch-third_party__WebKit__Source__WebKit__chromium__WebKit.gyp new file mode 100644 index 000000000000..1ea0497950da --- /dev/null +++ b/www/chromium/files/patch-third_party__WebKit__Source__WebKit__chromium__WebKit.gyp @@ -0,0 +1,10 @@ +--- third_party/WebKit/Source/WebKit/chromium/WebKit.gyp.orig 2011-09-15 00:29:43.000000000 +0300 ++++ third_party/WebKit/Source/WebKit/chromium/WebKit.gyp 2011-09-15 00:30:28.000000000 +0300 +@@ -1142,6 +1142,7 @@ + ], + 'include_dirs': [ + '<(chromium_src_dir)', ++ '<(prefix_dir)/include', + '../../../Tools/DumpRenderTree/TestNetscapePlugIn', + '../../../Tools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders', + ], diff --git a/www/chromium/files/patch-third_party__ffmpeg__config__Chrome__freebsd__ia32__config.h b/www/chromium/files/patch-third_party__ffmpeg__config__Chrome__freebsd__ia32__config.h deleted file mode 100644 index 29b8ad877235..000000000000 --- a/www/chromium/files/patch-third_party__ffmpeg__config__Chrome__freebsd__ia32__config.h +++ /dev/null @@ -1,963 +0,0 @@ ---- ./third_party/ffmpeg/config/Chrome/freebsd/ia32/config.h.orig 2010-12-20 20:15:08.000000000 +0100 -+++ ./third_party/ffmpeg/config/Chrome/freebsd/ia32/config.h 2010-12-20 20:15:08.000000000 +0100 -@@ -0,0 +1,960 @@ -+/* Automatically generated by configure - do not modify! */ -+#ifndef FFMPEG_CONFIG_H -+#define FFMPEG_CONFIG_H -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --enable-libvpx --enable-decoder='theora,vorbis,libvpx,pcm_u8,pcm_s16le,pcm_f32le,aac,h264,mp3' --enable-encoder=libvpx --enable-demuxer='ogg,matroska,wav,mp3,mov' --enable-parser=mpegaudio --extra-cflags='-m32 -fPIC' --extra-ldflags='-m32 -L../../libvpx/linux32/usr/local/lib'" -+#define FFMPEG_LICENSE "LGPL version 2.1 or later" -+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -+#define CC_TYPE "gcc" /* rene: what about clang? does $(CC) work? */ -+#define CC_VERSION __VERSION__ -+#define restrict restrict -+#define ASMALIGN(ZEROBITS) ".p2align " #ZEROBITS "\n\t" -+#define EXTERN_PREFIX "" -+#define EXTERN_ASM -+#define SLIBSUF ".so" -+#define ARCH_ALPHA 0 -+#define ARCH_ARM 0 -+#define ARCH_AVR32 0 -+#define ARCH_AVR32_AP 0 -+#define ARCH_AVR32_UC 0 -+#define ARCH_BFIN 0 -+#define ARCH_IA64 0 -+#define ARCH_M68K 0 -+#define ARCH_MIPS 0 -+#define ARCH_MIPS64 0 -+#define ARCH_PARISC 0 -+#define ARCH_PPC 0 -+#define ARCH_PPC64 0 -+#define ARCH_S390 0 -+#define ARCH_SH4 0 -+#define ARCH_SPARC 0 -+#define ARCH_SPARC64 0 -+#define ARCH_TOMI 0 -+#define ARCH_X86 1 -+#define ARCH_X86_32 1 -+#define ARCH_X86_64 0 -+#define HAVE_ALTIVEC 0 -+#define HAVE_AMD3DNOW 0 -+#define HAVE_AMD3DNOWEXT 0 -+#define HAVE_ARMV5TE 0 -+#define HAVE_ARMV6 0 -+#define HAVE_ARMV6T2 0 -+#define HAVE_ARMVFP 0 -+#define HAVE_IWMMXT 0 -+#define HAVE_MMI 0 -+#define HAVE_MMX 1 -+#define HAVE_MMX2 1 -+#define HAVE_NEON 0 -+#define HAVE_PPC4XX 0 -+#define HAVE_SSE 1 -+#define HAVE_SSSE3 1 -+#define HAVE_VIS 0 -+#define HAVE_BIGENDIAN 0 -+#define HAVE_FAST_UNALIGNED 1 -+#define HAVE_PTHREADS 1 -+#define HAVE_W32THREADS 0 -+#define HAVE_ALIGNED_STACK 1 -+#define HAVE_ALSA_ASOUNDLIB_H 0 -+#define HAVE_ALTIVEC_H 0 -+#define HAVE_ARPA_INET_H 0 -+#define HAVE_ATTRIBUTE_MAY_ALIAS 1 -+#define HAVE_ATTRIBUTE_PACKED 1 -+#define HAVE_BSWAP 1 -+#define HAVE_CLOSESOCKET 0 -+#define HAVE_CMOV 0 -+#define HAVE_CONIO_H 0 -+#define HAVE_DCBZL 0 -+#define HAVE_DEV_BKTR_IOCTL_BT848_H 0 -+#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 -+#define HAVE_DEV_IC_BT8XX_H 0 -+#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0 -+#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0 -+#define HAVE_DLFCN_H 1 -+#define HAVE_DLOPEN 1 -+#define HAVE_DOS_PATHS 0 -+#define HAVE_EBP_AVAILABLE 0 -+#define HAVE_EBX_AVAILABLE 0 -+#define HAVE_EXP2 1 -+#define HAVE_EXP2F 1 -+#define HAVE_FAST_64BIT 0 -+#define HAVE_FAST_CLZ 1 -+#define HAVE_FAST_CMOV 0 -+#define HAVE_FCNTL 1 -+#define HAVE_FORK 1 -+#define HAVE_GETADDRINFO 1 -+#define HAVE_GETHRTIME 0 -+#define HAVE_GETPROCESSMEMORYINFO 0 -+#define HAVE_GETPROCESSTIMES 0 -+#define HAVE_GETRUSAGE 1 -+#define HAVE_GNU_AS 1 -+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1 -+#define HAVE_IBM_ASM 0 -+#define HAVE_INET_ATON 1 -+#define HAVE_INLINE_ASM 1 -+#define HAVE_ISATTY 1 -+#define HAVE_LDBRX 0 -+#define HAVE_LIBDC1394_1 0 -+#define HAVE_LIBDC1394_2 0 -+#define HAVE_LLRINT 1 -+#define HAVE_LLRINTF 1 -+#define HAVE_LOCAL_ALIGNED_16 1 -+#define HAVE_LOCAL_ALIGNED_8 1 -+#define HAVE_LOG2 0 -+#define HAVE_LOG2F 0 -+#define HAVE_LOONGSON 0 -+#define HAVE_LRINT 1 -+#define HAVE_LRINTF 1 -+#define HAVE_LZO1X_999_COMPRESS 0 -+#define HAVE_MACHINE_IOCTL_BT848_H 0 -+#define HAVE_MACHINE_IOCTL_METEOR_H 0 -+#define HAVE_MALLOC_H 0 -+#define HAVE_MEMALIGN 0 -+#define HAVE_MKSTEMP 1 -+#define HAVE_PLD 0 -+#define HAVE_POSIX_MEMALIGN 1 -+#define HAVE_ROUND 1 -+#define HAVE_ROUNDF 1 -+#define HAVE_SDL 0 -+#define HAVE_SDL_VIDEO_SIZE 0 -+#define HAVE_SETMODE 0 -+#define HAVE_SOCKLEN_T 0 -+#define HAVE_SOUNDCARD_H 0 -+#define HAVE_POLL_H 1 -+#define HAVE_SETRLIMIT 1 -+#define HAVE_STRERROR_R 1 -+#define HAVE_STRTOK_R 1 -+#define HAVE_STRUCT_ADDRINFO 0 -+#define HAVE_STRUCT_IPV6_MREQ 0 -+#define HAVE_STRUCT_SOCKADDR_IN6 0 -+#define HAVE_STRUCT_SOCKADDR_SA_LEN 0 -+#define HAVE_STRUCT_SOCKADDR_STORAGE 0 -+#define HAVE_SYMVER 0 -+#define HAVE_SYMVER_GNU_ASM 1 -+#define HAVE_SYMVER_ASM_LABEL 0 -+#define HAVE_SYS_MMAN_H 1 -+#define HAVE_SYS_RESOURCE_H 1 -+#define HAVE_SYS_SELECT_H 1 -+#define HAVE_SYS_SOUNDCARD_H 1 -+#define HAVE_SYS_VIDEOIO_H 0 -+#define HAVE_TEN_OPERANDS 1 -+#define HAVE_TERMIOS_H 1 -+#define HAVE_THREADS 1 -+#define HAVE_TRUNCF 1 -+#define HAVE_VFP_ARGS 0 -+#define HAVE_VIRTUALALLOC 0 -+#define HAVE_WINSOCK2_H 0 -+#define HAVE_XFORM_ASM 0 -+#define HAVE_XMM_CLOBBERS 0 -+#define HAVE_YASM 1 -+#define CONFIG_BSFS 0 -+#define CONFIG_DECODERS 1 -+#define CONFIG_DEMUXERS 1 -+#define CONFIG_ENCODERS 1 -+#define CONFIG_FILTERS 0 -+#define CONFIG_HWACCELS 0 -+#define CONFIG_INDEVS 0 -+#define CONFIG_MUXERS 0 -+#define CONFIG_OUTDEVS 0 -+#define CONFIG_PARSERS 1 -+#define CONFIG_PROTOCOLS 1 -+#define CONFIG_AANDCT 0 -+#define CONFIG_AVCODEC 1 -+#define CONFIG_AVCORE 1 -+#define CONFIG_AVDEVICE 1 -+#define CONFIG_AVFILTER 1 -+#define CONFIG_AVFORMAT 1 -+#define CONFIG_AVISYNTH 0 -+#define CONFIG_BZLIB 0 -+#define CONFIG_DCT 0 -+#define CONFIG_DOC 0 -+#define CONFIG_DWT 0 -+#define CONFIG_DXVA2 0 -+#define CONFIG_FASTDIV 1 -+#define CONFIG_FFMPEG 0 -+#define CONFIG_FFPLAY 0 -+#define CONFIG_FFPROBE 1 -+#define CONFIG_FFSERVER 0 -+#define CONFIG_FFT 1 -+#define CONFIG_FREI0R 0 -+#define CONFIG_GOLOMB 1 -+#define CONFIG_GPL 0 -+#define CONFIG_GRAY 0 -+#define CONFIG_H264DSP 1 -+#define CONFIG_H264PRED 1 -+#define CONFIG_HARDCODED_TABLES 0 -+#define CONFIG_HUFFMAN 0 -+#define CONFIG_LIBDC1394 0 -+#define CONFIG_LIBDIRAC 0 -+#define CONFIG_LIBFAAC 0 -+#define CONFIG_LIBGSM 0 -+#define CONFIG_LIBMP3LAME 0 -+#define CONFIG_LIBNUT 0 -+#define CONFIG_LIBOPENCORE_AMRNB 0 -+#define CONFIG_LIBOPENCORE_AMRWB 0 -+#define CONFIG_LIBOPENCV 0 -+#define CONFIG_LIBOPENJPEG 0 -+#define CONFIG_LIBRTMP 0 -+#define CONFIG_LIBSCHROEDINGER 0 -+#define CONFIG_LIBSPEEX 0 -+#define CONFIG_LIBTHEORA 0 -+#define CONFIG_LIBVORBIS 0 -+#define CONFIG_LIBVPX 1 -+#define CONFIG_LIBX264 0 -+#define CONFIG_LIBXAVS 0 -+#define CONFIG_LIBXVID 0 -+#define CONFIG_LPC 0 -+#define CONFIG_LSP 0 -+#define CONFIG_MDCT 1 -+#define CONFIG_MEMALIGN_HACK 0 -+#define CONFIG_MLIB 0 -+#define CONFIG_MPEGAUDIO_HP 1 -+#define CONFIG_NETWORK 0 -+#define CONFIG_NONFREE 0 -+#define CONFIG_PIC 1 -+#define CONFIG_POSTPROC 0 -+#define CONFIG_RDFT 1 -+#define CONFIG_RTPDEC 0 -+#define CONFIG_RUNTIME_CPUDETECT 0 -+#define CONFIG_SHARED 1 -+#define CONFIG_SMALL 0 -+#define CONFIG_SRAM 0 -+#define CONFIG_STATIC 1 -+#define CONFIG_SWSCALE 0 -+#define CONFIG_SWSCALE_ALPHA 1 -+#define CONFIG_VAAPI 0 -+#define CONFIG_VDPAU 0 -+#define CONFIG_VERSION3 0 -+#define CONFIG_X11GRAB 0 -+#define CONFIG_ZLIB 0 -+#define CONFIG_AVUTIL 1 -+#define CONFIG_GPLV3 0 -+#define CONFIG_LGPLV3 0 -+#define CONFIG_AASC_DECODER 0 -+#define CONFIG_AMV_DECODER 0 -+#define CONFIG_ANM_DECODER 0 -+#define CONFIG_ANSI_DECODER 0 -+#define CONFIG_ASV1_DECODER 0 -+#define CONFIG_ASV2_DECODER 0 -+#define CONFIG_AURA_DECODER 0 -+#define CONFIG_AURA2_DECODER 0 -+#define CONFIG_AVS_DECODER 0 -+#define CONFIG_BETHSOFTVID_DECODER 0 -+#define CONFIG_BFI_DECODER 0 -+#define CONFIG_BINK_DECODER 0 -+#define CONFIG_BMP_DECODER 0 -+#define CONFIG_C93_DECODER 0 -+#define CONFIG_CAVS_DECODER 0 -+#define CONFIG_CDGRAPHICS_DECODER 0 -+#define CONFIG_CINEPAK_DECODER 0 -+#define CONFIG_CLJR_DECODER 0 -+#define CONFIG_CSCD_DECODER 0 -+#define CONFIG_CYUV_DECODER 0 -+#define CONFIG_DNXHD_DECODER 0 -+#define CONFIG_DPX_DECODER 0 -+#define CONFIG_DSICINVIDEO_DECODER 0 -+#define CONFIG_DVVIDEO_DECODER 0 -+#define CONFIG_DXA_DECODER 0 -+#define CONFIG_EACMV_DECODER 0 -+#define CONFIG_EAMAD_DECODER 0 -+#define CONFIG_EATGQ_DECODER 0 -+#define CONFIG_EATGV_DECODER 0 -+#define CONFIG_EATQI_DECODER 0 -+#define CONFIG_EIGHTBPS_DECODER 0 -+#define CONFIG_EIGHTSVX_EXP_DECODER 0 -+#define CONFIG_EIGHTSVX_FIB_DECODER 0 -+#define CONFIG_ESCAPE124_DECODER 0 -+#define CONFIG_FFV1_DECODER 0 -+#define CONFIG_FFVHUFF_DECODER 0 -+#define CONFIG_FLASHSV_DECODER 0 -+#define CONFIG_FLIC_DECODER 0 -+#define CONFIG_FLV_DECODER 0 -+#define CONFIG_FOURXM_DECODER 0 -+#define CONFIG_FRAPS_DECODER 0 -+#define CONFIG_FRWU_DECODER 0 -+#define CONFIG_GIF_DECODER 0 -+#define CONFIG_H261_DECODER 0 -+#define CONFIG_H263_DECODER 0 -+#define CONFIG_H263I_DECODER 0 -+#define CONFIG_H264_DECODER 1 -+#define CONFIG_H264_VDPAU_DECODER 0 -+#define CONFIG_HUFFYUV_DECODER 0 -+#define CONFIG_IDCIN_DECODER 0 -+#define CONFIG_IFF_BYTERUN1_DECODER 0 -+#define CONFIG_IFF_ILBM_DECODER 0 -+#define CONFIG_INDEO2_DECODER 0 -+#define CONFIG_INDEO3_DECODER 0 -+#define CONFIG_INDEO5_DECODER 0 -+#define CONFIG_INTERPLAY_VIDEO_DECODER 0 -+#define CONFIG_JPEGLS_DECODER 0 -+#define CONFIG_KGV1_DECODER 0 -+#define CONFIG_KMVC_DECODER 0 -+#define CONFIG_LOCO_DECODER 0 -+#define CONFIG_MDEC_DECODER 0 -+#define CONFIG_MIMIC_DECODER 0 -+#define CONFIG_MJPEG_DECODER 0 -+#define CONFIG_MJPEGB_DECODER 0 -+#define CONFIG_MMVIDEO_DECODER 0 -+#define CONFIG_MOTIONPIXELS_DECODER 0 -+#define CONFIG_MPEG_XVMC_DECODER 0 -+#define CONFIG_MPEG1VIDEO_DECODER 0 -+#define CONFIG_MPEG2VIDEO_DECODER 0 -+#define CONFIG_MPEG4_DECODER 0 -+#define CONFIG_MPEG4_VDPAU_DECODER 0 -+#define CONFIG_MPEGVIDEO_DECODER 0 -+#define CONFIG_MPEG_VDPAU_DECODER 0 -+#define CONFIG_MPEG1_VDPAU_DECODER 0 -+#define CONFIG_MSMPEG4V1_DECODER 0 -+#define CONFIG_MSMPEG4V2_DECODER 0 -+#define CONFIG_MSMPEG4V3_DECODER 0 -+#define CONFIG_MSRLE_DECODER 0 -+#define CONFIG_MSVIDEO1_DECODER 0 -+#define CONFIG_MSZH_DECODER 0 -+#define CONFIG_NUV_DECODER 0 -+#define CONFIG_PAM_DECODER 0 -+#define CONFIG_PBM_DECODER 0 -+#define CONFIG_PCX_DECODER 0 -+#define CONFIG_PGM_DECODER 0 -+#define CONFIG_PGMYUV_DECODER 0 -+#define CONFIG_PICTOR_DECODER 0 -+#define CONFIG_PNG_DECODER 0 -+#define CONFIG_PPM_DECODER 0 -+#define CONFIG_PTX_DECODER 0 -+#define CONFIG_QDRAW_DECODER 0 -+#define CONFIG_QPEG_DECODER 0 -+#define CONFIG_QTRLE_DECODER 0 -+#define CONFIG_R10K_DECODER 0 -+#define CONFIG_R210_DECODER 0 -+#define CONFIG_RAWVIDEO_DECODER 0 -+#define CONFIG_RL2_DECODER 0 -+#define CONFIG_ROQ_DECODER 0 -+#define CONFIG_RPZA_DECODER 0 -+#define CONFIG_RV10_DECODER 0 -+#define CONFIG_RV20_DECODER 0 -+#define CONFIG_RV30_DECODER 0 -+#define CONFIG_RV40_DECODER 0 -+#define CONFIG_SGI_DECODER 0 -+#define CONFIG_SMACKER_DECODER 0 -+#define CONFIG_SMC_DECODER 0 -+#define CONFIG_SNOW_DECODER 0 -+#define CONFIG_SP5X_DECODER 0 -+#define CONFIG_SUNRAST_DECODER 0 -+#define CONFIG_SVQ1_DECODER 0 -+#define CONFIG_SVQ3_DECODER 0 -+#define CONFIG_TARGA_DECODER 0 -+#define CONFIG_THEORA_DECODER 1 -+#define CONFIG_THP_DECODER 0 -+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 -+#define CONFIG_TIFF_DECODER 0 -+#define CONFIG_TMV_DECODER 0 -+#define CONFIG_TRUEMOTION1_DECODER 0 -+#define CONFIG_TRUEMOTION2_DECODER 0 -+#define CONFIG_TSCC_DECODER 0 -+#define CONFIG_TXD_DECODER 0 -+#define CONFIG_ULTI_DECODER 0 -+#define CONFIG_V210_DECODER 0 -+#define CONFIG_V210X_DECODER 0 -+#define CONFIG_VB_DECODER 0 -+#define CONFIG_VC1_DECODER 0 -+#define CONFIG_VC1_VDPAU_DECODER 0 -+#define CONFIG_VCR1_DECODER 0 -+#define CONFIG_VMDVIDEO_DECODER 0 -+#define CONFIG_VMNC_DECODER 0 -+#define CONFIG_VP3_DECODER 1 -+#define CONFIG_VP5_DECODER 0 -+#define CONFIG_VP6_DECODER 0 -+#define CONFIG_VP6A_DECODER 0 -+#define CONFIG_VP6F_DECODER 0 -+#define CONFIG_VP8_DECODER 0 -+#define CONFIG_VQA_DECODER 0 -+#define CONFIG_WMV1_DECODER 0 -+#define CONFIG_WMV2_DECODER 0 -+#define CONFIG_WMV3_DECODER 0 -+#define CONFIG_WMV3_VDPAU_DECODER 0 -+#define CONFIG_WNV1_DECODER 0 -+#define CONFIG_XAN_WC3_DECODER 0 -+#define CONFIG_XL_DECODER 0 -+#define CONFIG_YOP_DECODER 0 -+#define CONFIG_ZLIB_DECODER 0 -+#define CONFIG_ZMBV_DECODER 0 -+#define CONFIG_AAC_DECODER 1 -+#define CONFIG_AAC_LATM_DECODER 0 -+#define CONFIG_AC3_DECODER 0 -+#define CONFIG_ALAC_DECODER 0 -+#define CONFIG_ALS_DECODER 0 -+#define CONFIG_AMRNB_DECODER 0 -+#define CONFIG_APE_DECODER 0 -+#define CONFIG_ATRAC1_DECODER 0 -+#define CONFIG_ATRAC3_DECODER 0 -+#define CONFIG_BINKAUDIO_DCT_DECODER 0 -+#define CONFIG_BINKAUDIO_RDFT_DECODER 0 -+#define CONFIG_COOK_DECODER 0 -+#define CONFIG_DCA_DECODER 0 -+#define CONFIG_DSICINAUDIO_DECODER 0 -+#define CONFIG_EAC3_DECODER 0 -+#define CONFIG_FLAC_DECODER 0 -+#define CONFIG_GSM_DECODER 0 -+#define CONFIG_GSM_MS_DECODER 0 -+#define CONFIG_IMC_DECODER 0 -+#define CONFIG_MACE3_DECODER 0 -+#define CONFIG_MACE6_DECODER 0 -+#define CONFIG_MLP_DECODER 0 -+#define CONFIG_MP1_DECODER 0 -+#define CONFIG_MP1FLOAT_DECODER 0 -+#define CONFIG_MP2_DECODER 0 -+#define CONFIG_MP2FLOAT_DECODER 0 -+#define CONFIG_MP3_DECODER 1 -+#define CONFIG_MP3FLOAT_DECODER 0 -+#define CONFIG_MP3ADU_DECODER 0 -+#define CONFIG_MP3ADUFLOAT_DECODER 0 -+#define CONFIG_MP3ON4_DECODER 0 -+#define CONFIG_MP3ON4FLOAT_DECODER 0 -+#define CONFIG_MPC7_DECODER 0 -+#define CONFIG_MPC8_DECODER 0 -+#define CONFIG_NELLYMOSER_DECODER 0 -+#define CONFIG_QCELP_DECODER 0 -+#define CONFIG_QDM2_DECODER 0 -+#define CONFIG_RA_144_DECODER 0 -+#define CONFIG_RA_288_DECODER 0 -+#define CONFIG_SHORTEN_DECODER 0 -+#define CONFIG_SIPR_DECODER 0 -+#define CONFIG_SMACKAUD_DECODER 0 -+#define CONFIG_SONIC_DECODER 0 -+#define CONFIG_TRUEHD_DECODER 0 -+#define CONFIG_TRUESPEECH_DECODER 0 -+#define CONFIG_TTA_DECODER 0 -+#define CONFIG_TWINVQ_DECODER 0 -+#define CONFIG_VMDAUDIO_DECODER 0 -+#define CONFIG_VORBIS_DECODER 1 -+#define CONFIG_WAVPACK_DECODER 0 -+#define CONFIG_WMAPRO_DECODER 0 -+#define CONFIG_WMAV1_DECODER 0 -+#define CONFIG_WMAV2_DECODER 0 -+#define CONFIG_WMAVOICE_DECODER 0 -+#define CONFIG_WS_SND1_DECODER 0 -+#define CONFIG_PCM_ALAW_DECODER 0 -+#define CONFIG_PCM_BLURAY_DECODER 0 -+#define CONFIG_PCM_DVD_DECODER 0 -+#define CONFIG_PCM_F32BE_DECODER 0 -+#define CONFIG_PCM_F32LE_DECODER 1 -+#define CONFIG_PCM_F64BE_DECODER 0 -+#define CONFIG_PCM_F64LE_DECODER 0 -+#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_S16LE_DECODER 1 -+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S24BE_DECODER 0 -+#define CONFIG_PCM_S24DAUD_DECODER 0 -+#define CONFIG_PCM_S24LE_DECODER 0 -+#define CONFIG_PCM_S32BE_DECODER 0 -+#define CONFIG_PCM_S32LE_DECODER 0 -+#define CONFIG_PCM_U8_DECODER 1 -+#define CONFIG_PCM_U16BE_DECODER 0 -+#define CONFIG_PCM_U16LE_DECODER 0 -+#define CONFIG_PCM_U24BE_DECODER 0 -+#define CONFIG_PCM_U24LE_DECODER 0 -+#define CONFIG_PCM_U32BE_DECODER 0 -+#define CONFIG_PCM_U32LE_DECODER 0 -+#define CONFIG_PCM_ZORK_DECODER 0 -+#define CONFIG_INTERPLAY_DPCM_DECODER 0 -+#define CONFIG_ROQ_DPCM_DECODER 0 -+#define CONFIG_SOL_DPCM_DECODER 0 -+#define CONFIG_XAN_DPCM_DECODER 0 -+#define CONFIG_ADPCM_4XM_DECODER 0 -+#define CONFIG_ADPCM_ADX_DECODER 0 -+#define CONFIG_ADPCM_CT_DECODER 0 -+#define CONFIG_ADPCM_EA_DECODER 0 -+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 -+#define CONFIG_ADPCM_EA_R1_DECODER 0 -+#define CONFIG_ADPCM_EA_R2_DECODER 0 -+#define CONFIG_ADPCM_EA_R3_DECODER 0 -+#define CONFIG_ADPCM_EA_XAS_DECODER 0 -+#define CONFIG_ADPCM_G722_DECODER 0 -+#define CONFIG_ADPCM_G726_DECODER 0 -+#define CONFIG_ADPCM_IMA_AMV_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK3_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK4_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_ISS_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_DECODER 0 -+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 -+#define CONFIG_ADPCM_IMA_WAV_DECODER 0 -+#define CONFIG_ADPCM_IMA_WS_DECODER 0 -+#define CONFIG_ADPCM_MS_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_2_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_3_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_4_DECODER 0 -+#define CONFIG_ADPCM_SWF_DECODER 0 -+#define CONFIG_ADPCM_THP_DECODER 0 -+#define CONFIG_ADPCM_XA_DECODER 0 -+#define CONFIG_ADPCM_YAMAHA_DECODER 0 -+#define CONFIG_DVBSUB_DECODER 0 -+#define CONFIG_DVDSUB_DECODER 0 -+#define CONFIG_PGSSUB_DECODER 0 -+#define CONFIG_XSUB_DECODER 0 -+#define CONFIG_LIBDIRAC_DECODER 0 -+#define CONFIG_LIBGSM_DECODER 0 -+#define CONFIG_LIBGSM_MS_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 -+#define CONFIG_LIBOPENJPEG_DECODER 0 -+#define CONFIG_LIBSCHROEDINGER_DECODER 0 -+#define CONFIG_LIBSPEEX_DECODER 0 -+#define CONFIG_LIBVPX_DECODER 1 -+#define CONFIG_A64MULTI_ENCODER 0 -+#define CONFIG_A64MULTI5_ENCODER 0 -+#define CONFIG_ASV1_ENCODER 0 -+#define CONFIG_ASV2_ENCODER 0 -+#define CONFIG_BMP_ENCODER 0 -+#define CONFIG_DNXHD_ENCODER 0 -+#define CONFIG_DVVIDEO_ENCODER 0 -+#define CONFIG_FFV1_ENCODER 0 -+#define CONFIG_FFVHUFF_ENCODER 0 -+#define CONFIG_FLASHSV_ENCODER 0 -+#define CONFIG_FLV_ENCODER 0 -+#define CONFIG_GIF_ENCODER 0 -+#define CONFIG_H261_ENCODER 0 -+#define CONFIG_H263_ENCODER 0 -+#define CONFIG_H263P_ENCODER 0 -+#define CONFIG_HUFFYUV_ENCODER 0 -+#define CONFIG_JPEGLS_ENCODER 0 -+#define CONFIG_LJPEG_ENCODER 0 -+#define CONFIG_MJPEG_ENCODER 0 -+#define CONFIG_MPEG1VIDEO_ENCODER 0 -+#define CONFIG_MPEG2VIDEO_ENCODER 0 -+#define CONFIG_MPEG4_ENCODER 0 -+#define CONFIG_MSMPEG4V1_ENCODER 0 -+#define CONFIG_MSMPEG4V2_ENCODER 0 -+#define CONFIG_MSMPEG4V3_ENCODER 0 -+#define CONFIG_PAM_ENCODER 0 -+#define CONFIG_PBM_ENCODER 0 -+#define CONFIG_PCX_ENCODER 0 -+#define CONFIG_PGM_ENCODER 0 -+#define CONFIG_PGMYUV_ENCODER 0 -+#define CONFIG_PNG_ENCODER 0 -+#define CONFIG_PPM_ENCODER 0 -+#define CONFIG_QTRLE_ENCODER 0 -+#define CONFIG_RAWVIDEO_ENCODER 0 -+#define CONFIG_ROQ_ENCODER 0 -+#define CONFIG_RV10_ENCODER 0 -+#define CONFIG_RV20_ENCODER 0 -+#define CONFIG_SGI_ENCODER 0 -+#define CONFIG_SNOW_ENCODER 0 -+#define CONFIG_SVQ1_ENCODER 0 -+#define CONFIG_TARGA_ENCODER 0 -+#define CONFIG_TIFF_ENCODER 0 -+#define CONFIG_V210_ENCODER 0 -+#define CONFIG_WMV1_ENCODER 0 -+#define CONFIG_WMV2_ENCODER 0 -+#define CONFIG_ZLIB_ENCODER 0 -+#define CONFIG_ZMBV_ENCODER 0 -+#define CONFIG_AAC_ENCODER 0 -+#define CONFIG_AC3_ENCODER 0 -+#define CONFIG_ALAC_ENCODER 0 -+#define CONFIG_FLAC_ENCODER 0 -+#define CONFIG_MP2_ENCODER 0 -+#define CONFIG_NELLYMOSER_ENCODER 0 -+#define CONFIG_RA_144_ENCODER 0 -+#define CONFIG_SONIC_ENCODER 0 -+#define CONFIG_SONIC_LS_ENCODER 0 -+#define CONFIG_VORBIS_ENCODER 0 -+#define CONFIG_WMAV1_ENCODER 0 -+#define CONFIG_WMAV2_ENCODER 0 -+#define CONFIG_PCM_ALAW_ENCODER 0 -+#define CONFIG_PCM_F32BE_ENCODER 0 -+#define CONFIG_PCM_F32LE_ENCODER 0 -+#define CONFIG_PCM_F64BE_ENCODER 0 -+#define CONFIG_PCM_F64LE_ENCODER 0 -+#define CONFIG_PCM_MULAW_ENCODER 0 -+#define CONFIG_PCM_S8_ENCODER 0 -+#define CONFIG_PCM_S16BE_ENCODER 0 -+#define CONFIG_PCM_S16LE_ENCODER 0 -+#define CONFIG_PCM_S24BE_ENCODER 0 -+#define CONFIG_PCM_S24DAUD_ENCODER 0 -+#define CONFIG_PCM_S24LE_ENCODER 0 -+#define CONFIG_PCM_S32BE_ENCODER 0 -+#define CONFIG_PCM_S32LE_ENCODER 0 -+#define CONFIG_PCM_U8_ENCODER 0 -+#define CONFIG_PCM_U16BE_ENCODER 0 -+#define CONFIG_PCM_U16LE_ENCODER 0 -+#define CONFIG_PCM_U24BE_ENCODER 0 -+#define CONFIG_PCM_U24LE_ENCODER 0 -+#define CONFIG_PCM_U32BE_ENCODER 0 -+#define CONFIG_PCM_U32LE_ENCODER 0 -+#define CONFIG_PCM_ZORK_ENCODER 0 -+#define CONFIG_ROQ_DPCM_ENCODER 0 -+#define CONFIG_ADPCM_ADX_ENCODER 0 -+#define CONFIG_ADPCM_G722_ENCODER 0 -+#define CONFIG_ADPCM_G726_ENCODER 0 -+#define CONFIG_ADPCM_IMA_QT_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 -+#define CONFIG_ADPCM_MS_ENCODER 0 -+#define CONFIG_ADPCM_SWF_ENCODER 0 -+#define CONFIG_ADPCM_YAMAHA_ENCODER 0 -+#define CONFIG_DVBSUB_ENCODER 0 -+#define CONFIG_DVDSUB_ENCODER 0 -+#define CONFIG_XSUB_ENCODER 0 -+#define CONFIG_LIBDIRAC_ENCODER 0 -+#define CONFIG_LIBFAAC_ENCODER 0 -+#define CONFIG_LIBGSM_ENCODER 0 -+#define CONFIG_LIBGSM_MS_ENCODER 0 -+#define CONFIG_LIBMP3LAME_ENCODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 -+#define CONFIG_LIBSCHROEDINGER_ENCODER 0 -+#define CONFIG_LIBTHEORA_ENCODER 0 -+#define CONFIG_LIBVORBIS_ENCODER 0 -+#define CONFIG_LIBVPX_ENCODER 1 -+#define CONFIG_LIBX264_ENCODER 0 -+#define CONFIG_LIBXAVS_ENCODER 0 -+#define CONFIG_LIBXVID_ENCODER 0 -+#define CONFIG_H263_VAAPI_HWACCEL 0 -+#define CONFIG_H264_DXVA2_HWACCEL 0 -+#define CONFIG_H264_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG2_DXVA2_HWACCEL 0 -+#define CONFIG_MPEG2_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG4_VAAPI_HWACCEL 0 -+#define CONFIG_VC1_DXVA2_HWACCEL 0 -+#define CONFIG_VC1_VAAPI_HWACCEL 0 -+#define CONFIG_WMV3_DXVA2_HWACCEL 0 -+#define CONFIG_WMV3_VAAPI_HWACCEL 0 -+#define CONFIG_AAC_PARSER 0 -+#define CONFIG_AAC_LATM_PARSER 0 -+#define CONFIG_AC3_PARSER 0 -+#define CONFIG_CAVSVIDEO_PARSER 0 -+#define CONFIG_DCA_PARSER 0 -+#define CONFIG_DIRAC_PARSER 0 -+#define CONFIG_DNXHD_PARSER 0 -+#define CONFIG_DVBSUB_PARSER 0 -+#define CONFIG_DVDSUB_PARSER 0 -+#define CONFIG_H261_PARSER 0 -+#define CONFIG_H263_PARSER 0 -+#define CONFIG_H264_PARSER 0 -+#define CONFIG_MJPEG_PARSER 0 -+#define CONFIG_MLP_PARSER 0 -+#define CONFIG_MPEG4VIDEO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 -+#define CONFIG_MPEGVIDEO_PARSER 0 -+#define CONFIG_PNM_PARSER 0 -+#define CONFIG_VC1_PARSER 0 -+#define CONFIG_VP3_PARSER 0 -+#define CONFIG_VP8_PARSER 0 -+#define CONFIG_AAC_ADTSTOASC_BSF 0 -+#define CONFIG_CHOMP_BSF 0 -+#define CONFIG_DUMP_EXTRADATA_BSF 0 -+#define CONFIG_H264_MP4TOANNEXB_BSF 0 -+#define CONFIG_MPEG4VIDEO_ES_BSF 0 -+#define CONFIG_IMX_DUMP_HEADER_BSF 0 -+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 -+#define CONFIG_MP3_HEADER_COMPRESS_BSF 0 -+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0 -+#define CONFIG_MOV2TEXTSUB_BSF 0 -+#define CONFIG_NOISE_BSF 0 -+#define CONFIG_REMOVE_EXTRADATA_BSF 0 -+#define CONFIG_TEXT2MOVSUB_BSF 0 -+#define CONFIG_VC1_ASFTORCV_BSF 0 -+#define CONFIG_VC1_ASFTOANNEXG_BSF 0 -+#define CONFIG_AAC_DEMUXER 0 -+#define CONFIG_AC3_DEMUXER 0 -+#define CONFIG_AEA_DEMUXER 0 -+#define CONFIG_AIFF_DEMUXER 0 -+#define CONFIG_AMR_DEMUXER 0 -+#define CONFIG_ANM_DEMUXER 0 -+#define CONFIG_APC_DEMUXER 0 -+#define CONFIG_APE_DEMUXER 0 -+#define CONFIG_APPLEHTTP_DEMUXER 0 -+#define CONFIG_ASF_DEMUXER 0 -+#define CONFIG_ASS_DEMUXER 0 -+#define CONFIG_AU_DEMUXER 0 -+#define CONFIG_AVI_DEMUXER 0 -+#define CONFIG_AVISYNTH_DEMUXER 0 -+#define CONFIG_AVS_DEMUXER 0 -+#define CONFIG_BETHSOFTVID_DEMUXER 0 -+#define CONFIG_BFI_DEMUXER 0 -+#define CONFIG_BINK_DEMUXER 0 -+#define CONFIG_C93_DEMUXER 0 -+#define CONFIG_CAF_DEMUXER 0 -+#define CONFIG_CAVSVIDEO_DEMUXER 0 -+#define CONFIG_CDG_DEMUXER 0 -+#define CONFIG_DAUD_DEMUXER 0 -+#define CONFIG_DIRAC_DEMUXER 0 -+#define CONFIG_DNXHD_DEMUXER 0 -+#define CONFIG_DSICIN_DEMUXER 0 -+#define CONFIG_DTS_DEMUXER 0 -+#define CONFIG_DV_DEMUXER 0 -+#define CONFIG_DXA_DEMUXER 0 -+#define CONFIG_EA_DEMUXER 0 -+#define CONFIG_EA_CDATA_DEMUXER 0 -+#define CONFIG_EAC3_DEMUXER 0 -+#define CONFIG_FFM_DEMUXER 0 -+#define CONFIG_FILMSTRIP_DEMUXER 0 -+#define CONFIG_FLAC_DEMUXER 0 -+#define CONFIG_FLIC_DEMUXER 0 -+#define CONFIG_FLV_DEMUXER 0 -+#define CONFIG_FOURXM_DEMUXER 0 -+#define CONFIG_G722_DEMUXER 0 -+#define CONFIG_GSM_DEMUXER 0 -+#define CONFIG_GXF_DEMUXER 0 -+#define CONFIG_H261_DEMUXER 0 -+#define CONFIG_H263_DEMUXER 0 -+#define CONFIG_H264_DEMUXER 0 -+#define CONFIG_IDCIN_DEMUXER 0 -+#define CONFIG_IFF_DEMUXER 0 -+#define CONFIG_IMAGE2_DEMUXER 0 -+#define CONFIG_IMAGE2PIPE_DEMUXER 0 -+#define CONFIG_INGENIENT_DEMUXER 0 -+#define CONFIG_IPMOVIE_DEMUXER 0 -+#define CONFIG_ISS_DEMUXER 0 -+#define CONFIG_IV8_DEMUXER 0 -+#define CONFIG_IVF_DEMUXER 0 -+#define CONFIG_LMLM4_DEMUXER 0 -+#define CONFIG_LXF_DEMUXER 0 -+#define CONFIG_M4V_DEMUXER 0 -+#define CONFIG_MATROSKA_DEMUXER 1 -+#define CONFIG_MJPEG_DEMUXER 0 -+#define CONFIG_MLP_DEMUXER 0 -+#define CONFIG_MM_DEMUXER 0 -+#define CONFIG_MMF_DEMUXER 0 -+#define CONFIG_MOV_DEMUXER 1 -+#define CONFIG_MP3_DEMUXER 1 -+#define CONFIG_MPC_DEMUXER 0 -+#define CONFIG_MPC8_DEMUXER 0 -+#define CONFIG_MPEGPS_DEMUXER 0 -+#define CONFIG_MPEGTS_DEMUXER 0 -+#define CONFIG_MPEGTSRAW_DEMUXER 0 -+#define CONFIG_MPEGVIDEO_DEMUXER 0 -+#define CONFIG_MSNWC_TCP_DEMUXER 0 -+#define CONFIG_MTV_DEMUXER 0 -+#define CONFIG_MVI_DEMUXER 0 -+#define CONFIG_MXF_DEMUXER 0 -+#define CONFIG_NC_DEMUXER 0 -+#define CONFIG_NSV_DEMUXER 0 -+#define CONFIG_NUT_DEMUXER 0 -+#define CONFIG_NUV_DEMUXER 0 -+#define CONFIG_OGG_DEMUXER 1 -+#define CONFIG_OMA_DEMUXER 0 -+#define CONFIG_PCM_ALAW_DEMUXER 0 -+#define CONFIG_PCM_MULAW_DEMUXER 0 -+#define CONFIG_PCM_F64BE_DEMUXER 0 -+#define CONFIG_PCM_F64LE_DEMUXER 0 -+#define CONFIG_PCM_F32BE_DEMUXER 0 -+#define CONFIG_PCM_F32LE_DEMUXER 0 -+#define CONFIG_PCM_S32BE_DEMUXER 0 -+#define CONFIG_PCM_S32LE_DEMUXER 0 -+#define CONFIG_PCM_S24BE_DEMUXER 0 -+#define CONFIG_PCM_S24LE_DEMUXER 0 -+#define CONFIG_PCM_S16BE_DEMUXER 0 -+#define CONFIG_PCM_S16LE_DEMUXER 0 -+#define CONFIG_PCM_S8_DEMUXER 0 -+#define CONFIG_PCM_U32BE_DEMUXER 0 -+#define CONFIG_PCM_U32LE_DEMUXER 0 -+#define CONFIG_PCM_U24BE_DEMUXER 0 -+#define CONFIG_PCM_U24LE_DEMUXER 0 -+#define CONFIG_PCM_U16BE_DEMUXER 0 -+#define CONFIG_PCM_U16LE_DEMUXER 0 -+#define CONFIG_PCM_U8_DEMUXER 0 -+#define CONFIG_PVA_DEMUXER 0 -+#define CONFIG_QCP_DEMUXER 0 -+#define CONFIG_R3D_DEMUXER 0 -+#define CONFIG_RAWVIDEO_DEMUXER 0 -+#define CONFIG_RL2_DEMUXER 0 -+#define CONFIG_RM_DEMUXER 0 -+#define CONFIG_ROQ_DEMUXER 0 -+#define CONFIG_RPL_DEMUXER 0 -+#define CONFIG_RSO_DEMUXER 0 -+#define CONFIG_RTP_DEMUXER 0 -+#define CONFIG_RTSP_DEMUXER 0 -+#define CONFIG_SAP_DEMUXER 0 -+#define CONFIG_SDP_DEMUXER 0 -+#define CONFIG_SEGAFILM_DEMUXER 0 -+#define CONFIG_SHORTEN_DEMUXER 0 -+#define CONFIG_SIFF_DEMUXER 0 -+#define CONFIG_SMACKER_DEMUXER 0 -+#define CONFIG_SOL_DEMUXER 0 -+#define CONFIG_SOX_DEMUXER 0 -+#define CONFIG_SRT_DEMUXER 0 -+#define CONFIG_STR_DEMUXER 0 -+#define CONFIG_SWF_DEMUXER 0 -+#define CONFIG_THP_DEMUXER 0 -+#define CONFIG_TIERTEXSEQ_DEMUXER 0 -+#define CONFIG_TMV_DEMUXER 0 -+#define CONFIG_TRUEHD_DEMUXER 0 -+#define CONFIG_TTA_DEMUXER 0 -+#define CONFIG_TXD_DEMUXER 0 -+#define CONFIG_TTY_DEMUXER 0 -+#define CONFIG_VC1_DEMUXER 0 -+#define CONFIG_VC1T_DEMUXER 0 -+#define CONFIG_VMD_DEMUXER 0 -+#define CONFIG_VOC_DEMUXER 0 -+#define CONFIG_VQF_DEMUXER 0 -+#define CONFIG_W64_DEMUXER 0 -+#define CONFIG_WAV_DEMUXER 1 -+#define CONFIG_WC3_DEMUXER 0 -+#define CONFIG_WEBP_DEMUXER 0 -+#define CONFIG_WSAUD_DEMUXER 0 -+#define CONFIG_WSVQA_DEMUXER 0 -+#define CONFIG_WV_DEMUXER 0 -+#define CONFIG_XA_DEMUXER 0 -+#define CONFIG_YOP_DEMUXER 0 -+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 -+#define CONFIG_LIBNUT_DEMUXER 0 -+#define CONFIG_A64_MUXER 0 -+#define CONFIG_AC3_MUXER 0 -+#define CONFIG_ADTS_MUXER 0 -+#define CONFIG_AIFF_MUXER 0 -+#define CONFIG_AMR_MUXER 0 -+#define CONFIG_ASF_MUXER 0 -+#define CONFIG_ASS_MUXER 0 -+#define CONFIG_ASF_STREAM_MUXER 0 -+#define CONFIG_AU_MUXER 0 -+#define CONFIG_AVI_MUXER 0 -+#define CONFIG_AVM2_MUXER 0 -+#define CONFIG_CAVSVIDEO_MUXER 0 -+#define CONFIG_CRC_MUXER 0 -+#define CONFIG_DAUD_MUXER 0 -+#define CONFIG_DIRAC_MUXER 0 -+#define CONFIG_DNXHD_MUXER 0 -+#define CONFIG_DTS_MUXER 0 -+#define CONFIG_DV_MUXER 0 -+#define CONFIG_EAC3_MUXER 0 -+#define CONFIG_FFM_MUXER 0 -+#define CONFIG_FILMSTRIP_MUXER 0 -+#define CONFIG_FLAC_MUXER 0 -+#define CONFIG_FLV_MUXER 0 -+#define CONFIG_FRAMECRC_MUXER 0 -+#define CONFIG_FRAMEMD5_MUXER 0 -+#define CONFIG_G722_MUXER 0 -+#define CONFIG_GIF_MUXER 0 -+#define CONFIG_GXF_MUXER 0 -+#define CONFIG_H261_MUXER 0 -+#define CONFIG_H263_MUXER 0 -+#define CONFIG_H264_MUXER 0 -+#define CONFIG_IMAGE2_MUXER 0 -+#define CONFIG_IMAGE2PIPE_MUXER 0 -+#define CONFIG_IPOD_MUXER 0 -+#define CONFIG_M4V_MUXER 0 -+#define CONFIG_MD5_MUXER 0 -+#define CONFIG_MATROSKA_MUXER 0 -+#define CONFIG_MATROSKA_AUDIO_MUXER 0 -+#define CONFIG_MJPEG_MUXER 0 -+#define CONFIG_MLP_MUXER 0 -+#define CONFIG_MMF_MUXER 0 -+#define CONFIG_MOV_MUXER 0 -+#define CONFIG_MP2_MUXER 0 -+#define CONFIG_MP3_MUXER 0 -+#define CONFIG_MP4_MUXER 0 -+#define CONFIG_MPEG1SYSTEM_MUXER 0 -+#define CONFIG_MPEG1VCD_MUXER 0 -+#define CONFIG_MPEG1VIDEO_MUXER 0 -+#define CONFIG_MPEG2DVD_MUXER 0 -+#define CONFIG_MPEG2SVCD_MUXER 0 -+#define CONFIG_MPEG2VIDEO_MUXER 0 -+#define CONFIG_MPEG2VOB_MUXER 0 -+#define CONFIG_MPEGTS_MUXER 0 -+#define CONFIG_MPJPEG_MUXER 0 -+#define CONFIG_MXF_MUXER 0 -+#define CONFIG_MXF_D10_MUXER 0 -+#define CONFIG_NULL_MUXER 0 -+#define CONFIG_NUT_MUXER 0 -+#define CONFIG_OGG_MUXER 0 -+#define CONFIG_PCM_ALAW_MUXER 0 -+#define CONFIG_PCM_MULAW_MUXER 0 -+#define CONFIG_PCM_F64BE_MUXER 0 -+#define CONFIG_PCM_F64LE_MUXER 0 -+#define CONFIG_PCM_F32BE_MUXER 0 -+#define CONFIG_PCM_F32LE_MUXER 0 -+#define CONFIG_PCM_S32BE_MUXER 0 -+#define CONFIG_PCM_S32LE_MUXER 0 -+#define CONFIG_PCM_S24BE_MUXER 0 -+#define CONFIG_PCM_S24LE_MUXER 0 -+#define CONFIG_PCM_S16BE_MUXER 0 -+#define CONFIG_PCM_S16LE_MUXER 0 -+#define CONFIG_PCM_S8_MUXER 0 -+#define CONFIG_PCM_U32BE_MUXER 0 -+#define CONFIG_PCM_U32LE_MUXER 0 -+#define CONFIG_PCM_U24BE_MUXER 0 -+#define CONFIG_PCM_U24LE_MUXER 0 -+#define CONFIG_PCM_U16BE_MUXER 0 -+#define CONFIG_PCM_U16LE_MUXER 0 -+#define CONFIG_PCM_U8_MUXER 0 -+#define CONFIG_PSP_MUXER 0 -+#define CONFIG_RAWVIDEO_MUXER 0 -+#define CONFIG_RM_MUXER 0 -+#define CONFIG_ROQ_MUXER 0 -+#define CONFIG_RSO_MUXER 0 -+#define CONFIG_RTP_MUXER 0 -+#define CONFIG_RTSP_MUXER 0 -+#define CONFIG_SAP_MUXER 0 -+#define CONFIG_SOX_MUXER 0 -+#define CONFIG_SPDIF_MUXER 0 -+#define CONFIG_SRT_MUXER 0 -+#define CONFIG_SWF_MUXER 0 -+#define CONFIG_TG2_MUXER 0 -+#define CONFIG_TGP_MUXER 0 -+#define CONFIG_TRUEHD_MUXER 0 -+#define CONFIG_VC1T_MUXER 0 -+#define CONFIG_VOC_MUXER 0 -+#define CONFIG_WAV_MUXER 0 -+#define CONFIG_WEBM_MUXER 0 -+#define CONFIG_WEBP_MUXER 0 -+#define CONFIG_YUV4MPEGPIPE_MUXER 0 -+#define CONFIG_LIBNUT_MUXER 0 -+#define CONFIG_ANULL_FILTER 0 -+#define CONFIG_ANULLSRC_FILTER 0 -+#define CONFIG_ANULLSINK_FILTER 0 -+#define CONFIG_ASPECT_FILTER 0 -+#define CONFIG_BLACKFRAME_FILTER 0 -+#define CONFIG_CROP_FILTER 0 -+#define CONFIG_CROPDETECT_FILTER 0 -+#define CONFIG_DRAWBOX_FILTER 0 -+#define CONFIG_FIFO_FILTER 0 -+#define CONFIG_FORMAT_FILTER 0 -+#define CONFIG_FREI0R_FILTER 0 -+#define CONFIG_HFLIP_FILTER 0 -+#define CONFIG_NOFORMAT_FILTER 0 -+#define CONFIG_NULL_FILTER 0 -+#define CONFIG_OCV_SMOOTH_FILTER 0 -+#define CONFIG_PAD_FILTER 0 -+#define CONFIG_PIXDESCTEST_FILTER 0 -+#define CONFIG_PIXELASPECT_FILTER 0 -+#define CONFIG_SCALE_FILTER 0 -+#define CONFIG_SETPTS_FILTER 0 -+#define CONFIG_SETTB_FILTER 0 -+#define CONFIG_SLICIFY_FILTER 0 -+#define CONFIG_TRANSPOSE_FILTER 0 -+#define CONFIG_UNSHARP_FILTER 0 -+#define CONFIG_VFLIP_FILTER 0 -+#define CONFIG_YADIF_FILTER 0 -+#define CONFIG_BUFFER_FILTER 0 -+#define CONFIG_COLOR_FILTER 0 -+#define CONFIG_NULLSRC_FILTER 0 -+#define CONFIG_NULLSINK_FILTER 0 -+#define CONFIG_CONCAT_PROTOCOL 0 -+#define CONFIG_FILE_PROTOCOL 0 -+#define CONFIG_GOPHER_PROTOCOL 0 -+#define CONFIG_HTTP_PROTOCOL 0 -+#define CONFIG_MMSH_PROTOCOL 0 -+#define CONFIG_MMST_PROTOCOL 0 -+#define CONFIG_MD5_PROTOCOL 0 -+#define CONFIG_PIPE_PROTOCOL 0 -+#define CONFIG_RTMP_PROTOCOL 0 -+#define CONFIG_RTMPT_PROTOCOL 0 -+#define CONFIG_RTMPE_PROTOCOL 0 -+#define CONFIG_RTMPTE_PROTOCOL 0 -+#define CONFIG_RTMPS_PROTOCOL 0 -+#define CONFIG_RTP_PROTOCOL 0 -+#define CONFIG_TCP_PROTOCOL 0 -+#define CONFIG_UDP_PROTOCOL 0 -+#define CONFIG_ALSA_INDEV 0 -+#define CONFIG_BKTR_INDEV 0 -+#define CONFIG_DV1394_INDEV 0 -+#define CONFIG_JACK_INDEV 0 -+#define CONFIG_OSS_INDEV 0 -+#define CONFIG_V4L2_INDEV 0 -+#define CONFIG_V4L_INDEV 0 -+#define CONFIG_VFWCAP_INDEV 0 -+#define CONFIG_X11_GRAB_DEVICE_INDEV 0 -+#define CONFIG_LIBDC1394_INDEV 0 -+#define CONFIG_ALSA_OUTDEV 0 -+#define CONFIG_OSS_OUTDEV 0 -+#endif /* FFMPEG_CONFIG_H */ diff --git a/www/chromium/files/patch-third_party__ffmpeg__config__Chrome__freebsd__x64__config.h b/www/chromium/files/patch-third_party__ffmpeg__config__Chrome__freebsd__x64__config.h deleted file mode 100644 index 9a6a0222378a..000000000000 --- a/www/chromium/files/patch-third_party__ffmpeg__config__Chrome__freebsd__x64__config.h +++ /dev/null @@ -1,963 +0,0 @@ ---- ./third_party/ffmpeg/config/Chrome/freebsd/x64/config.h.orig 2010-12-20 20:15:08.000000000 +0100 -+++ ./third_party/ffmpeg/config/Chrome/freebsd/x64/config.h 2010-12-20 20:15:08.000000000 +0100 -@@ -0,0 +1,960 @@ -+/* Automatically generated by configure - do not modify! */ -+#ifndef FFMPEG_CONFIG_H -+#define FFMPEG_CONFIG_H -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --enable-libvpx --enable-decoder='theora,vorbis,libvpx,pcm_u8,pcm_s16le,pcm_f32le,aac,h264,mp3' --enable-encoder=libvpx --enable-demuxer='ogg,matroska,wav,mp3,mov' --enable-parser=mpegaudio --extra-ldflags=-L../../libvpx/linux64/usr/local/lib" -+#define FFMPEG_LICENSE "LGPL version 2.1 or later" -+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -+#define CC_TYPE "gcc" /* rene: what about clang? does $(CC) work? */ -+#define CC_VERSION __VERSION__ -+#define restrict restrict -+#define ASMALIGN(ZEROBITS) ".p2align " #ZEROBITS "\n\t" -+#define EXTERN_PREFIX "" -+#define EXTERN_ASM -+#define SLIBSUF ".so" -+#define ARCH_ALPHA 0 -+#define ARCH_ARM 0 -+#define ARCH_AVR32 0 -+#define ARCH_AVR32_AP 0 -+#define ARCH_AVR32_UC 0 -+#define ARCH_BFIN 0 -+#define ARCH_IA64 0 -+#define ARCH_M68K 0 -+#define ARCH_MIPS 0 -+#define ARCH_MIPS64 0 -+#define ARCH_PARISC 0 -+#define ARCH_PPC 0 -+#define ARCH_PPC64 0 -+#define ARCH_S390 0 -+#define ARCH_SH4 0 -+#define ARCH_SPARC 0 -+#define ARCH_SPARC64 0 -+#define ARCH_TOMI 0 -+#define ARCH_X86 1 -+#define ARCH_X86_32 0 -+#define ARCH_X86_64 1 -+#define HAVE_ALTIVEC 0 -+#define HAVE_AMD3DNOW 0 -+#define HAVE_AMD3DNOWEXT 0 -+#define HAVE_ARMV5TE 0 -+#define HAVE_ARMV6 0 -+#define HAVE_ARMV6T2 0 -+#define HAVE_ARMVFP 0 -+#define HAVE_IWMMXT 0 -+#define HAVE_MMI 0 -+#define HAVE_MMX 1 -+#define HAVE_MMX2 1 -+#define HAVE_NEON 0 -+#define HAVE_PPC4XX 0 -+#define HAVE_SSE 1 -+#define HAVE_SSSE3 1 -+#define HAVE_VIS 0 -+#define HAVE_BIGENDIAN 0 -+#define HAVE_FAST_UNALIGNED 1 -+#define HAVE_PTHREADS 1 -+#define HAVE_W32THREADS 0 -+#define HAVE_ALIGNED_STACK 1 -+#define HAVE_ALSA_ASOUNDLIB_H 0 -+#define HAVE_ALTIVEC_H 0 -+#define HAVE_ARPA_INET_H 0 -+#define HAVE_ATTRIBUTE_MAY_ALIAS 1 -+#define HAVE_ATTRIBUTE_PACKED 1 -+#define HAVE_BSWAP 1 -+#define HAVE_CLOSESOCKET 0 -+#define HAVE_CMOV 1 -+#define HAVE_CONIO_H 0 -+#define HAVE_DCBZL 0 -+#define HAVE_DEV_BKTR_IOCTL_BT848_H 0 -+#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 -+#define HAVE_DEV_IC_BT8XX_H 0 -+#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0 -+#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0 -+#define HAVE_DLFCN_H 1 -+#define HAVE_DLOPEN 1 -+#define HAVE_DOS_PATHS 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 1 -+#define HAVE_FCNTL 1 -+#define HAVE_FORK 1 -+#define HAVE_GETADDRINFO 1 -+#define HAVE_GETHRTIME 0 -+#define HAVE_GETPROCESSMEMORYINFO 0 -+#define HAVE_GETPROCESSTIMES 0 -+#define HAVE_GETRUSAGE 1 -+#define HAVE_GNU_AS 1 -+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1 -+#define HAVE_IBM_ASM 0 -+#define HAVE_INET_ATON 1 -+#define HAVE_INLINE_ASM 1 -+#define HAVE_ISATTY 1 -+#define HAVE_LDBRX 0 -+#define HAVE_LIBDC1394_1 0 -+#define HAVE_LIBDC1394_2 0 -+#define HAVE_LLRINT 1 -+#define HAVE_LLRINTF 1 -+#define HAVE_LOCAL_ALIGNED_16 1 -+#define HAVE_LOCAL_ALIGNED_8 1 -+#define HAVE_LOG2 0 -+#define HAVE_LOG2F 0 -+#define HAVE_LOONGSON 0 -+#define HAVE_LRINT 1 -+#define HAVE_LRINTF 1 -+#define HAVE_LZO1X_999_COMPRESS 0 -+#define HAVE_MACHINE_IOCTL_BT848_H 0 -+#define HAVE_MACHINE_IOCTL_METEOR_H 0 -+#define HAVE_MALLOC_H 0 -+#define HAVE_MEMALIGN 0 -+#define HAVE_MKSTEMP 1 -+#define HAVE_PLD 0 -+#define HAVE_POSIX_MEMALIGN 1 -+#define HAVE_ROUND 1 -+#define HAVE_ROUNDF 1 -+#define HAVE_SDL 0 -+#define HAVE_SDL_VIDEO_SIZE 0 -+#define HAVE_SETMODE 0 -+#define HAVE_SOCKLEN_T 0 -+#define HAVE_SOUNDCARD_H 0 -+#define HAVE_POLL_H 1 -+#define HAVE_SETRLIMIT 1 -+#define HAVE_STRERROR_R 1 -+#define HAVE_STRTOK_R 1 -+#define HAVE_STRUCT_ADDRINFO 0 -+#define HAVE_STRUCT_IPV6_MREQ 0 -+#define HAVE_STRUCT_SOCKADDR_IN6 0 -+#define HAVE_STRUCT_SOCKADDR_SA_LEN 0 -+#define HAVE_STRUCT_SOCKADDR_STORAGE 0 -+#define HAVE_SYMVER 0 -+#define HAVE_SYMVER_GNU_ASM 1 -+#define HAVE_SYMVER_ASM_LABEL 0 -+#define HAVE_SYS_MMAN_H 1 -+#define HAVE_SYS_RESOURCE_H 1 -+#define HAVE_SYS_SELECT_H 1 -+#define HAVE_SYS_SOUNDCARD_H 1 -+#define HAVE_SYS_VIDEOIO_H 0 -+#define HAVE_TEN_OPERANDS 1 -+#define HAVE_TERMIOS_H 1 -+#define HAVE_THREADS 1 -+#define HAVE_TRUNCF 1 -+#define HAVE_VFP_ARGS 0 -+#define HAVE_VIRTUALALLOC 0 -+#define HAVE_WINSOCK2_H 0 -+#define HAVE_XFORM_ASM 0 -+#define HAVE_XMM_CLOBBERS 1 -+#define HAVE_YASM 1 -+#define CONFIG_BSFS 0 -+#define CONFIG_DECODERS 1 -+#define CONFIG_DEMUXERS 1 -+#define CONFIG_ENCODERS 1 -+#define CONFIG_FILTERS 0 -+#define CONFIG_HWACCELS 0 -+#define CONFIG_INDEVS 0 -+#define CONFIG_MUXERS 0 -+#define CONFIG_OUTDEVS 0 -+#define CONFIG_PARSERS 1 -+#define CONFIG_PROTOCOLS 1 -+#define CONFIG_AANDCT 0 -+#define CONFIG_AVCODEC 1 -+#define CONFIG_AVCORE 1 -+#define CONFIG_AVDEVICE 1 -+#define CONFIG_AVFILTER 1 -+#define CONFIG_AVFORMAT 1 -+#define CONFIG_AVISYNTH 0 -+#define CONFIG_BZLIB 0 -+#define CONFIG_DCT 0 -+#define CONFIG_DOC 0 -+#define CONFIG_DWT 0 -+#define CONFIG_DXVA2 0 -+#define CONFIG_FASTDIV 1 -+#define CONFIG_FFMPEG 0 -+#define CONFIG_FFPLAY 0 -+#define CONFIG_FFPROBE 1 -+#define CONFIG_FFSERVER 0 -+#define CONFIG_FFT 1 -+#define CONFIG_FREI0R 0 -+#define CONFIG_GOLOMB 1 -+#define CONFIG_GPL 0 -+#define CONFIG_GRAY 0 -+#define CONFIG_H264DSP 1 -+#define CONFIG_H264PRED 1 -+#define CONFIG_HARDCODED_TABLES 0 -+#define CONFIG_HUFFMAN 0 -+#define CONFIG_LIBDC1394 0 -+#define CONFIG_LIBDIRAC 0 -+#define CONFIG_LIBFAAC 0 -+#define CONFIG_LIBGSM 0 -+#define CONFIG_LIBMP3LAME 0 -+#define CONFIG_LIBNUT 0 -+#define CONFIG_LIBOPENCORE_AMRNB 0 -+#define CONFIG_LIBOPENCORE_AMRWB 0 -+#define CONFIG_LIBOPENCV 0 -+#define CONFIG_LIBOPENJPEG 0 -+#define CONFIG_LIBRTMP 0 -+#define CONFIG_LIBSCHROEDINGER 0 -+#define CONFIG_LIBSPEEX 0 -+#define CONFIG_LIBTHEORA 0 -+#define CONFIG_LIBVORBIS 0 -+#define CONFIG_LIBVPX 1 -+#define CONFIG_LIBX264 0 -+#define CONFIG_LIBXAVS 0 -+#define CONFIG_LIBXVID 0 -+#define CONFIG_LPC 0 -+#define CONFIG_LSP 0 -+#define CONFIG_MDCT 1 -+#define CONFIG_MEMALIGN_HACK 0 -+#define CONFIG_MLIB 0 -+#define CONFIG_MPEGAUDIO_HP 1 -+#define CONFIG_NETWORK 0 -+#define CONFIG_NONFREE 0 -+#define CONFIG_PIC 1 -+#define CONFIG_POSTPROC 0 -+#define CONFIG_RDFT 1 -+#define CONFIG_RTPDEC 0 -+#define CONFIG_RUNTIME_CPUDETECT 0 -+#define CONFIG_SHARED 1 -+#define CONFIG_SMALL 0 -+#define CONFIG_SRAM 0 -+#define CONFIG_STATIC 1 -+#define CONFIG_SWSCALE 0 -+#define CONFIG_SWSCALE_ALPHA 1 -+#define CONFIG_VAAPI 0 -+#define CONFIG_VDPAU 0 -+#define CONFIG_VERSION3 0 -+#define CONFIG_X11GRAB 0 -+#define CONFIG_ZLIB 0 -+#define CONFIG_AVUTIL 1 -+#define CONFIG_GPLV3 0 -+#define CONFIG_LGPLV3 0 -+#define CONFIG_AASC_DECODER 0 -+#define CONFIG_AMV_DECODER 0 -+#define CONFIG_ANM_DECODER 0 -+#define CONFIG_ANSI_DECODER 0 -+#define CONFIG_ASV1_DECODER 0 -+#define CONFIG_ASV2_DECODER 0 -+#define CONFIG_AURA_DECODER 0 -+#define CONFIG_AURA2_DECODER 0 -+#define CONFIG_AVS_DECODER 0 -+#define CONFIG_BETHSOFTVID_DECODER 0 -+#define CONFIG_BFI_DECODER 0 -+#define CONFIG_BINK_DECODER 0 -+#define CONFIG_BMP_DECODER 0 -+#define CONFIG_C93_DECODER 0 -+#define CONFIG_CAVS_DECODER 0 -+#define CONFIG_CDGRAPHICS_DECODER 0 -+#define CONFIG_CINEPAK_DECODER 0 -+#define CONFIG_CLJR_DECODER 0 -+#define CONFIG_CSCD_DECODER 0 -+#define CONFIG_CYUV_DECODER 0 -+#define CONFIG_DNXHD_DECODER 0 -+#define CONFIG_DPX_DECODER 0 -+#define CONFIG_DSICINVIDEO_DECODER 0 -+#define CONFIG_DVVIDEO_DECODER 0 -+#define CONFIG_DXA_DECODER 0 -+#define CONFIG_EACMV_DECODER 0 -+#define CONFIG_EAMAD_DECODER 0 -+#define CONFIG_EATGQ_DECODER 0 -+#define CONFIG_EATGV_DECODER 0 -+#define CONFIG_EATQI_DECODER 0 -+#define CONFIG_EIGHTBPS_DECODER 0 -+#define CONFIG_EIGHTSVX_EXP_DECODER 0 -+#define CONFIG_EIGHTSVX_FIB_DECODER 0 -+#define CONFIG_ESCAPE124_DECODER 0 -+#define CONFIG_FFV1_DECODER 0 -+#define CONFIG_FFVHUFF_DECODER 0 -+#define CONFIG_FLASHSV_DECODER 0 -+#define CONFIG_FLIC_DECODER 0 -+#define CONFIG_FLV_DECODER 0 -+#define CONFIG_FOURXM_DECODER 0 -+#define CONFIG_FRAPS_DECODER 0 -+#define CONFIG_FRWU_DECODER 0 -+#define CONFIG_GIF_DECODER 0 -+#define CONFIG_H261_DECODER 0 -+#define CONFIG_H263_DECODER 0 -+#define CONFIG_H263I_DECODER 0 -+#define CONFIG_H264_DECODER 1 -+#define CONFIG_H264_VDPAU_DECODER 0 -+#define CONFIG_HUFFYUV_DECODER 0 -+#define CONFIG_IDCIN_DECODER 0 -+#define CONFIG_IFF_BYTERUN1_DECODER 0 -+#define CONFIG_IFF_ILBM_DECODER 0 -+#define CONFIG_INDEO2_DECODER 0 -+#define CONFIG_INDEO3_DECODER 0 -+#define CONFIG_INDEO5_DECODER 0 -+#define CONFIG_INTERPLAY_VIDEO_DECODER 0 -+#define CONFIG_JPEGLS_DECODER 0 -+#define CONFIG_KGV1_DECODER 0 -+#define CONFIG_KMVC_DECODER 0 -+#define CONFIG_LOCO_DECODER 0 -+#define CONFIG_MDEC_DECODER 0 -+#define CONFIG_MIMIC_DECODER 0 -+#define CONFIG_MJPEG_DECODER 0 -+#define CONFIG_MJPEGB_DECODER 0 -+#define CONFIG_MMVIDEO_DECODER 0 -+#define CONFIG_MOTIONPIXELS_DECODER 0 -+#define CONFIG_MPEG_XVMC_DECODER 0 -+#define CONFIG_MPEG1VIDEO_DECODER 0 -+#define CONFIG_MPEG2VIDEO_DECODER 0 -+#define CONFIG_MPEG4_DECODER 0 -+#define CONFIG_MPEG4_VDPAU_DECODER 0 -+#define CONFIG_MPEGVIDEO_DECODER 0 -+#define CONFIG_MPEG_VDPAU_DECODER 0 -+#define CONFIG_MPEG1_VDPAU_DECODER 0 -+#define CONFIG_MSMPEG4V1_DECODER 0 -+#define CONFIG_MSMPEG4V2_DECODER 0 -+#define CONFIG_MSMPEG4V3_DECODER 0 -+#define CONFIG_MSRLE_DECODER 0 -+#define CONFIG_MSVIDEO1_DECODER 0 -+#define CONFIG_MSZH_DECODER 0 -+#define CONFIG_NUV_DECODER 0 -+#define CONFIG_PAM_DECODER 0 -+#define CONFIG_PBM_DECODER 0 -+#define CONFIG_PCX_DECODER 0 -+#define CONFIG_PGM_DECODER 0 -+#define CONFIG_PGMYUV_DECODER 0 -+#define CONFIG_PICTOR_DECODER 0 -+#define CONFIG_PNG_DECODER 0 -+#define CONFIG_PPM_DECODER 0 -+#define CONFIG_PTX_DECODER 0 -+#define CONFIG_QDRAW_DECODER 0 -+#define CONFIG_QPEG_DECODER 0 -+#define CONFIG_QTRLE_DECODER 0 -+#define CONFIG_R10K_DECODER 0 -+#define CONFIG_R210_DECODER 0 -+#define CONFIG_RAWVIDEO_DECODER 0 -+#define CONFIG_RL2_DECODER 0 -+#define CONFIG_ROQ_DECODER 0 -+#define CONFIG_RPZA_DECODER 0 -+#define CONFIG_RV10_DECODER 0 -+#define CONFIG_RV20_DECODER 0 -+#define CONFIG_RV30_DECODER 0 -+#define CONFIG_RV40_DECODER 0 -+#define CONFIG_SGI_DECODER 0 -+#define CONFIG_SMACKER_DECODER 0 -+#define CONFIG_SMC_DECODER 0 -+#define CONFIG_SNOW_DECODER 0 -+#define CONFIG_SP5X_DECODER 0 -+#define CONFIG_SUNRAST_DECODER 0 -+#define CONFIG_SVQ1_DECODER 0 -+#define CONFIG_SVQ3_DECODER 0 -+#define CONFIG_TARGA_DECODER 0 -+#define CONFIG_THEORA_DECODER 1 -+#define CONFIG_THP_DECODER 0 -+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 -+#define CONFIG_TIFF_DECODER 0 -+#define CONFIG_TMV_DECODER 0 -+#define CONFIG_TRUEMOTION1_DECODER 0 -+#define CONFIG_TRUEMOTION2_DECODER 0 -+#define CONFIG_TSCC_DECODER 0 -+#define CONFIG_TXD_DECODER 0 -+#define CONFIG_ULTI_DECODER 0 -+#define CONFIG_V210_DECODER 0 -+#define CONFIG_V210X_DECODER 0 -+#define CONFIG_VB_DECODER 0 -+#define CONFIG_VC1_DECODER 0 -+#define CONFIG_VC1_VDPAU_DECODER 0 -+#define CONFIG_VCR1_DECODER 0 -+#define CONFIG_VMDVIDEO_DECODER 0 -+#define CONFIG_VMNC_DECODER 0 -+#define CONFIG_VP3_DECODER 1 -+#define CONFIG_VP5_DECODER 0 -+#define CONFIG_VP6_DECODER 0 -+#define CONFIG_VP6A_DECODER 0 -+#define CONFIG_VP6F_DECODER 0 -+#define CONFIG_VP8_DECODER 0 -+#define CONFIG_VQA_DECODER 0 -+#define CONFIG_WMV1_DECODER 0 -+#define CONFIG_WMV2_DECODER 0 -+#define CONFIG_WMV3_DECODER 0 -+#define CONFIG_WMV3_VDPAU_DECODER 0 -+#define CONFIG_WNV1_DECODER 0 -+#define CONFIG_XAN_WC3_DECODER 0 -+#define CONFIG_XL_DECODER 0 -+#define CONFIG_YOP_DECODER 0 -+#define CONFIG_ZLIB_DECODER 0 -+#define CONFIG_ZMBV_DECODER 0 -+#define CONFIG_AAC_DECODER 1 -+#define CONFIG_AAC_LATM_DECODER 0 -+#define CONFIG_AC3_DECODER 0 -+#define CONFIG_ALAC_DECODER 0 -+#define CONFIG_ALS_DECODER 0 -+#define CONFIG_AMRNB_DECODER 0 -+#define CONFIG_APE_DECODER 0 -+#define CONFIG_ATRAC1_DECODER 0 -+#define CONFIG_ATRAC3_DECODER 0 -+#define CONFIG_BINKAUDIO_DCT_DECODER 0 -+#define CONFIG_BINKAUDIO_RDFT_DECODER 0 -+#define CONFIG_COOK_DECODER 0 -+#define CONFIG_DCA_DECODER 0 -+#define CONFIG_DSICINAUDIO_DECODER 0 -+#define CONFIG_EAC3_DECODER 0 -+#define CONFIG_FLAC_DECODER 0 -+#define CONFIG_GSM_DECODER 0 -+#define CONFIG_GSM_MS_DECODER 0 -+#define CONFIG_IMC_DECODER 0 -+#define CONFIG_MACE3_DECODER 0 -+#define CONFIG_MACE6_DECODER 0 -+#define CONFIG_MLP_DECODER 0 -+#define CONFIG_MP1_DECODER 0 -+#define CONFIG_MP1FLOAT_DECODER 0 -+#define CONFIG_MP2_DECODER 0 -+#define CONFIG_MP2FLOAT_DECODER 0 -+#define CONFIG_MP3_DECODER 1 -+#define CONFIG_MP3FLOAT_DECODER 0 -+#define CONFIG_MP3ADU_DECODER 0 -+#define CONFIG_MP3ADUFLOAT_DECODER 0 -+#define CONFIG_MP3ON4_DECODER 0 -+#define CONFIG_MP3ON4FLOAT_DECODER 0 -+#define CONFIG_MPC7_DECODER 0 -+#define CONFIG_MPC8_DECODER 0 -+#define CONFIG_NELLYMOSER_DECODER 0 -+#define CONFIG_QCELP_DECODER 0 -+#define CONFIG_QDM2_DECODER 0 -+#define CONFIG_RA_144_DECODER 0 -+#define CONFIG_RA_288_DECODER 0 -+#define CONFIG_SHORTEN_DECODER 0 -+#define CONFIG_SIPR_DECODER 0 -+#define CONFIG_SMACKAUD_DECODER 0 -+#define CONFIG_SONIC_DECODER 0 -+#define CONFIG_TRUEHD_DECODER 0 -+#define CONFIG_TRUESPEECH_DECODER 0 -+#define CONFIG_TTA_DECODER 0 -+#define CONFIG_TWINVQ_DECODER 0 -+#define CONFIG_VMDAUDIO_DECODER 0 -+#define CONFIG_VORBIS_DECODER 1 -+#define CONFIG_WAVPACK_DECODER 0 -+#define CONFIG_WMAPRO_DECODER 0 -+#define CONFIG_WMAV1_DECODER 0 -+#define CONFIG_WMAV2_DECODER 0 -+#define CONFIG_WMAVOICE_DECODER 0 -+#define CONFIG_WS_SND1_DECODER 0 -+#define CONFIG_PCM_ALAW_DECODER 0 -+#define CONFIG_PCM_BLURAY_DECODER 0 -+#define CONFIG_PCM_DVD_DECODER 0 -+#define CONFIG_PCM_F32BE_DECODER 0 -+#define CONFIG_PCM_F32LE_DECODER 1 -+#define CONFIG_PCM_F64BE_DECODER 0 -+#define CONFIG_PCM_F64LE_DECODER 0 -+#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_S16LE_DECODER 1 -+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S24BE_DECODER 0 -+#define CONFIG_PCM_S24DAUD_DECODER 0 -+#define CONFIG_PCM_S24LE_DECODER 0 -+#define CONFIG_PCM_S32BE_DECODER 0 -+#define CONFIG_PCM_S32LE_DECODER 0 -+#define CONFIG_PCM_U8_DECODER 1 -+#define CONFIG_PCM_U16BE_DECODER 0 -+#define CONFIG_PCM_U16LE_DECODER 0 -+#define CONFIG_PCM_U24BE_DECODER 0 -+#define CONFIG_PCM_U24LE_DECODER 0 -+#define CONFIG_PCM_U32BE_DECODER 0 -+#define CONFIG_PCM_U32LE_DECODER 0 -+#define CONFIG_PCM_ZORK_DECODER 0 -+#define CONFIG_INTERPLAY_DPCM_DECODER 0 -+#define CONFIG_ROQ_DPCM_DECODER 0 -+#define CONFIG_SOL_DPCM_DECODER 0 -+#define CONFIG_XAN_DPCM_DECODER 0 -+#define CONFIG_ADPCM_4XM_DECODER 0 -+#define CONFIG_ADPCM_ADX_DECODER 0 -+#define CONFIG_ADPCM_CT_DECODER 0 -+#define CONFIG_ADPCM_EA_DECODER 0 -+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 -+#define CONFIG_ADPCM_EA_R1_DECODER 0 -+#define CONFIG_ADPCM_EA_R2_DECODER 0 -+#define CONFIG_ADPCM_EA_R3_DECODER 0 -+#define CONFIG_ADPCM_EA_XAS_DECODER 0 -+#define CONFIG_ADPCM_G722_DECODER 0 -+#define CONFIG_ADPCM_G726_DECODER 0 -+#define CONFIG_ADPCM_IMA_AMV_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK3_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK4_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_ISS_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_DECODER 0 -+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 -+#define CONFIG_ADPCM_IMA_WAV_DECODER 0 -+#define CONFIG_ADPCM_IMA_WS_DECODER 0 -+#define CONFIG_ADPCM_MS_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_2_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_3_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_4_DECODER 0 -+#define CONFIG_ADPCM_SWF_DECODER 0 -+#define CONFIG_ADPCM_THP_DECODER 0 -+#define CONFIG_ADPCM_XA_DECODER 0 -+#define CONFIG_ADPCM_YAMAHA_DECODER 0 -+#define CONFIG_DVBSUB_DECODER 0 -+#define CONFIG_DVDSUB_DECODER 0 -+#define CONFIG_PGSSUB_DECODER 0 -+#define CONFIG_XSUB_DECODER 0 -+#define CONFIG_LIBDIRAC_DECODER 0 -+#define CONFIG_LIBGSM_DECODER 0 -+#define CONFIG_LIBGSM_MS_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 -+#define CONFIG_LIBOPENJPEG_DECODER 0 -+#define CONFIG_LIBSCHROEDINGER_DECODER 0 -+#define CONFIG_LIBSPEEX_DECODER 0 -+#define CONFIG_LIBVPX_DECODER 1 -+#define CONFIG_A64MULTI_ENCODER 0 -+#define CONFIG_A64MULTI5_ENCODER 0 -+#define CONFIG_ASV1_ENCODER 0 -+#define CONFIG_ASV2_ENCODER 0 -+#define CONFIG_BMP_ENCODER 0 -+#define CONFIG_DNXHD_ENCODER 0 -+#define CONFIG_DVVIDEO_ENCODER 0 -+#define CONFIG_FFV1_ENCODER 0 -+#define CONFIG_FFVHUFF_ENCODER 0 -+#define CONFIG_FLASHSV_ENCODER 0 -+#define CONFIG_FLV_ENCODER 0 -+#define CONFIG_GIF_ENCODER 0 -+#define CONFIG_H261_ENCODER 0 -+#define CONFIG_H263_ENCODER 0 -+#define CONFIG_H263P_ENCODER 0 -+#define CONFIG_HUFFYUV_ENCODER 0 -+#define CONFIG_JPEGLS_ENCODER 0 -+#define CONFIG_LJPEG_ENCODER 0 -+#define CONFIG_MJPEG_ENCODER 0 -+#define CONFIG_MPEG1VIDEO_ENCODER 0 -+#define CONFIG_MPEG2VIDEO_ENCODER 0 -+#define CONFIG_MPEG4_ENCODER 0 -+#define CONFIG_MSMPEG4V1_ENCODER 0 -+#define CONFIG_MSMPEG4V2_ENCODER 0 -+#define CONFIG_MSMPEG4V3_ENCODER 0 -+#define CONFIG_PAM_ENCODER 0 -+#define CONFIG_PBM_ENCODER 0 -+#define CONFIG_PCX_ENCODER 0 -+#define CONFIG_PGM_ENCODER 0 -+#define CONFIG_PGMYUV_ENCODER 0 -+#define CONFIG_PNG_ENCODER 0 -+#define CONFIG_PPM_ENCODER 0 -+#define CONFIG_QTRLE_ENCODER 0 -+#define CONFIG_RAWVIDEO_ENCODER 0 -+#define CONFIG_ROQ_ENCODER 0 -+#define CONFIG_RV10_ENCODER 0 -+#define CONFIG_RV20_ENCODER 0 -+#define CONFIG_SGI_ENCODER 0 -+#define CONFIG_SNOW_ENCODER 0 -+#define CONFIG_SVQ1_ENCODER 0 -+#define CONFIG_TARGA_ENCODER 0 -+#define CONFIG_TIFF_ENCODER 0 -+#define CONFIG_V210_ENCODER 0 -+#define CONFIG_WMV1_ENCODER 0 -+#define CONFIG_WMV2_ENCODER 0 -+#define CONFIG_ZLIB_ENCODER 0 -+#define CONFIG_ZMBV_ENCODER 0 -+#define CONFIG_AAC_ENCODER 0 -+#define CONFIG_AC3_ENCODER 0 -+#define CONFIG_ALAC_ENCODER 0 -+#define CONFIG_FLAC_ENCODER 0 -+#define CONFIG_MP2_ENCODER 0 -+#define CONFIG_NELLYMOSER_ENCODER 0 -+#define CONFIG_RA_144_ENCODER 0 -+#define CONFIG_SONIC_ENCODER 0 -+#define CONFIG_SONIC_LS_ENCODER 0 -+#define CONFIG_VORBIS_ENCODER 0 -+#define CONFIG_WMAV1_ENCODER 0 -+#define CONFIG_WMAV2_ENCODER 0 -+#define CONFIG_PCM_ALAW_ENCODER 0 -+#define CONFIG_PCM_F32BE_ENCODER 0 -+#define CONFIG_PCM_F32LE_ENCODER 0 -+#define CONFIG_PCM_F64BE_ENCODER 0 -+#define CONFIG_PCM_F64LE_ENCODER 0 -+#define CONFIG_PCM_MULAW_ENCODER 0 -+#define CONFIG_PCM_S8_ENCODER 0 -+#define CONFIG_PCM_S16BE_ENCODER 0 -+#define CONFIG_PCM_S16LE_ENCODER 0 -+#define CONFIG_PCM_S24BE_ENCODER 0 -+#define CONFIG_PCM_S24DAUD_ENCODER 0 -+#define CONFIG_PCM_S24LE_ENCODER 0 -+#define CONFIG_PCM_S32BE_ENCODER 0 -+#define CONFIG_PCM_S32LE_ENCODER 0 -+#define CONFIG_PCM_U8_ENCODER 0 -+#define CONFIG_PCM_U16BE_ENCODER 0 -+#define CONFIG_PCM_U16LE_ENCODER 0 -+#define CONFIG_PCM_U24BE_ENCODER 0 -+#define CONFIG_PCM_U24LE_ENCODER 0 -+#define CONFIG_PCM_U32BE_ENCODER 0 -+#define CONFIG_PCM_U32LE_ENCODER 0 -+#define CONFIG_PCM_ZORK_ENCODER 0 -+#define CONFIG_ROQ_DPCM_ENCODER 0 -+#define CONFIG_ADPCM_ADX_ENCODER 0 -+#define CONFIG_ADPCM_G722_ENCODER 0 -+#define CONFIG_ADPCM_G726_ENCODER 0 -+#define CONFIG_ADPCM_IMA_QT_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 -+#define CONFIG_ADPCM_MS_ENCODER 0 -+#define CONFIG_ADPCM_SWF_ENCODER 0 -+#define CONFIG_ADPCM_YAMAHA_ENCODER 0 -+#define CONFIG_DVBSUB_ENCODER 0 -+#define CONFIG_DVDSUB_ENCODER 0 -+#define CONFIG_XSUB_ENCODER 0 -+#define CONFIG_LIBDIRAC_ENCODER 0 -+#define CONFIG_LIBFAAC_ENCODER 0 -+#define CONFIG_LIBGSM_ENCODER 0 -+#define CONFIG_LIBGSM_MS_ENCODER 0 -+#define CONFIG_LIBMP3LAME_ENCODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 -+#define CONFIG_LIBSCHROEDINGER_ENCODER 0 -+#define CONFIG_LIBTHEORA_ENCODER 0 -+#define CONFIG_LIBVORBIS_ENCODER 0 -+#define CONFIG_LIBVPX_ENCODER 1 -+#define CONFIG_LIBX264_ENCODER 0 -+#define CONFIG_LIBXAVS_ENCODER 0 -+#define CONFIG_LIBXVID_ENCODER 0 -+#define CONFIG_H263_VAAPI_HWACCEL 0 -+#define CONFIG_H264_DXVA2_HWACCEL 0 -+#define CONFIG_H264_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG2_DXVA2_HWACCEL 0 -+#define CONFIG_MPEG2_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG4_VAAPI_HWACCEL 0 -+#define CONFIG_VC1_DXVA2_HWACCEL 0 -+#define CONFIG_VC1_VAAPI_HWACCEL 0 -+#define CONFIG_WMV3_DXVA2_HWACCEL 0 -+#define CONFIG_WMV3_VAAPI_HWACCEL 0 -+#define CONFIG_AAC_PARSER 0 -+#define CONFIG_AAC_LATM_PARSER 0 -+#define CONFIG_AC3_PARSER 0 -+#define CONFIG_CAVSVIDEO_PARSER 0 -+#define CONFIG_DCA_PARSER 0 -+#define CONFIG_DIRAC_PARSER 0 -+#define CONFIG_DNXHD_PARSER 0 -+#define CONFIG_DVBSUB_PARSER 0 -+#define CONFIG_DVDSUB_PARSER 0 -+#define CONFIG_H261_PARSER 0 -+#define CONFIG_H263_PARSER 0 -+#define CONFIG_H264_PARSER 0 -+#define CONFIG_MJPEG_PARSER 0 -+#define CONFIG_MLP_PARSER 0 -+#define CONFIG_MPEG4VIDEO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 -+#define CONFIG_MPEGVIDEO_PARSER 0 -+#define CONFIG_PNM_PARSER 0 -+#define CONFIG_VC1_PARSER 0 -+#define CONFIG_VP3_PARSER 0 -+#define CONFIG_VP8_PARSER 0 -+#define CONFIG_AAC_ADTSTOASC_BSF 0 -+#define CONFIG_CHOMP_BSF 0 -+#define CONFIG_DUMP_EXTRADATA_BSF 0 -+#define CONFIG_H264_MP4TOANNEXB_BSF 0 -+#define CONFIG_MPEG4VIDEO_ES_BSF 0 -+#define CONFIG_IMX_DUMP_HEADER_BSF 0 -+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 -+#define CONFIG_MP3_HEADER_COMPRESS_BSF 0 -+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0 -+#define CONFIG_MOV2TEXTSUB_BSF 0 -+#define CONFIG_NOISE_BSF 0 -+#define CONFIG_REMOVE_EXTRADATA_BSF 0 -+#define CONFIG_TEXT2MOVSUB_BSF 0 -+#define CONFIG_VC1_ASFTORCV_BSF 0 -+#define CONFIG_VC1_ASFTOANNEXG_BSF 0 -+#define CONFIG_AAC_DEMUXER 0 -+#define CONFIG_AC3_DEMUXER 0 -+#define CONFIG_AEA_DEMUXER 0 -+#define CONFIG_AIFF_DEMUXER 0 -+#define CONFIG_AMR_DEMUXER 0 -+#define CONFIG_ANM_DEMUXER 0 -+#define CONFIG_APC_DEMUXER 0 -+#define CONFIG_APE_DEMUXER 0 -+#define CONFIG_APPLEHTTP_DEMUXER 0 -+#define CONFIG_ASF_DEMUXER 0 -+#define CONFIG_ASS_DEMUXER 0 -+#define CONFIG_AU_DEMUXER 0 -+#define CONFIG_AVI_DEMUXER 0 -+#define CONFIG_AVISYNTH_DEMUXER 0 -+#define CONFIG_AVS_DEMUXER 0 -+#define CONFIG_BETHSOFTVID_DEMUXER 0 -+#define CONFIG_BFI_DEMUXER 0 -+#define CONFIG_BINK_DEMUXER 0 -+#define CONFIG_C93_DEMUXER 0 -+#define CONFIG_CAF_DEMUXER 0 -+#define CONFIG_CAVSVIDEO_DEMUXER 0 -+#define CONFIG_CDG_DEMUXER 0 -+#define CONFIG_DAUD_DEMUXER 0 -+#define CONFIG_DIRAC_DEMUXER 0 -+#define CONFIG_DNXHD_DEMUXER 0 -+#define CONFIG_DSICIN_DEMUXER 0 -+#define CONFIG_DTS_DEMUXER 0 -+#define CONFIG_DV_DEMUXER 0 -+#define CONFIG_DXA_DEMUXER 0 -+#define CONFIG_EA_DEMUXER 0 -+#define CONFIG_EA_CDATA_DEMUXER 0 -+#define CONFIG_EAC3_DEMUXER 0 -+#define CONFIG_FFM_DEMUXER 0 -+#define CONFIG_FILMSTRIP_DEMUXER 0 -+#define CONFIG_FLAC_DEMUXER 0 -+#define CONFIG_FLIC_DEMUXER 0 -+#define CONFIG_FLV_DEMUXER 0 -+#define CONFIG_FOURXM_DEMUXER 0 -+#define CONFIG_G722_DEMUXER 0 -+#define CONFIG_GSM_DEMUXER 0 -+#define CONFIG_GXF_DEMUXER 0 -+#define CONFIG_H261_DEMUXER 0 -+#define CONFIG_H263_DEMUXER 0 -+#define CONFIG_H264_DEMUXER 0 -+#define CONFIG_IDCIN_DEMUXER 0 -+#define CONFIG_IFF_DEMUXER 0 -+#define CONFIG_IMAGE2_DEMUXER 0 -+#define CONFIG_IMAGE2PIPE_DEMUXER 0 -+#define CONFIG_INGENIENT_DEMUXER 0 -+#define CONFIG_IPMOVIE_DEMUXER 0 -+#define CONFIG_ISS_DEMUXER 0 -+#define CONFIG_IV8_DEMUXER 0 -+#define CONFIG_IVF_DEMUXER 0 -+#define CONFIG_LMLM4_DEMUXER 0 -+#define CONFIG_LXF_DEMUXER 0 -+#define CONFIG_M4V_DEMUXER 0 -+#define CONFIG_MATROSKA_DEMUXER 1 -+#define CONFIG_MJPEG_DEMUXER 0 -+#define CONFIG_MLP_DEMUXER 0 -+#define CONFIG_MM_DEMUXER 0 -+#define CONFIG_MMF_DEMUXER 0 -+#define CONFIG_MOV_DEMUXER 1 -+#define CONFIG_MP3_DEMUXER 1 -+#define CONFIG_MPC_DEMUXER 0 -+#define CONFIG_MPC8_DEMUXER 0 -+#define CONFIG_MPEGPS_DEMUXER 0 -+#define CONFIG_MPEGTS_DEMUXER 0 -+#define CONFIG_MPEGTSRAW_DEMUXER 0 -+#define CONFIG_MPEGVIDEO_DEMUXER 0 -+#define CONFIG_MSNWC_TCP_DEMUXER 0 -+#define CONFIG_MTV_DEMUXER 0 -+#define CONFIG_MVI_DEMUXER 0 -+#define CONFIG_MXF_DEMUXER 0 -+#define CONFIG_NC_DEMUXER 0 -+#define CONFIG_NSV_DEMUXER 0 -+#define CONFIG_NUT_DEMUXER 0 -+#define CONFIG_NUV_DEMUXER 0 -+#define CONFIG_OGG_DEMUXER 1 -+#define CONFIG_OMA_DEMUXER 0 -+#define CONFIG_PCM_ALAW_DEMUXER 0 -+#define CONFIG_PCM_MULAW_DEMUXER 0 -+#define CONFIG_PCM_F64BE_DEMUXER 0 -+#define CONFIG_PCM_F64LE_DEMUXER 0 -+#define CONFIG_PCM_F32BE_DEMUXER 0 -+#define CONFIG_PCM_F32LE_DEMUXER 0 -+#define CONFIG_PCM_S32BE_DEMUXER 0 -+#define CONFIG_PCM_S32LE_DEMUXER 0 -+#define CONFIG_PCM_S24BE_DEMUXER 0 -+#define CONFIG_PCM_S24LE_DEMUXER 0 -+#define CONFIG_PCM_S16BE_DEMUXER 0 -+#define CONFIG_PCM_S16LE_DEMUXER 0 -+#define CONFIG_PCM_S8_DEMUXER 0 -+#define CONFIG_PCM_U32BE_DEMUXER 0 -+#define CONFIG_PCM_U32LE_DEMUXER 0 -+#define CONFIG_PCM_U24BE_DEMUXER 0 -+#define CONFIG_PCM_U24LE_DEMUXER 0 -+#define CONFIG_PCM_U16BE_DEMUXER 0 -+#define CONFIG_PCM_U16LE_DEMUXER 0 -+#define CONFIG_PCM_U8_DEMUXER 0 -+#define CONFIG_PVA_DEMUXER 0 -+#define CONFIG_QCP_DEMUXER 0 -+#define CONFIG_R3D_DEMUXER 0 -+#define CONFIG_RAWVIDEO_DEMUXER 0 -+#define CONFIG_RL2_DEMUXER 0 -+#define CONFIG_RM_DEMUXER 0 -+#define CONFIG_ROQ_DEMUXER 0 -+#define CONFIG_RPL_DEMUXER 0 -+#define CONFIG_RSO_DEMUXER 0 -+#define CONFIG_RTP_DEMUXER 0 -+#define CONFIG_RTSP_DEMUXER 0 -+#define CONFIG_SAP_DEMUXER 0 -+#define CONFIG_SDP_DEMUXER 0 -+#define CONFIG_SEGAFILM_DEMUXER 0 -+#define CONFIG_SHORTEN_DEMUXER 0 -+#define CONFIG_SIFF_DEMUXER 0 -+#define CONFIG_SMACKER_DEMUXER 0 -+#define CONFIG_SOL_DEMUXER 0 -+#define CONFIG_SOX_DEMUXER 0 -+#define CONFIG_SRT_DEMUXER 0 -+#define CONFIG_STR_DEMUXER 0 -+#define CONFIG_SWF_DEMUXER 0 -+#define CONFIG_THP_DEMUXER 0 -+#define CONFIG_TIERTEXSEQ_DEMUXER 0 -+#define CONFIG_TMV_DEMUXER 0 -+#define CONFIG_TRUEHD_DEMUXER 0 -+#define CONFIG_TTA_DEMUXER 0 -+#define CONFIG_TXD_DEMUXER 0 -+#define CONFIG_TTY_DEMUXER 0 -+#define CONFIG_VC1_DEMUXER 0 -+#define CONFIG_VC1T_DEMUXER 0 -+#define CONFIG_VMD_DEMUXER 0 -+#define CONFIG_VOC_DEMUXER 0 -+#define CONFIG_VQF_DEMUXER 0 -+#define CONFIG_W64_DEMUXER 0 -+#define CONFIG_WAV_DEMUXER 1 -+#define CONFIG_WC3_DEMUXER 0 -+#define CONFIG_WEBP_DEMUXER 0 -+#define CONFIG_WSAUD_DEMUXER 0 -+#define CONFIG_WSVQA_DEMUXER 0 -+#define CONFIG_WV_DEMUXER 0 -+#define CONFIG_XA_DEMUXER 0 -+#define CONFIG_YOP_DEMUXER 0 -+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 -+#define CONFIG_LIBNUT_DEMUXER 0 -+#define CONFIG_A64_MUXER 0 -+#define CONFIG_AC3_MUXER 0 -+#define CONFIG_ADTS_MUXER 0 -+#define CONFIG_AIFF_MUXER 0 -+#define CONFIG_AMR_MUXER 0 -+#define CONFIG_ASF_MUXER 0 -+#define CONFIG_ASS_MUXER 0 -+#define CONFIG_ASF_STREAM_MUXER 0 -+#define CONFIG_AU_MUXER 0 -+#define CONFIG_AVI_MUXER 0 -+#define CONFIG_AVM2_MUXER 0 -+#define CONFIG_CAVSVIDEO_MUXER 0 -+#define CONFIG_CRC_MUXER 0 -+#define CONFIG_DAUD_MUXER 0 -+#define CONFIG_DIRAC_MUXER 0 -+#define CONFIG_DNXHD_MUXER 0 -+#define CONFIG_DTS_MUXER 0 -+#define CONFIG_DV_MUXER 0 -+#define CONFIG_EAC3_MUXER 0 -+#define CONFIG_FFM_MUXER 0 -+#define CONFIG_FILMSTRIP_MUXER 0 -+#define CONFIG_FLAC_MUXER 0 -+#define CONFIG_FLV_MUXER 0 -+#define CONFIG_FRAMECRC_MUXER 0 -+#define CONFIG_FRAMEMD5_MUXER 0 -+#define CONFIG_G722_MUXER 0 -+#define CONFIG_GIF_MUXER 0 -+#define CONFIG_GXF_MUXER 0 -+#define CONFIG_H261_MUXER 0 -+#define CONFIG_H263_MUXER 0 -+#define CONFIG_H264_MUXER 0 -+#define CONFIG_IMAGE2_MUXER 0 -+#define CONFIG_IMAGE2PIPE_MUXER 0 -+#define CONFIG_IPOD_MUXER 0 -+#define CONFIG_M4V_MUXER 0 -+#define CONFIG_MD5_MUXER 0 -+#define CONFIG_MATROSKA_MUXER 0 -+#define CONFIG_MATROSKA_AUDIO_MUXER 0 -+#define CONFIG_MJPEG_MUXER 0 -+#define CONFIG_MLP_MUXER 0 -+#define CONFIG_MMF_MUXER 0 -+#define CONFIG_MOV_MUXER 0 -+#define CONFIG_MP2_MUXER 0 -+#define CONFIG_MP3_MUXER 0 -+#define CONFIG_MP4_MUXER 0 -+#define CONFIG_MPEG1SYSTEM_MUXER 0 -+#define CONFIG_MPEG1VCD_MUXER 0 -+#define CONFIG_MPEG1VIDEO_MUXER 0 -+#define CONFIG_MPEG2DVD_MUXER 0 -+#define CONFIG_MPEG2SVCD_MUXER 0 -+#define CONFIG_MPEG2VIDEO_MUXER 0 -+#define CONFIG_MPEG2VOB_MUXER 0 -+#define CONFIG_MPEGTS_MUXER 0 -+#define CONFIG_MPJPEG_MUXER 0 -+#define CONFIG_MXF_MUXER 0 -+#define CONFIG_MXF_D10_MUXER 0 -+#define CONFIG_NULL_MUXER 0 -+#define CONFIG_NUT_MUXER 0 -+#define CONFIG_OGG_MUXER 0 -+#define CONFIG_PCM_ALAW_MUXER 0 -+#define CONFIG_PCM_MULAW_MUXER 0 -+#define CONFIG_PCM_F64BE_MUXER 0 -+#define CONFIG_PCM_F64LE_MUXER 0 -+#define CONFIG_PCM_F32BE_MUXER 0 -+#define CONFIG_PCM_F32LE_MUXER 0 -+#define CONFIG_PCM_S32BE_MUXER 0 -+#define CONFIG_PCM_S32LE_MUXER 0 -+#define CONFIG_PCM_S24BE_MUXER 0 -+#define CONFIG_PCM_S24LE_MUXER 0 -+#define CONFIG_PCM_S16BE_MUXER 0 -+#define CONFIG_PCM_S16LE_MUXER 0 -+#define CONFIG_PCM_S8_MUXER 0 -+#define CONFIG_PCM_U32BE_MUXER 0 -+#define CONFIG_PCM_U32LE_MUXER 0 -+#define CONFIG_PCM_U24BE_MUXER 0 -+#define CONFIG_PCM_U24LE_MUXER 0 -+#define CONFIG_PCM_U16BE_MUXER 0 -+#define CONFIG_PCM_U16LE_MUXER 0 -+#define CONFIG_PCM_U8_MUXER 0 -+#define CONFIG_PSP_MUXER 0 -+#define CONFIG_RAWVIDEO_MUXER 0 -+#define CONFIG_RM_MUXER 0 -+#define CONFIG_ROQ_MUXER 0 -+#define CONFIG_RSO_MUXER 0 -+#define CONFIG_RTP_MUXER 0 -+#define CONFIG_RTSP_MUXER 0 -+#define CONFIG_SAP_MUXER 0 -+#define CONFIG_SOX_MUXER 0 -+#define CONFIG_SPDIF_MUXER 0 -+#define CONFIG_SRT_MUXER 0 -+#define CONFIG_SWF_MUXER 0 -+#define CONFIG_TG2_MUXER 0 -+#define CONFIG_TGP_MUXER 0 -+#define CONFIG_TRUEHD_MUXER 0 -+#define CONFIG_VC1T_MUXER 0 -+#define CONFIG_VOC_MUXER 0 -+#define CONFIG_WAV_MUXER 0 -+#define CONFIG_WEBM_MUXER 0 -+#define CONFIG_WEBP_MUXER 0 -+#define CONFIG_YUV4MPEGPIPE_MUXER 0 -+#define CONFIG_LIBNUT_MUXER 0 -+#define CONFIG_ANULL_FILTER 0 -+#define CONFIG_ANULLSRC_FILTER 0 -+#define CONFIG_ANULLSINK_FILTER 0 -+#define CONFIG_ASPECT_FILTER 0 -+#define CONFIG_BLACKFRAME_FILTER 0 -+#define CONFIG_CROP_FILTER 0 -+#define CONFIG_CROPDETECT_FILTER 0 -+#define CONFIG_DRAWBOX_FILTER 0 -+#define CONFIG_FIFO_FILTER 0 -+#define CONFIG_FORMAT_FILTER 0 -+#define CONFIG_FREI0R_FILTER 0 -+#define CONFIG_HFLIP_FILTER 0 -+#define CONFIG_NOFORMAT_FILTER 0 -+#define CONFIG_NULL_FILTER 0 -+#define CONFIG_OCV_SMOOTH_FILTER 0 -+#define CONFIG_PAD_FILTER 0 -+#define CONFIG_PIXDESCTEST_FILTER 0 -+#define CONFIG_PIXELASPECT_FILTER 0 -+#define CONFIG_SCALE_FILTER 0 -+#define CONFIG_SETPTS_FILTER 0 -+#define CONFIG_SETTB_FILTER 0 -+#define CONFIG_SLICIFY_FILTER 0 -+#define CONFIG_TRANSPOSE_FILTER 0 -+#define CONFIG_UNSHARP_FILTER 0 -+#define CONFIG_VFLIP_FILTER 0 -+#define CONFIG_YADIF_FILTER 0 -+#define CONFIG_BUFFER_FILTER 0 -+#define CONFIG_COLOR_FILTER 0 -+#define CONFIG_NULLSRC_FILTER 0 -+#define CONFIG_NULLSINK_FILTER 0 -+#define CONFIG_CONCAT_PROTOCOL 0 -+#define CONFIG_FILE_PROTOCOL 0 -+#define CONFIG_GOPHER_PROTOCOL 0 -+#define CONFIG_HTTP_PROTOCOL 0 -+#define CONFIG_MMSH_PROTOCOL 0 -+#define CONFIG_MMST_PROTOCOL 0 -+#define CONFIG_MD5_PROTOCOL 0 -+#define CONFIG_PIPE_PROTOCOL 0 -+#define CONFIG_RTMP_PROTOCOL 0 -+#define CONFIG_RTMPT_PROTOCOL 0 -+#define CONFIG_RTMPE_PROTOCOL 0 -+#define CONFIG_RTMPTE_PROTOCOL 0 -+#define CONFIG_RTMPS_PROTOCOL 0 -+#define CONFIG_RTP_PROTOCOL 0 -+#define CONFIG_TCP_PROTOCOL 0 -+#define CONFIG_UDP_PROTOCOL 0 -+#define CONFIG_ALSA_INDEV 0 -+#define CONFIG_BKTR_INDEV 0 -+#define CONFIG_DV1394_INDEV 0 -+#define CONFIG_JACK_INDEV 0 -+#define CONFIG_OSS_INDEV 0 -+#define CONFIG_V4L2_INDEV 0 -+#define CONFIG_V4L_INDEV 0 -+#define CONFIG_VFWCAP_INDEV 0 -+#define CONFIG_X11_GRAB_DEVICE_INDEV 0 -+#define CONFIG_LIBDC1394_INDEV 0 -+#define CONFIG_ALSA_OUTDEV 0 -+#define CONFIG_OSS_OUTDEV 0 -+#endif /* FFMPEG_CONFIG_H */ diff --git a/www/chromium/files/patch-third_party__ffmpeg__config__Chromium__freebsd__ia32__config.h b/www/chromium/files/patch-third_party__ffmpeg__config__Chromium__freebsd__ia32__config.h deleted file mode 100644 index d2f21da773dc..000000000000 --- a/www/chromium/files/patch-third_party__ffmpeg__config__Chromium__freebsd__ia32__config.h +++ /dev/null @@ -1,963 +0,0 @@ ---- ./third_party/ffmpeg/config/Chromium/freebsd/ia32/config.h.orig 2010-12-20 20:15:08.000000000 +0100 -+++ ./third_party/ffmpeg/config/Chromium/freebsd/ia32/config.h 2010-12-20 20:15:08.000000000 +0100 -@@ -0,0 +1,960 @@ -+/* Automatically generated by configure - do not modify! */ -+#ifndef FFMPEG_CONFIG_H -+#define FFMPEG_CONFIG_H -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --enable-libvpx --enable-decoder='theora,vorbis,libvpx,pcm_u8,pcm_s16le,pcm_f32le' --enable-encoder=libvpx --enable-demuxer='ogg,matroska,wav' --extra-cflags='-m32 -fPIC' --extra-ldflags='-m32 -L../../libvpx/linux32/usr/local/lib'" -+#define FFMPEG_LICENSE "LGPL version 2.1 or later" -+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -+#define CC_TYPE "gcc" /* rene: what about clang? does $(CC) work? */ -+#define CC_VERSION __VERSION__ -+#define restrict restrict -+#define ASMALIGN(ZEROBITS) ".p2align " #ZEROBITS "\n\t" -+#define EXTERN_PREFIX "" -+#define EXTERN_ASM -+#define SLIBSUF ".so" -+#define ARCH_ALPHA 0 -+#define ARCH_ARM 0 -+#define ARCH_AVR32 0 -+#define ARCH_AVR32_AP 0 -+#define ARCH_AVR32_UC 0 -+#define ARCH_BFIN 0 -+#define ARCH_IA64 0 -+#define ARCH_M68K 0 -+#define ARCH_MIPS 0 -+#define ARCH_MIPS64 0 -+#define ARCH_PARISC 0 -+#define ARCH_PPC 0 -+#define ARCH_PPC64 0 -+#define ARCH_S390 0 -+#define ARCH_SH4 0 -+#define ARCH_SPARC 0 -+#define ARCH_SPARC64 0 -+#define ARCH_TOMI 0 -+#define ARCH_X86 1 -+#define ARCH_X86_32 1 -+#define ARCH_X86_64 0 -+#define HAVE_ALTIVEC 0 -+#define HAVE_AMD3DNOW 0 -+#define HAVE_AMD3DNOWEXT 0 -+#define HAVE_ARMV5TE 0 -+#define HAVE_ARMV6 0 -+#define HAVE_ARMV6T2 0 -+#define HAVE_ARMVFP 0 -+#define HAVE_IWMMXT 0 -+#define HAVE_MMI 0 -+#define HAVE_MMX 1 -+#define HAVE_MMX2 1 -+#define HAVE_NEON 0 -+#define HAVE_PPC4XX 0 -+#define HAVE_SSE 1 -+#define HAVE_SSSE3 1 -+#define HAVE_VIS 0 -+#define HAVE_BIGENDIAN 0 -+#define HAVE_FAST_UNALIGNED 1 -+#define HAVE_PTHREADS 1 -+#define HAVE_W32THREADS 0 -+#define HAVE_ALIGNED_STACK 1 -+#define HAVE_ALSA_ASOUNDLIB_H 0 -+#define HAVE_ALTIVEC_H 0 -+#define HAVE_ARPA_INET_H 0 -+#define HAVE_ATTRIBUTE_MAY_ALIAS 1 -+#define HAVE_ATTRIBUTE_PACKED 1 -+#define HAVE_BSWAP 1 -+#define HAVE_CLOSESOCKET 0 -+#define HAVE_CMOV 0 -+#define HAVE_CONIO_H 0 -+#define HAVE_DCBZL 0 -+#define HAVE_DEV_BKTR_IOCTL_BT848_H 0 -+#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 -+#define HAVE_DEV_IC_BT8XX_H 0 -+#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0 -+#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0 -+#define HAVE_DLFCN_H 1 -+#define HAVE_DLOPEN 1 -+#define HAVE_DOS_PATHS 0 -+#define HAVE_EBP_AVAILABLE 0 -+#define HAVE_EBX_AVAILABLE 0 -+#define HAVE_EXP2 1 -+#define HAVE_EXP2F 1 -+#define HAVE_FAST_64BIT 0 -+#define HAVE_FAST_CLZ 1 -+#define HAVE_FAST_CMOV 0 -+#define HAVE_FCNTL 1 -+#define HAVE_FORK 1 -+#define HAVE_GETADDRINFO 1 -+#define HAVE_GETHRTIME 0 -+#define HAVE_GETPROCESSMEMORYINFO 0 -+#define HAVE_GETPROCESSTIMES 0 -+#define HAVE_GETRUSAGE 1 -+#define HAVE_GNU_AS 1 -+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1 -+#define HAVE_IBM_ASM 0 -+#define HAVE_INET_ATON 1 -+#define HAVE_INLINE_ASM 1 -+#define HAVE_ISATTY 1 -+#define HAVE_LDBRX 0 -+#define HAVE_LIBDC1394_1 0 -+#define HAVE_LIBDC1394_2 0 -+#define HAVE_LLRINT 1 -+#define HAVE_LLRINTF 1 -+#define HAVE_LOCAL_ALIGNED_16 1 -+#define HAVE_LOCAL_ALIGNED_8 1 -+#define HAVE_LOG2 0 -+#define HAVE_LOG2F 0 -+#define HAVE_LOONGSON 0 -+#define HAVE_LRINT 1 -+#define HAVE_LRINTF 1 -+#define HAVE_LZO1X_999_COMPRESS 0 -+#define HAVE_MACHINE_IOCTL_BT848_H 0 -+#define HAVE_MACHINE_IOCTL_METEOR_H 0 -+#define HAVE_MALLOC_H 0 -+#define HAVE_MEMALIGN 0 -+#define HAVE_MKSTEMP 1 -+#define HAVE_PLD 0 -+#define HAVE_POSIX_MEMALIGN 1 -+#define HAVE_ROUND 1 -+#define HAVE_ROUNDF 1 -+#define HAVE_SDL 0 -+#define HAVE_SDL_VIDEO_SIZE 0 -+#define HAVE_SETMODE 0 -+#define HAVE_SOCKLEN_T 0 -+#define HAVE_SOUNDCARD_H 0 -+#define HAVE_POLL_H 1 -+#define HAVE_SETRLIMIT 1 -+#define HAVE_STRERROR_R 1 -+#define HAVE_STRTOK_R 1 -+#define HAVE_STRUCT_ADDRINFO 0 -+#define HAVE_STRUCT_IPV6_MREQ 0 -+#define HAVE_STRUCT_SOCKADDR_IN6 0 -+#define HAVE_STRUCT_SOCKADDR_SA_LEN 0 -+#define HAVE_STRUCT_SOCKADDR_STORAGE 0 -+#define HAVE_SYMVER 0 -+#define HAVE_SYMVER_GNU_ASM 1 -+#define HAVE_SYMVER_ASM_LABEL 0 -+#define HAVE_SYS_MMAN_H 1 -+#define HAVE_SYS_RESOURCE_H 1 -+#define HAVE_SYS_SELECT_H 1 -+#define HAVE_SYS_SOUNDCARD_H 1 -+#define HAVE_SYS_VIDEOIO_H 0 -+#define HAVE_TEN_OPERANDS 1 -+#define HAVE_TERMIOS_H 1 -+#define HAVE_THREADS 1 -+#define HAVE_TRUNCF 1 -+#define HAVE_VFP_ARGS 0 -+#define HAVE_VIRTUALALLOC 0 -+#define HAVE_WINSOCK2_H 0 -+#define HAVE_XFORM_ASM 0 -+#define HAVE_XMM_CLOBBERS 0 -+#define HAVE_YASM 1 -+#define CONFIG_BSFS 0 -+#define CONFIG_DECODERS 1 -+#define CONFIG_DEMUXERS 1 -+#define CONFIG_ENCODERS 1 -+#define CONFIG_FILTERS 0 -+#define CONFIG_HWACCELS 0 -+#define CONFIG_INDEVS 0 -+#define CONFIG_MUXERS 0 -+#define CONFIG_OUTDEVS 0 -+#define CONFIG_PARSERS 0 -+#define CONFIG_PROTOCOLS 1 -+#define CONFIG_AANDCT 0 -+#define CONFIG_AVCODEC 1 -+#define CONFIG_AVCORE 1 -+#define CONFIG_AVDEVICE 1 -+#define CONFIG_AVFILTER 1 -+#define CONFIG_AVFORMAT 1 -+#define CONFIG_AVISYNTH 0 -+#define CONFIG_BZLIB 0 -+#define CONFIG_DCT 0 -+#define CONFIG_DOC 0 -+#define CONFIG_DWT 0 -+#define CONFIG_DXVA2 0 -+#define CONFIG_FASTDIV 1 -+#define CONFIG_FFMPEG 0 -+#define CONFIG_FFPLAY 0 -+#define CONFIG_FFPROBE 1 -+#define CONFIG_FFSERVER 0 -+#define CONFIG_FFT 1 -+#define CONFIG_FREI0R 0 -+#define CONFIG_GOLOMB 1 -+#define CONFIG_GPL 0 -+#define CONFIG_GRAY 0 -+#define CONFIG_H264DSP 0 -+#define CONFIG_H264PRED 0 -+#define CONFIG_HARDCODED_TABLES 0 -+#define CONFIG_HUFFMAN 0 -+#define CONFIG_LIBDC1394 0 -+#define CONFIG_LIBDIRAC 0 -+#define CONFIG_LIBFAAC 0 -+#define CONFIG_LIBGSM 0 -+#define CONFIG_LIBMP3LAME 0 -+#define CONFIG_LIBNUT 0 -+#define CONFIG_LIBOPENCORE_AMRNB 0 -+#define CONFIG_LIBOPENCORE_AMRWB 0 -+#define CONFIG_LIBOPENCV 0 -+#define CONFIG_LIBOPENJPEG 0 -+#define CONFIG_LIBRTMP 0 -+#define CONFIG_LIBSCHROEDINGER 0 -+#define CONFIG_LIBSPEEX 0 -+#define CONFIG_LIBTHEORA 0 -+#define CONFIG_LIBVORBIS 0 -+#define CONFIG_LIBVPX 1 -+#define CONFIG_LIBX264 0 -+#define CONFIG_LIBXAVS 0 -+#define CONFIG_LIBXVID 0 -+#define CONFIG_LPC 0 -+#define CONFIG_LSP 0 -+#define CONFIG_MDCT 1 -+#define CONFIG_MEMALIGN_HACK 0 -+#define CONFIG_MLIB 0 -+#define CONFIG_MPEGAUDIO_HP 1 -+#define CONFIG_NETWORK 0 -+#define CONFIG_NONFREE 0 -+#define CONFIG_PIC 1 -+#define CONFIG_POSTPROC 0 -+#define CONFIG_RDFT 0 -+#define CONFIG_RTPDEC 0 -+#define CONFIG_RUNTIME_CPUDETECT 0 -+#define CONFIG_SHARED 1 -+#define CONFIG_SMALL 0 -+#define CONFIG_SRAM 0 -+#define CONFIG_STATIC 1 -+#define CONFIG_SWSCALE 0 -+#define CONFIG_SWSCALE_ALPHA 1 -+#define CONFIG_VAAPI 0 -+#define CONFIG_VDPAU 0 -+#define CONFIG_VERSION3 0 -+#define CONFIG_X11GRAB 0 -+#define CONFIG_ZLIB 0 -+#define CONFIG_AVUTIL 1 -+#define CONFIG_GPLV3 0 -+#define CONFIG_LGPLV3 0 -+#define CONFIG_AASC_DECODER 0 -+#define CONFIG_AMV_DECODER 0 -+#define CONFIG_ANM_DECODER 0 -+#define CONFIG_ANSI_DECODER 0 -+#define CONFIG_ASV1_DECODER 0 -+#define CONFIG_ASV2_DECODER 0 -+#define CONFIG_AURA_DECODER 0 -+#define CONFIG_AURA2_DECODER 0 -+#define CONFIG_AVS_DECODER 0 -+#define CONFIG_BETHSOFTVID_DECODER 0 -+#define CONFIG_BFI_DECODER 0 -+#define CONFIG_BINK_DECODER 0 -+#define CONFIG_BMP_DECODER 0 -+#define CONFIG_C93_DECODER 0 -+#define CONFIG_CAVS_DECODER 0 -+#define CONFIG_CDGRAPHICS_DECODER 0 -+#define CONFIG_CINEPAK_DECODER 0 -+#define CONFIG_CLJR_DECODER 0 -+#define CONFIG_CSCD_DECODER 0 -+#define CONFIG_CYUV_DECODER 0 -+#define CONFIG_DNXHD_DECODER 0 -+#define CONFIG_DPX_DECODER 0 -+#define CONFIG_DSICINVIDEO_DECODER 0 -+#define CONFIG_DVVIDEO_DECODER 0 -+#define CONFIG_DXA_DECODER 0 -+#define CONFIG_EACMV_DECODER 0 -+#define CONFIG_EAMAD_DECODER 0 -+#define CONFIG_EATGQ_DECODER 0 -+#define CONFIG_EATGV_DECODER 0 -+#define CONFIG_EATQI_DECODER 0 -+#define CONFIG_EIGHTBPS_DECODER 0 -+#define CONFIG_EIGHTSVX_EXP_DECODER 0 -+#define CONFIG_EIGHTSVX_FIB_DECODER 0 -+#define CONFIG_ESCAPE124_DECODER 0 -+#define CONFIG_FFV1_DECODER 0 -+#define CONFIG_FFVHUFF_DECODER 0 -+#define CONFIG_FLASHSV_DECODER 0 -+#define CONFIG_FLIC_DECODER 0 -+#define CONFIG_FLV_DECODER 0 -+#define CONFIG_FOURXM_DECODER 0 -+#define CONFIG_FRAPS_DECODER 0 -+#define CONFIG_FRWU_DECODER 0 -+#define CONFIG_GIF_DECODER 0 -+#define CONFIG_H261_DECODER 0 -+#define CONFIG_H263_DECODER 0 -+#define CONFIG_H263I_DECODER 0 -+#define CONFIG_H264_DECODER 0 -+#define CONFIG_H264_VDPAU_DECODER 0 -+#define CONFIG_HUFFYUV_DECODER 0 -+#define CONFIG_IDCIN_DECODER 0 -+#define CONFIG_IFF_BYTERUN1_DECODER 0 -+#define CONFIG_IFF_ILBM_DECODER 0 -+#define CONFIG_INDEO2_DECODER 0 -+#define CONFIG_INDEO3_DECODER 0 -+#define CONFIG_INDEO5_DECODER 0 -+#define CONFIG_INTERPLAY_VIDEO_DECODER 0 -+#define CONFIG_JPEGLS_DECODER 0 -+#define CONFIG_KGV1_DECODER 0 -+#define CONFIG_KMVC_DECODER 0 -+#define CONFIG_LOCO_DECODER 0 -+#define CONFIG_MDEC_DECODER 0 -+#define CONFIG_MIMIC_DECODER 0 -+#define CONFIG_MJPEG_DECODER 0 -+#define CONFIG_MJPEGB_DECODER 0 -+#define CONFIG_MMVIDEO_DECODER 0 -+#define CONFIG_MOTIONPIXELS_DECODER 0 -+#define CONFIG_MPEG_XVMC_DECODER 0 -+#define CONFIG_MPEG1VIDEO_DECODER 0 -+#define CONFIG_MPEG2VIDEO_DECODER 0 -+#define CONFIG_MPEG4_DECODER 0 -+#define CONFIG_MPEG4_VDPAU_DECODER 0 -+#define CONFIG_MPEGVIDEO_DECODER 0 -+#define CONFIG_MPEG_VDPAU_DECODER 0 -+#define CONFIG_MPEG1_VDPAU_DECODER 0 -+#define CONFIG_MSMPEG4V1_DECODER 0 -+#define CONFIG_MSMPEG4V2_DECODER 0 -+#define CONFIG_MSMPEG4V3_DECODER 0 -+#define CONFIG_MSRLE_DECODER 0 -+#define CONFIG_MSVIDEO1_DECODER 0 -+#define CONFIG_MSZH_DECODER 0 -+#define CONFIG_NUV_DECODER 0 -+#define CONFIG_PAM_DECODER 0 -+#define CONFIG_PBM_DECODER 0 -+#define CONFIG_PCX_DECODER 0 -+#define CONFIG_PGM_DECODER 0 -+#define CONFIG_PGMYUV_DECODER 0 -+#define CONFIG_PICTOR_DECODER 0 -+#define CONFIG_PNG_DECODER 0 -+#define CONFIG_PPM_DECODER 0 -+#define CONFIG_PTX_DECODER 0 -+#define CONFIG_QDRAW_DECODER 0 -+#define CONFIG_QPEG_DECODER 0 -+#define CONFIG_QTRLE_DECODER 0 -+#define CONFIG_R10K_DECODER 0 -+#define CONFIG_R210_DECODER 0 -+#define CONFIG_RAWVIDEO_DECODER 0 -+#define CONFIG_RL2_DECODER 0 -+#define CONFIG_ROQ_DECODER 0 -+#define CONFIG_RPZA_DECODER 0 -+#define CONFIG_RV10_DECODER 0 -+#define CONFIG_RV20_DECODER 0 -+#define CONFIG_RV30_DECODER 0 -+#define CONFIG_RV40_DECODER 0 -+#define CONFIG_SGI_DECODER 0 -+#define CONFIG_SMACKER_DECODER 0 -+#define CONFIG_SMC_DECODER 0 -+#define CONFIG_SNOW_DECODER 0 -+#define CONFIG_SP5X_DECODER 0 -+#define CONFIG_SUNRAST_DECODER 0 -+#define CONFIG_SVQ1_DECODER 0 -+#define CONFIG_SVQ3_DECODER 0 -+#define CONFIG_TARGA_DECODER 0 -+#define CONFIG_THEORA_DECODER 1 -+#define CONFIG_THP_DECODER 0 -+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 -+#define CONFIG_TIFF_DECODER 0 -+#define CONFIG_TMV_DECODER 0 -+#define CONFIG_TRUEMOTION1_DECODER 0 -+#define CONFIG_TRUEMOTION2_DECODER 0 -+#define CONFIG_TSCC_DECODER 0 -+#define CONFIG_TXD_DECODER 0 -+#define CONFIG_ULTI_DECODER 0 -+#define CONFIG_V210_DECODER 0 -+#define CONFIG_V210X_DECODER 0 -+#define CONFIG_VB_DECODER 0 -+#define CONFIG_VC1_DECODER 0 -+#define CONFIG_VC1_VDPAU_DECODER 0 -+#define CONFIG_VCR1_DECODER 0 -+#define CONFIG_VMDVIDEO_DECODER 0 -+#define CONFIG_VMNC_DECODER 0 -+#define CONFIG_VP3_DECODER 1 -+#define CONFIG_VP5_DECODER 0 -+#define CONFIG_VP6_DECODER 0 -+#define CONFIG_VP6A_DECODER 0 -+#define CONFIG_VP6F_DECODER 0 -+#define CONFIG_VP8_DECODER 0 -+#define CONFIG_VQA_DECODER 0 -+#define CONFIG_WMV1_DECODER 0 -+#define CONFIG_WMV2_DECODER 0 -+#define CONFIG_WMV3_DECODER 0 -+#define CONFIG_WMV3_VDPAU_DECODER 0 -+#define CONFIG_WNV1_DECODER 0 -+#define CONFIG_XAN_WC3_DECODER 0 -+#define CONFIG_XL_DECODER 0 -+#define CONFIG_YOP_DECODER 0 -+#define CONFIG_ZLIB_DECODER 0 -+#define CONFIG_ZMBV_DECODER 0 -+#define CONFIG_AAC_DECODER 0 -+#define CONFIG_AAC_LATM_DECODER 0 -+#define CONFIG_AC3_DECODER 0 -+#define CONFIG_ALAC_DECODER 0 -+#define CONFIG_ALS_DECODER 0 -+#define CONFIG_AMRNB_DECODER 0 -+#define CONFIG_APE_DECODER 0 -+#define CONFIG_ATRAC1_DECODER 0 -+#define CONFIG_ATRAC3_DECODER 0 -+#define CONFIG_BINKAUDIO_DCT_DECODER 0 -+#define CONFIG_BINKAUDIO_RDFT_DECODER 0 -+#define CONFIG_COOK_DECODER 0 -+#define CONFIG_DCA_DECODER 0 -+#define CONFIG_DSICINAUDIO_DECODER 0 -+#define CONFIG_EAC3_DECODER 0 -+#define CONFIG_FLAC_DECODER 0 -+#define CONFIG_GSM_DECODER 0 -+#define CONFIG_GSM_MS_DECODER 0 -+#define CONFIG_IMC_DECODER 0 -+#define CONFIG_MACE3_DECODER 0 -+#define CONFIG_MACE6_DECODER 0 -+#define CONFIG_MLP_DECODER 0 -+#define CONFIG_MP1_DECODER 0 -+#define CONFIG_MP1FLOAT_DECODER 0 -+#define CONFIG_MP2_DECODER 0 -+#define CONFIG_MP2FLOAT_DECODER 0 -+#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3FLOAT_DECODER 0 -+#define CONFIG_MP3ADU_DECODER 0 -+#define CONFIG_MP3ADUFLOAT_DECODER 0 -+#define CONFIG_MP3ON4_DECODER 0 -+#define CONFIG_MP3ON4FLOAT_DECODER 0 -+#define CONFIG_MPC7_DECODER 0 -+#define CONFIG_MPC8_DECODER 0 -+#define CONFIG_NELLYMOSER_DECODER 0 -+#define CONFIG_QCELP_DECODER 0 -+#define CONFIG_QDM2_DECODER 0 -+#define CONFIG_RA_144_DECODER 0 -+#define CONFIG_RA_288_DECODER 0 -+#define CONFIG_SHORTEN_DECODER 0 -+#define CONFIG_SIPR_DECODER 0 -+#define CONFIG_SMACKAUD_DECODER 0 -+#define CONFIG_SONIC_DECODER 0 -+#define CONFIG_TRUEHD_DECODER 0 -+#define CONFIG_TRUESPEECH_DECODER 0 -+#define CONFIG_TTA_DECODER 0 -+#define CONFIG_TWINVQ_DECODER 0 -+#define CONFIG_VMDAUDIO_DECODER 0 -+#define CONFIG_VORBIS_DECODER 1 -+#define CONFIG_WAVPACK_DECODER 0 -+#define CONFIG_WMAPRO_DECODER 0 -+#define CONFIG_WMAV1_DECODER 0 -+#define CONFIG_WMAV2_DECODER 0 -+#define CONFIG_WMAVOICE_DECODER 0 -+#define CONFIG_WS_SND1_DECODER 0 -+#define CONFIG_PCM_ALAW_DECODER 0 -+#define CONFIG_PCM_BLURAY_DECODER 0 -+#define CONFIG_PCM_DVD_DECODER 0 -+#define CONFIG_PCM_F32BE_DECODER 0 -+#define CONFIG_PCM_F32LE_DECODER 1 -+#define CONFIG_PCM_F64BE_DECODER 0 -+#define CONFIG_PCM_F64LE_DECODER 0 -+#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_S16LE_DECODER 1 -+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S24BE_DECODER 0 -+#define CONFIG_PCM_S24DAUD_DECODER 0 -+#define CONFIG_PCM_S24LE_DECODER 0 -+#define CONFIG_PCM_S32BE_DECODER 0 -+#define CONFIG_PCM_S32LE_DECODER 0 -+#define CONFIG_PCM_U8_DECODER 1 -+#define CONFIG_PCM_U16BE_DECODER 0 -+#define CONFIG_PCM_U16LE_DECODER 0 -+#define CONFIG_PCM_U24BE_DECODER 0 -+#define CONFIG_PCM_U24LE_DECODER 0 -+#define CONFIG_PCM_U32BE_DECODER 0 -+#define CONFIG_PCM_U32LE_DECODER 0 -+#define CONFIG_PCM_ZORK_DECODER 0 -+#define CONFIG_INTERPLAY_DPCM_DECODER 0 -+#define CONFIG_ROQ_DPCM_DECODER 0 -+#define CONFIG_SOL_DPCM_DECODER 0 -+#define CONFIG_XAN_DPCM_DECODER 0 -+#define CONFIG_ADPCM_4XM_DECODER 0 -+#define CONFIG_ADPCM_ADX_DECODER 0 -+#define CONFIG_ADPCM_CT_DECODER 0 -+#define CONFIG_ADPCM_EA_DECODER 0 -+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 -+#define CONFIG_ADPCM_EA_R1_DECODER 0 -+#define CONFIG_ADPCM_EA_R2_DECODER 0 -+#define CONFIG_ADPCM_EA_R3_DECODER 0 -+#define CONFIG_ADPCM_EA_XAS_DECODER 0 -+#define CONFIG_ADPCM_G722_DECODER 0 -+#define CONFIG_ADPCM_G726_DECODER 0 -+#define CONFIG_ADPCM_IMA_AMV_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK3_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK4_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_ISS_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_DECODER 0 -+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 -+#define CONFIG_ADPCM_IMA_WAV_DECODER 0 -+#define CONFIG_ADPCM_IMA_WS_DECODER 0 -+#define CONFIG_ADPCM_MS_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_2_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_3_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_4_DECODER 0 -+#define CONFIG_ADPCM_SWF_DECODER 0 -+#define CONFIG_ADPCM_THP_DECODER 0 -+#define CONFIG_ADPCM_XA_DECODER 0 -+#define CONFIG_ADPCM_YAMAHA_DECODER 0 -+#define CONFIG_DVBSUB_DECODER 0 -+#define CONFIG_DVDSUB_DECODER 0 -+#define CONFIG_PGSSUB_DECODER 0 -+#define CONFIG_XSUB_DECODER 0 -+#define CONFIG_LIBDIRAC_DECODER 0 -+#define CONFIG_LIBGSM_DECODER 0 -+#define CONFIG_LIBGSM_MS_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 -+#define CONFIG_LIBOPENJPEG_DECODER 0 -+#define CONFIG_LIBSCHROEDINGER_DECODER 0 -+#define CONFIG_LIBSPEEX_DECODER 0 -+#define CONFIG_LIBVPX_DECODER 1 -+#define CONFIG_A64MULTI_ENCODER 0 -+#define CONFIG_A64MULTI5_ENCODER 0 -+#define CONFIG_ASV1_ENCODER 0 -+#define CONFIG_ASV2_ENCODER 0 -+#define CONFIG_BMP_ENCODER 0 -+#define CONFIG_DNXHD_ENCODER 0 -+#define CONFIG_DVVIDEO_ENCODER 0 -+#define CONFIG_FFV1_ENCODER 0 -+#define CONFIG_FFVHUFF_ENCODER 0 -+#define CONFIG_FLASHSV_ENCODER 0 -+#define CONFIG_FLV_ENCODER 0 -+#define CONFIG_GIF_ENCODER 0 -+#define CONFIG_H261_ENCODER 0 -+#define CONFIG_H263_ENCODER 0 -+#define CONFIG_H263P_ENCODER 0 -+#define CONFIG_HUFFYUV_ENCODER 0 -+#define CONFIG_JPEGLS_ENCODER 0 -+#define CONFIG_LJPEG_ENCODER 0 -+#define CONFIG_MJPEG_ENCODER 0 -+#define CONFIG_MPEG1VIDEO_ENCODER 0 -+#define CONFIG_MPEG2VIDEO_ENCODER 0 -+#define CONFIG_MPEG4_ENCODER 0 -+#define CONFIG_MSMPEG4V1_ENCODER 0 -+#define CONFIG_MSMPEG4V2_ENCODER 0 -+#define CONFIG_MSMPEG4V3_ENCODER 0 -+#define CONFIG_PAM_ENCODER 0 -+#define CONFIG_PBM_ENCODER 0 -+#define CONFIG_PCX_ENCODER 0 -+#define CONFIG_PGM_ENCODER 0 -+#define CONFIG_PGMYUV_ENCODER 0 -+#define CONFIG_PNG_ENCODER 0 -+#define CONFIG_PPM_ENCODER 0 -+#define CONFIG_QTRLE_ENCODER 0 -+#define CONFIG_RAWVIDEO_ENCODER 0 -+#define CONFIG_ROQ_ENCODER 0 -+#define CONFIG_RV10_ENCODER 0 -+#define CONFIG_RV20_ENCODER 0 -+#define CONFIG_SGI_ENCODER 0 -+#define CONFIG_SNOW_ENCODER 0 -+#define CONFIG_SVQ1_ENCODER 0 -+#define CONFIG_TARGA_ENCODER 0 -+#define CONFIG_TIFF_ENCODER 0 -+#define CONFIG_V210_ENCODER 0 -+#define CONFIG_WMV1_ENCODER 0 -+#define CONFIG_WMV2_ENCODER 0 -+#define CONFIG_ZLIB_ENCODER 0 -+#define CONFIG_ZMBV_ENCODER 0 -+#define CONFIG_AAC_ENCODER 0 -+#define CONFIG_AC3_ENCODER 0 -+#define CONFIG_ALAC_ENCODER 0 -+#define CONFIG_FLAC_ENCODER 0 -+#define CONFIG_MP2_ENCODER 0 -+#define CONFIG_NELLYMOSER_ENCODER 0 -+#define CONFIG_RA_144_ENCODER 0 -+#define CONFIG_SONIC_ENCODER 0 -+#define CONFIG_SONIC_LS_ENCODER 0 -+#define CONFIG_VORBIS_ENCODER 0 -+#define CONFIG_WMAV1_ENCODER 0 -+#define CONFIG_WMAV2_ENCODER 0 -+#define CONFIG_PCM_ALAW_ENCODER 0 -+#define CONFIG_PCM_F32BE_ENCODER 0 -+#define CONFIG_PCM_F32LE_ENCODER 0 -+#define CONFIG_PCM_F64BE_ENCODER 0 -+#define CONFIG_PCM_F64LE_ENCODER 0 -+#define CONFIG_PCM_MULAW_ENCODER 0 -+#define CONFIG_PCM_S8_ENCODER 0 -+#define CONFIG_PCM_S16BE_ENCODER 0 -+#define CONFIG_PCM_S16LE_ENCODER 0 -+#define CONFIG_PCM_S24BE_ENCODER 0 -+#define CONFIG_PCM_S24DAUD_ENCODER 0 -+#define CONFIG_PCM_S24LE_ENCODER 0 -+#define CONFIG_PCM_S32BE_ENCODER 0 -+#define CONFIG_PCM_S32LE_ENCODER 0 -+#define CONFIG_PCM_U8_ENCODER 0 -+#define CONFIG_PCM_U16BE_ENCODER 0 -+#define CONFIG_PCM_U16LE_ENCODER 0 -+#define CONFIG_PCM_U24BE_ENCODER 0 -+#define CONFIG_PCM_U24LE_ENCODER 0 -+#define CONFIG_PCM_U32BE_ENCODER 0 -+#define CONFIG_PCM_U32LE_ENCODER 0 -+#define CONFIG_PCM_ZORK_ENCODER 0 -+#define CONFIG_ROQ_DPCM_ENCODER 0 -+#define CONFIG_ADPCM_ADX_ENCODER 0 -+#define CONFIG_ADPCM_G722_ENCODER 0 -+#define CONFIG_ADPCM_G726_ENCODER 0 -+#define CONFIG_ADPCM_IMA_QT_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 -+#define CONFIG_ADPCM_MS_ENCODER 0 -+#define CONFIG_ADPCM_SWF_ENCODER 0 -+#define CONFIG_ADPCM_YAMAHA_ENCODER 0 -+#define CONFIG_DVBSUB_ENCODER 0 -+#define CONFIG_DVDSUB_ENCODER 0 -+#define CONFIG_XSUB_ENCODER 0 -+#define CONFIG_LIBDIRAC_ENCODER 0 -+#define CONFIG_LIBFAAC_ENCODER 0 -+#define CONFIG_LIBGSM_ENCODER 0 -+#define CONFIG_LIBGSM_MS_ENCODER 0 -+#define CONFIG_LIBMP3LAME_ENCODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 -+#define CONFIG_LIBSCHROEDINGER_ENCODER 0 -+#define CONFIG_LIBTHEORA_ENCODER 0 -+#define CONFIG_LIBVORBIS_ENCODER 0 -+#define CONFIG_LIBVPX_ENCODER 1 -+#define CONFIG_LIBX264_ENCODER 0 -+#define CONFIG_LIBXAVS_ENCODER 0 -+#define CONFIG_LIBXVID_ENCODER 0 -+#define CONFIG_H263_VAAPI_HWACCEL 0 -+#define CONFIG_H264_DXVA2_HWACCEL 0 -+#define CONFIG_H264_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG2_DXVA2_HWACCEL 0 -+#define CONFIG_MPEG2_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG4_VAAPI_HWACCEL 0 -+#define CONFIG_VC1_DXVA2_HWACCEL 0 -+#define CONFIG_VC1_VAAPI_HWACCEL 0 -+#define CONFIG_WMV3_DXVA2_HWACCEL 0 -+#define CONFIG_WMV3_VAAPI_HWACCEL 0 -+#define CONFIG_AAC_PARSER 0 -+#define CONFIG_AAC_LATM_PARSER 0 -+#define CONFIG_AC3_PARSER 0 -+#define CONFIG_CAVSVIDEO_PARSER 0 -+#define CONFIG_DCA_PARSER 0 -+#define CONFIG_DIRAC_PARSER 0 -+#define CONFIG_DNXHD_PARSER 0 -+#define CONFIG_DVBSUB_PARSER 0 -+#define CONFIG_DVDSUB_PARSER 0 -+#define CONFIG_H261_PARSER 0 -+#define CONFIG_H263_PARSER 0 -+#define CONFIG_H264_PARSER 0 -+#define CONFIG_MJPEG_PARSER 0 -+#define CONFIG_MLP_PARSER 0 -+#define CONFIG_MPEG4VIDEO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGVIDEO_PARSER 0 -+#define CONFIG_PNM_PARSER 0 -+#define CONFIG_VC1_PARSER 0 -+#define CONFIG_VP3_PARSER 0 -+#define CONFIG_VP8_PARSER 0 -+#define CONFIG_AAC_ADTSTOASC_BSF 0 -+#define CONFIG_CHOMP_BSF 0 -+#define CONFIG_DUMP_EXTRADATA_BSF 0 -+#define CONFIG_H264_MP4TOANNEXB_BSF 0 -+#define CONFIG_MPEG4VIDEO_ES_BSF 0 -+#define CONFIG_IMX_DUMP_HEADER_BSF 0 -+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 -+#define CONFIG_MP3_HEADER_COMPRESS_BSF 0 -+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0 -+#define CONFIG_MOV2TEXTSUB_BSF 0 -+#define CONFIG_NOISE_BSF 0 -+#define CONFIG_REMOVE_EXTRADATA_BSF 0 -+#define CONFIG_TEXT2MOVSUB_BSF 0 -+#define CONFIG_VC1_ASFTORCV_BSF 0 -+#define CONFIG_VC1_ASFTOANNEXG_BSF 0 -+#define CONFIG_AAC_DEMUXER 0 -+#define CONFIG_AC3_DEMUXER 0 -+#define CONFIG_AEA_DEMUXER 0 -+#define CONFIG_AIFF_DEMUXER 0 -+#define CONFIG_AMR_DEMUXER 0 -+#define CONFIG_ANM_DEMUXER 0 -+#define CONFIG_APC_DEMUXER 0 -+#define CONFIG_APE_DEMUXER 0 -+#define CONFIG_APPLEHTTP_DEMUXER 0 -+#define CONFIG_ASF_DEMUXER 0 -+#define CONFIG_ASS_DEMUXER 0 -+#define CONFIG_AU_DEMUXER 0 -+#define CONFIG_AVI_DEMUXER 0 -+#define CONFIG_AVISYNTH_DEMUXER 0 -+#define CONFIG_AVS_DEMUXER 0 -+#define CONFIG_BETHSOFTVID_DEMUXER 0 -+#define CONFIG_BFI_DEMUXER 0 -+#define CONFIG_BINK_DEMUXER 0 -+#define CONFIG_C93_DEMUXER 0 -+#define CONFIG_CAF_DEMUXER 0 -+#define CONFIG_CAVSVIDEO_DEMUXER 0 -+#define CONFIG_CDG_DEMUXER 0 -+#define CONFIG_DAUD_DEMUXER 0 -+#define CONFIG_DIRAC_DEMUXER 0 -+#define CONFIG_DNXHD_DEMUXER 0 -+#define CONFIG_DSICIN_DEMUXER 0 -+#define CONFIG_DTS_DEMUXER 0 -+#define CONFIG_DV_DEMUXER 0 -+#define CONFIG_DXA_DEMUXER 0 -+#define CONFIG_EA_DEMUXER 0 -+#define CONFIG_EA_CDATA_DEMUXER 0 -+#define CONFIG_EAC3_DEMUXER 0 -+#define CONFIG_FFM_DEMUXER 0 -+#define CONFIG_FILMSTRIP_DEMUXER 0 -+#define CONFIG_FLAC_DEMUXER 0 -+#define CONFIG_FLIC_DEMUXER 0 -+#define CONFIG_FLV_DEMUXER 0 -+#define CONFIG_FOURXM_DEMUXER 0 -+#define CONFIG_G722_DEMUXER 0 -+#define CONFIG_GSM_DEMUXER 0 -+#define CONFIG_GXF_DEMUXER 0 -+#define CONFIG_H261_DEMUXER 0 -+#define CONFIG_H263_DEMUXER 0 -+#define CONFIG_H264_DEMUXER 0 -+#define CONFIG_IDCIN_DEMUXER 0 -+#define CONFIG_IFF_DEMUXER 0 -+#define CONFIG_IMAGE2_DEMUXER 0 -+#define CONFIG_IMAGE2PIPE_DEMUXER 0 -+#define CONFIG_INGENIENT_DEMUXER 0 -+#define CONFIG_IPMOVIE_DEMUXER 0 -+#define CONFIG_ISS_DEMUXER 0 -+#define CONFIG_IV8_DEMUXER 0 -+#define CONFIG_IVF_DEMUXER 0 -+#define CONFIG_LMLM4_DEMUXER 0 -+#define CONFIG_LXF_DEMUXER 0 -+#define CONFIG_M4V_DEMUXER 0 -+#define CONFIG_MATROSKA_DEMUXER 1 -+#define CONFIG_MJPEG_DEMUXER 0 -+#define CONFIG_MLP_DEMUXER 0 -+#define CONFIG_MM_DEMUXER 0 -+#define CONFIG_MMF_DEMUXER 0 -+#define CONFIG_MOV_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MPC_DEMUXER 0 -+#define CONFIG_MPC8_DEMUXER 0 -+#define CONFIG_MPEGPS_DEMUXER 0 -+#define CONFIG_MPEGTS_DEMUXER 0 -+#define CONFIG_MPEGTSRAW_DEMUXER 0 -+#define CONFIG_MPEGVIDEO_DEMUXER 0 -+#define CONFIG_MSNWC_TCP_DEMUXER 0 -+#define CONFIG_MTV_DEMUXER 0 -+#define CONFIG_MVI_DEMUXER 0 -+#define CONFIG_MXF_DEMUXER 0 -+#define CONFIG_NC_DEMUXER 0 -+#define CONFIG_NSV_DEMUXER 0 -+#define CONFIG_NUT_DEMUXER 0 -+#define CONFIG_NUV_DEMUXER 0 -+#define CONFIG_OGG_DEMUXER 1 -+#define CONFIG_OMA_DEMUXER 0 -+#define CONFIG_PCM_ALAW_DEMUXER 0 -+#define CONFIG_PCM_MULAW_DEMUXER 0 -+#define CONFIG_PCM_F64BE_DEMUXER 0 -+#define CONFIG_PCM_F64LE_DEMUXER 0 -+#define CONFIG_PCM_F32BE_DEMUXER 0 -+#define CONFIG_PCM_F32LE_DEMUXER 0 -+#define CONFIG_PCM_S32BE_DEMUXER 0 -+#define CONFIG_PCM_S32LE_DEMUXER 0 -+#define CONFIG_PCM_S24BE_DEMUXER 0 -+#define CONFIG_PCM_S24LE_DEMUXER 0 -+#define CONFIG_PCM_S16BE_DEMUXER 0 -+#define CONFIG_PCM_S16LE_DEMUXER 0 -+#define CONFIG_PCM_S8_DEMUXER 0 -+#define CONFIG_PCM_U32BE_DEMUXER 0 -+#define CONFIG_PCM_U32LE_DEMUXER 0 -+#define CONFIG_PCM_U24BE_DEMUXER 0 -+#define CONFIG_PCM_U24LE_DEMUXER 0 -+#define CONFIG_PCM_U16BE_DEMUXER 0 -+#define CONFIG_PCM_U16LE_DEMUXER 0 -+#define CONFIG_PCM_U8_DEMUXER 0 -+#define CONFIG_PVA_DEMUXER 0 -+#define CONFIG_QCP_DEMUXER 0 -+#define CONFIG_R3D_DEMUXER 0 -+#define CONFIG_RAWVIDEO_DEMUXER 0 -+#define CONFIG_RL2_DEMUXER 0 -+#define CONFIG_RM_DEMUXER 0 -+#define CONFIG_ROQ_DEMUXER 0 -+#define CONFIG_RPL_DEMUXER 0 -+#define CONFIG_RSO_DEMUXER 0 -+#define CONFIG_RTP_DEMUXER 0 -+#define CONFIG_RTSP_DEMUXER 0 -+#define CONFIG_SAP_DEMUXER 0 -+#define CONFIG_SDP_DEMUXER 0 -+#define CONFIG_SEGAFILM_DEMUXER 0 -+#define CONFIG_SHORTEN_DEMUXER 0 -+#define CONFIG_SIFF_DEMUXER 0 -+#define CONFIG_SMACKER_DEMUXER 0 -+#define CONFIG_SOL_DEMUXER 0 -+#define CONFIG_SOX_DEMUXER 0 -+#define CONFIG_SRT_DEMUXER 0 -+#define CONFIG_STR_DEMUXER 0 -+#define CONFIG_SWF_DEMUXER 0 -+#define CONFIG_THP_DEMUXER 0 -+#define CONFIG_TIERTEXSEQ_DEMUXER 0 -+#define CONFIG_TMV_DEMUXER 0 -+#define CONFIG_TRUEHD_DEMUXER 0 -+#define CONFIG_TTA_DEMUXER 0 -+#define CONFIG_TXD_DEMUXER 0 -+#define CONFIG_TTY_DEMUXER 0 -+#define CONFIG_VC1_DEMUXER 0 -+#define CONFIG_VC1T_DEMUXER 0 -+#define CONFIG_VMD_DEMUXER 0 -+#define CONFIG_VOC_DEMUXER 0 -+#define CONFIG_VQF_DEMUXER 0 -+#define CONFIG_W64_DEMUXER 0 -+#define CONFIG_WAV_DEMUXER 1 -+#define CONFIG_WC3_DEMUXER 0 -+#define CONFIG_WEBP_DEMUXER 0 -+#define CONFIG_WSAUD_DEMUXER 0 -+#define CONFIG_WSVQA_DEMUXER 0 -+#define CONFIG_WV_DEMUXER 0 -+#define CONFIG_XA_DEMUXER 0 -+#define CONFIG_YOP_DEMUXER 0 -+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 -+#define CONFIG_LIBNUT_DEMUXER 0 -+#define CONFIG_A64_MUXER 0 -+#define CONFIG_AC3_MUXER 0 -+#define CONFIG_ADTS_MUXER 0 -+#define CONFIG_AIFF_MUXER 0 -+#define CONFIG_AMR_MUXER 0 -+#define CONFIG_ASF_MUXER 0 -+#define CONFIG_ASS_MUXER 0 -+#define CONFIG_ASF_STREAM_MUXER 0 -+#define CONFIG_AU_MUXER 0 -+#define CONFIG_AVI_MUXER 0 -+#define CONFIG_AVM2_MUXER 0 -+#define CONFIG_CAVSVIDEO_MUXER 0 -+#define CONFIG_CRC_MUXER 0 -+#define CONFIG_DAUD_MUXER 0 -+#define CONFIG_DIRAC_MUXER 0 -+#define CONFIG_DNXHD_MUXER 0 -+#define CONFIG_DTS_MUXER 0 -+#define CONFIG_DV_MUXER 0 -+#define CONFIG_EAC3_MUXER 0 -+#define CONFIG_FFM_MUXER 0 -+#define CONFIG_FILMSTRIP_MUXER 0 -+#define CONFIG_FLAC_MUXER 0 -+#define CONFIG_FLV_MUXER 0 -+#define CONFIG_FRAMECRC_MUXER 0 -+#define CONFIG_FRAMEMD5_MUXER 0 -+#define CONFIG_G722_MUXER 0 -+#define CONFIG_GIF_MUXER 0 -+#define CONFIG_GXF_MUXER 0 -+#define CONFIG_H261_MUXER 0 -+#define CONFIG_H263_MUXER 0 -+#define CONFIG_H264_MUXER 0 -+#define CONFIG_IMAGE2_MUXER 0 -+#define CONFIG_IMAGE2PIPE_MUXER 0 -+#define CONFIG_IPOD_MUXER 0 -+#define CONFIG_M4V_MUXER 0 -+#define CONFIG_MD5_MUXER 0 -+#define CONFIG_MATROSKA_MUXER 0 -+#define CONFIG_MATROSKA_AUDIO_MUXER 0 -+#define CONFIG_MJPEG_MUXER 0 -+#define CONFIG_MLP_MUXER 0 -+#define CONFIG_MMF_MUXER 0 -+#define CONFIG_MOV_MUXER 0 -+#define CONFIG_MP2_MUXER 0 -+#define CONFIG_MP3_MUXER 0 -+#define CONFIG_MP4_MUXER 0 -+#define CONFIG_MPEG1SYSTEM_MUXER 0 -+#define CONFIG_MPEG1VCD_MUXER 0 -+#define CONFIG_MPEG1VIDEO_MUXER 0 -+#define CONFIG_MPEG2DVD_MUXER 0 -+#define CONFIG_MPEG2SVCD_MUXER 0 -+#define CONFIG_MPEG2VIDEO_MUXER 0 -+#define CONFIG_MPEG2VOB_MUXER 0 -+#define CONFIG_MPEGTS_MUXER 0 -+#define CONFIG_MPJPEG_MUXER 0 -+#define CONFIG_MXF_MUXER 0 -+#define CONFIG_MXF_D10_MUXER 0 -+#define CONFIG_NULL_MUXER 0 -+#define CONFIG_NUT_MUXER 0 -+#define CONFIG_OGG_MUXER 0 -+#define CONFIG_PCM_ALAW_MUXER 0 -+#define CONFIG_PCM_MULAW_MUXER 0 -+#define CONFIG_PCM_F64BE_MUXER 0 -+#define CONFIG_PCM_F64LE_MUXER 0 -+#define CONFIG_PCM_F32BE_MUXER 0 -+#define CONFIG_PCM_F32LE_MUXER 0 -+#define CONFIG_PCM_S32BE_MUXER 0 -+#define CONFIG_PCM_S32LE_MUXER 0 -+#define CONFIG_PCM_S24BE_MUXER 0 -+#define CONFIG_PCM_S24LE_MUXER 0 -+#define CONFIG_PCM_S16BE_MUXER 0 -+#define CONFIG_PCM_S16LE_MUXER 0 -+#define CONFIG_PCM_S8_MUXER 0 -+#define CONFIG_PCM_U32BE_MUXER 0 -+#define CONFIG_PCM_U32LE_MUXER 0 -+#define CONFIG_PCM_U24BE_MUXER 0 -+#define CONFIG_PCM_U24LE_MUXER 0 -+#define CONFIG_PCM_U16BE_MUXER 0 -+#define CONFIG_PCM_U16LE_MUXER 0 -+#define CONFIG_PCM_U8_MUXER 0 -+#define CONFIG_PSP_MUXER 0 -+#define CONFIG_RAWVIDEO_MUXER 0 -+#define CONFIG_RM_MUXER 0 -+#define CONFIG_ROQ_MUXER 0 -+#define CONFIG_RSO_MUXER 0 -+#define CONFIG_RTP_MUXER 0 -+#define CONFIG_RTSP_MUXER 0 -+#define CONFIG_SAP_MUXER 0 -+#define CONFIG_SOX_MUXER 0 -+#define CONFIG_SPDIF_MUXER 0 -+#define CONFIG_SRT_MUXER 0 -+#define CONFIG_SWF_MUXER 0 -+#define CONFIG_TG2_MUXER 0 -+#define CONFIG_TGP_MUXER 0 -+#define CONFIG_TRUEHD_MUXER 0 -+#define CONFIG_VC1T_MUXER 0 -+#define CONFIG_VOC_MUXER 0 -+#define CONFIG_WAV_MUXER 0 -+#define CONFIG_WEBM_MUXER 0 -+#define CONFIG_WEBP_MUXER 0 -+#define CONFIG_YUV4MPEGPIPE_MUXER 0 -+#define CONFIG_LIBNUT_MUXER 0 -+#define CONFIG_ANULL_FILTER 0 -+#define CONFIG_ANULLSRC_FILTER 0 -+#define CONFIG_ANULLSINK_FILTER 0 -+#define CONFIG_ASPECT_FILTER 0 -+#define CONFIG_BLACKFRAME_FILTER 0 -+#define CONFIG_CROP_FILTER 0 -+#define CONFIG_CROPDETECT_FILTER 0 -+#define CONFIG_DRAWBOX_FILTER 0 -+#define CONFIG_FIFO_FILTER 0 -+#define CONFIG_FORMAT_FILTER 0 -+#define CONFIG_FREI0R_FILTER 0 -+#define CONFIG_HFLIP_FILTER 0 -+#define CONFIG_NOFORMAT_FILTER 0 -+#define CONFIG_NULL_FILTER 0 -+#define CONFIG_OCV_SMOOTH_FILTER 0 -+#define CONFIG_PAD_FILTER 0 -+#define CONFIG_PIXDESCTEST_FILTER 0 -+#define CONFIG_PIXELASPECT_FILTER 0 -+#define CONFIG_SCALE_FILTER 0 -+#define CONFIG_SETPTS_FILTER 0 -+#define CONFIG_SETTB_FILTER 0 -+#define CONFIG_SLICIFY_FILTER 0 -+#define CONFIG_TRANSPOSE_FILTER 0 -+#define CONFIG_UNSHARP_FILTER 0 -+#define CONFIG_VFLIP_FILTER 0 -+#define CONFIG_YADIF_FILTER 0 -+#define CONFIG_BUFFER_FILTER 0 -+#define CONFIG_COLOR_FILTER 0 -+#define CONFIG_NULLSRC_FILTER 0 -+#define CONFIG_NULLSINK_FILTER 0 -+#define CONFIG_CONCAT_PROTOCOL 0 -+#define CONFIG_FILE_PROTOCOL 0 -+#define CONFIG_GOPHER_PROTOCOL 0 -+#define CONFIG_HTTP_PROTOCOL 0 -+#define CONFIG_MMSH_PROTOCOL 0 -+#define CONFIG_MMST_PROTOCOL 0 -+#define CONFIG_MD5_PROTOCOL 0 -+#define CONFIG_PIPE_PROTOCOL 0 -+#define CONFIG_RTMP_PROTOCOL 0 -+#define CONFIG_RTMPT_PROTOCOL 0 -+#define CONFIG_RTMPE_PROTOCOL 0 -+#define CONFIG_RTMPTE_PROTOCOL 0 -+#define CONFIG_RTMPS_PROTOCOL 0 -+#define CONFIG_RTP_PROTOCOL 0 -+#define CONFIG_TCP_PROTOCOL 0 -+#define CONFIG_UDP_PROTOCOL 0 -+#define CONFIG_ALSA_INDEV 0 -+#define CONFIG_BKTR_INDEV 0 -+#define CONFIG_DV1394_INDEV 0 -+#define CONFIG_JACK_INDEV 0 -+#define CONFIG_OSS_INDEV 0 -+#define CONFIG_V4L2_INDEV 0 -+#define CONFIG_V4L_INDEV 0 -+#define CONFIG_VFWCAP_INDEV 0 -+#define CONFIG_X11_GRAB_DEVICE_INDEV 0 -+#define CONFIG_LIBDC1394_INDEV 0 -+#define CONFIG_ALSA_OUTDEV 0 -+#define CONFIG_OSS_OUTDEV 0 -+#endif /* FFMPEG_CONFIG_H */ diff --git a/www/chromium/files/patch-third_party__ffmpeg__config__Chromium__freebsd__x64__config.h b/www/chromium/files/patch-third_party__ffmpeg__config__Chromium__freebsd__x64__config.h deleted file mode 100644 index 29f3252c7369..000000000000 --- a/www/chromium/files/patch-third_party__ffmpeg__config__Chromium__freebsd__x64__config.h +++ /dev/null @@ -1,963 +0,0 @@ ---- ./third_party/ffmpeg/config/Chromium/freebsd/x64/config.h.orig 2010-12-20 20:15:08.000000000 +0100 -+++ ./third_party/ffmpeg/config/Chromium/freebsd/x64/config.h 2010-12-20 20:15:08.000000000 +0100 -@@ -0,0 +1,960 @@ -+/* Automatically generated by configure - do not modify! */ -+#ifndef FFMPEG_CONFIG_H -+#define FFMPEG_CONFIG_H -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --enable-libvpx --enable-decoder='theora,vorbis,libvpx,pcm_u8,pcm_s16le,pcm_f32le' --enable-encoder=libvpx --enable-demuxer='ogg,matroska,wav' --extra-ldflags=-L../../libvpx/linux64/usr/local/lib" -+#define FFMPEG_LICENSE "LGPL version 2.1 or later" -+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -+#define CC_TYPE "gcc" /* rene: what about clang? does $(CC) work? */ -+#define CC_VERSION __VERSION__ -+#define restrict restrict -+#define ASMALIGN(ZEROBITS) ".p2align " #ZEROBITS "\n\t" -+#define EXTERN_PREFIX "" -+#define EXTERN_ASM -+#define SLIBSUF ".so" -+#define ARCH_ALPHA 0 -+#define ARCH_ARM 0 -+#define ARCH_AVR32 0 -+#define ARCH_AVR32_AP 0 -+#define ARCH_AVR32_UC 0 -+#define ARCH_BFIN 0 -+#define ARCH_IA64 0 -+#define ARCH_M68K 0 -+#define ARCH_MIPS 0 -+#define ARCH_MIPS64 0 -+#define ARCH_PARISC 0 -+#define ARCH_PPC 0 -+#define ARCH_PPC64 0 -+#define ARCH_S390 0 -+#define ARCH_SH4 0 -+#define ARCH_SPARC 0 -+#define ARCH_SPARC64 0 -+#define ARCH_TOMI 0 -+#define ARCH_X86 1 -+#define ARCH_X86_32 0 -+#define ARCH_X86_64 1 -+#define HAVE_ALTIVEC 0 -+#define HAVE_AMD3DNOW 0 -+#define HAVE_AMD3DNOWEXT 0 -+#define HAVE_ARMV5TE 0 -+#define HAVE_ARMV6 0 -+#define HAVE_ARMV6T2 0 -+#define HAVE_ARMVFP 0 -+#define HAVE_IWMMXT 0 -+#define HAVE_MMI 0 -+#define HAVE_MMX 1 -+#define HAVE_MMX2 1 -+#define HAVE_NEON 0 -+#define HAVE_PPC4XX 0 -+#define HAVE_SSE 1 -+#define HAVE_SSSE3 1 -+#define HAVE_VIS 0 -+#define HAVE_BIGENDIAN 0 -+#define HAVE_FAST_UNALIGNED 1 -+#define HAVE_PTHREADS 1 -+#define HAVE_W32THREADS 0 -+#define HAVE_ALIGNED_STACK 1 -+#define HAVE_ALSA_ASOUNDLIB_H 0 -+#define HAVE_ALTIVEC_H 0 -+#define HAVE_ARPA_INET_H 0 -+#define HAVE_ATTRIBUTE_MAY_ALIAS 1 -+#define HAVE_ATTRIBUTE_PACKED 1 -+#define HAVE_BSWAP 1 -+#define HAVE_CLOSESOCKET 0 -+#define HAVE_CMOV 1 -+#define HAVE_CONIO_H 0 -+#define HAVE_DCBZL 0 -+#define HAVE_DEV_BKTR_IOCTL_BT848_H 0 -+#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 -+#define HAVE_DEV_IC_BT8XX_H 0 -+#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0 -+#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0 -+#define HAVE_DLFCN_H 1 -+#define HAVE_DLOPEN 1 -+#define HAVE_DOS_PATHS 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 1 -+#define HAVE_FCNTL 1 -+#define HAVE_FORK 1 -+#define HAVE_GETADDRINFO 1 -+#define HAVE_GETHRTIME 0 -+#define HAVE_GETPROCESSMEMORYINFO 0 -+#define HAVE_GETPROCESSTIMES 0 -+#define HAVE_GETRUSAGE 1 -+#define HAVE_GNU_AS 1 -+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1 -+#define HAVE_IBM_ASM 0 -+#define HAVE_INET_ATON 1 -+#define HAVE_INLINE_ASM 1 -+#define HAVE_ISATTY 1 -+#define HAVE_LDBRX 0 -+#define HAVE_LIBDC1394_1 0 -+#define HAVE_LIBDC1394_2 0 -+#define HAVE_LLRINT 1 -+#define HAVE_LLRINTF 1 -+#define HAVE_LOCAL_ALIGNED_16 1 -+#define HAVE_LOCAL_ALIGNED_8 1 -+#define HAVE_LOG2 0 -+#define HAVE_LOG2F 0 -+#define HAVE_LOONGSON 0 -+#define HAVE_LRINT 1 -+#define HAVE_LRINTF 1 -+#define HAVE_LZO1X_999_COMPRESS 0 -+#define HAVE_MACHINE_IOCTL_BT848_H 0 -+#define HAVE_MACHINE_IOCTL_METEOR_H 0 -+#define HAVE_MALLOC_H 0 -+#define HAVE_MEMALIGN 0 -+#define HAVE_MKSTEMP 1 -+#define HAVE_PLD 0 -+#define HAVE_POSIX_MEMALIGN 1 -+#define HAVE_ROUND 1 -+#define HAVE_ROUNDF 1 -+#define HAVE_SDL 0 -+#define HAVE_SDL_VIDEO_SIZE 0 -+#define HAVE_SETMODE 0 -+#define HAVE_SOCKLEN_T 0 -+#define HAVE_SOUNDCARD_H 0 -+#define HAVE_POLL_H 1 -+#define HAVE_SETRLIMIT 1 -+#define HAVE_STRERROR_R 1 -+#define HAVE_STRTOK_R 1 -+#define HAVE_STRUCT_ADDRINFO 0 -+#define HAVE_STRUCT_IPV6_MREQ 0 -+#define HAVE_STRUCT_SOCKADDR_IN6 0 -+#define HAVE_STRUCT_SOCKADDR_SA_LEN 0 -+#define HAVE_STRUCT_SOCKADDR_STORAGE 0 -+#define HAVE_SYMVER 0 -+#define HAVE_SYMVER_GNU_ASM 1 -+#define HAVE_SYMVER_ASM_LABEL 0 -+#define HAVE_SYS_MMAN_H 1 -+#define HAVE_SYS_RESOURCE_H 1 -+#define HAVE_SYS_SELECT_H 1 -+#define HAVE_SYS_SOUNDCARD_H 1 -+#define HAVE_SYS_VIDEOIO_H 0 -+#define HAVE_TEN_OPERANDS 1 -+#define HAVE_TERMIOS_H 1 -+#define HAVE_THREADS 1 -+#define HAVE_TRUNCF 1 -+#define HAVE_VFP_ARGS 0 -+#define HAVE_VIRTUALALLOC 0 -+#define HAVE_WINSOCK2_H 0 -+#define HAVE_XFORM_ASM 0 -+#define HAVE_XMM_CLOBBERS 1 -+#define HAVE_YASM 1 -+#define CONFIG_BSFS 0 -+#define CONFIG_DECODERS 1 -+#define CONFIG_DEMUXERS 1 -+#define CONFIG_ENCODERS 1 -+#define CONFIG_FILTERS 0 -+#define CONFIG_HWACCELS 0 -+#define CONFIG_INDEVS 0 -+#define CONFIG_MUXERS 0 -+#define CONFIG_OUTDEVS 0 -+#define CONFIG_PARSERS 0 -+#define CONFIG_PROTOCOLS 1 -+#define CONFIG_AANDCT 0 -+#define CONFIG_AVCODEC 1 -+#define CONFIG_AVCORE 1 -+#define CONFIG_AVDEVICE 1 -+#define CONFIG_AVFILTER 1 -+#define CONFIG_AVFORMAT 1 -+#define CONFIG_AVISYNTH 0 -+#define CONFIG_BZLIB 0 -+#define CONFIG_DCT 0 -+#define CONFIG_DOC 0 -+#define CONFIG_DWT 0 -+#define CONFIG_DXVA2 0 -+#define CONFIG_FASTDIV 1 -+#define CONFIG_FFMPEG 0 -+#define CONFIG_FFPLAY 0 -+#define CONFIG_FFPROBE 1 -+#define CONFIG_FFSERVER 0 -+#define CONFIG_FFT 1 -+#define CONFIG_FREI0R 0 -+#define CONFIG_GOLOMB 1 -+#define CONFIG_GPL 0 -+#define CONFIG_GRAY 0 -+#define CONFIG_H264DSP 0 -+#define CONFIG_H264PRED 0 -+#define CONFIG_HARDCODED_TABLES 0 -+#define CONFIG_HUFFMAN 0 -+#define CONFIG_LIBDC1394 0 -+#define CONFIG_LIBDIRAC 0 -+#define CONFIG_LIBFAAC 0 -+#define CONFIG_LIBGSM 0 -+#define CONFIG_LIBMP3LAME 0 -+#define CONFIG_LIBNUT 0 -+#define CONFIG_LIBOPENCORE_AMRNB 0 -+#define CONFIG_LIBOPENCORE_AMRWB 0 -+#define CONFIG_LIBOPENCV 0 -+#define CONFIG_LIBOPENJPEG 0 -+#define CONFIG_LIBRTMP 0 -+#define CONFIG_LIBSCHROEDINGER 0 -+#define CONFIG_LIBSPEEX 0 -+#define CONFIG_LIBTHEORA 0 -+#define CONFIG_LIBVORBIS 0 -+#define CONFIG_LIBVPX 1 -+#define CONFIG_LIBX264 0 -+#define CONFIG_LIBXAVS 0 -+#define CONFIG_LIBXVID 0 -+#define CONFIG_LPC 0 -+#define CONFIG_LSP 0 -+#define CONFIG_MDCT 1 -+#define CONFIG_MEMALIGN_HACK 0 -+#define CONFIG_MLIB 0 -+#define CONFIG_MPEGAUDIO_HP 1 -+#define CONFIG_NETWORK 0 -+#define CONFIG_NONFREE 0 -+#define CONFIG_PIC 1 -+#define CONFIG_POSTPROC 0 -+#define CONFIG_RDFT 0 -+#define CONFIG_RTPDEC 0 -+#define CONFIG_RUNTIME_CPUDETECT 0 -+#define CONFIG_SHARED 1 -+#define CONFIG_SMALL 0 -+#define CONFIG_SRAM 0 -+#define CONFIG_STATIC 1 -+#define CONFIG_SWSCALE 0 -+#define CONFIG_SWSCALE_ALPHA 1 -+#define CONFIG_VAAPI 0 -+#define CONFIG_VDPAU 0 -+#define CONFIG_VERSION3 0 -+#define CONFIG_X11GRAB 0 -+#define CONFIG_ZLIB 0 -+#define CONFIG_AVUTIL 1 -+#define CONFIG_GPLV3 0 -+#define CONFIG_LGPLV3 0 -+#define CONFIG_AASC_DECODER 0 -+#define CONFIG_AMV_DECODER 0 -+#define CONFIG_ANM_DECODER 0 -+#define CONFIG_ANSI_DECODER 0 -+#define CONFIG_ASV1_DECODER 0 -+#define CONFIG_ASV2_DECODER 0 -+#define CONFIG_AURA_DECODER 0 -+#define CONFIG_AURA2_DECODER 0 -+#define CONFIG_AVS_DECODER 0 -+#define CONFIG_BETHSOFTVID_DECODER 0 -+#define CONFIG_BFI_DECODER 0 -+#define CONFIG_BINK_DECODER 0 -+#define CONFIG_BMP_DECODER 0 -+#define CONFIG_C93_DECODER 0 -+#define CONFIG_CAVS_DECODER 0 -+#define CONFIG_CDGRAPHICS_DECODER 0 -+#define CONFIG_CINEPAK_DECODER 0 -+#define CONFIG_CLJR_DECODER 0 -+#define CONFIG_CSCD_DECODER 0 -+#define CONFIG_CYUV_DECODER 0 -+#define CONFIG_DNXHD_DECODER 0 -+#define CONFIG_DPX_DECODER 0 -+#define CONFIG_DSICINVIDEO_DECODER 0 -+#define CONFIG_DVVIDEO_DECODER 0 -+#define CONFIG_DXA_DECODER 0 -+#define CONFIG_EACMV_DECODER 0 -+#define CONFIG_EAMAD_DECODER 0 -+#define CONFIG_EATGQ_DECODER 0 -+#define CONFIG_EATGV_DECODER 0 -+#define CONFIG_EATQI_DECODER 0 -+#define CONFIG_EIGHTBPS_DECODER 0 -+#define CONFIG_EIGHTSVX_EXP_DECODER 0 -+#define CONFIG_EIGHTSVX_FIB_DECODER 0 -+#define CONFIG_ESCAPE124_DECODER 0 -+#define CONFIG_FFV1_DECODER 0 -+#define CONFIG_FFVHUFF_DECODER 0 -+#define CONFIG_FLASHSV_DECODER 0 -+#define CONFIG_FLIC_DECODER 0 -+#define CONFIG_FLV_DECODER 0 -+#define CONFIG_FOURXM_DECODER 0 -+#define CONFIG_FRAPS_DECODER 0 -+#define CONFIG_FRWU_DECODER 0 -+#define CONFIG_GIF_DECODER 0 -+#define CONFIG_H261_DECODER 0 -+#define CONFIG_H263_DECODER 0 -+#define CONFIG_H263I_DECODER 0 -+#define CONFIG_H264_DECODER 0 -+#define CONFIG_H264_VDPAU_DECODER 0 -+#define CONFIG_HUFFYUV_DECODER 0 -+#define CONFIG_IDCIN_DECODER 0 -+#define CONFIG_IFF_BYTERUN1_DECODER 0 -+#define CONFIG_IFF_ILBM_DECODER 0 -+#define CONFIG_INDEO2_DECODER 0 -+#define CONFIG_INDEO3_DECODER 0 -+#define CONFIG_INDEO5_DECODER 0 -+#define CONFIG_INTERPLAY_VIDEO_DECODER 0 -+#define CONFIG_JPEGLS_DECODER 0 -+#define CONFIG_KGV1_DECODER 0 -+#define CONFIG_KMVC_DECODER 0 -+#define CONFIG_LOCO_DECODER 0 -+#define CONFIG_MDEC_DECODER 0 -+#define CONFIG_MIMIC_DECODER 0 -+#define CONFIG_MJPEG_DECODER 0 -+#define CONFIG_MJPEGB_DECODER 0 -+#define CONFIG_MMVIDEO_DECODER 0 -+#define CONFIG_MOTIONPIXELS_DECODER 0 -+#define CONFIG_MPEG_XVMC_DECODER 0 -+#define CONFIG_MPEG1VIDEO_DECODER 0 -+#define CONFIG_MPEG2VIDEO_DECODER 0 -+#define CONFIG_MPEG4_DECODER 0 -+#define CONFIG_MPEG4_VDPAU_DECODER 0 -+#define CONFIG_MPEGVIDEO_DECODER 0 -+#define CONFIG_MPEG_VDPAU_DECODER 0 -+#define CONFIG_MPEG1_VDPAU_DECODER 0 -+#define CONFIG_MSMPEG4V1_DECODER 0 -+#define CONFIG_MSMPEG4V2_DECODER 0 -+#define CONFIG_MSMPEG4V3_DECODER 0 -+#define CONFIG_MSRLE_DECODER 0 -+#define CONFIG_MSVIDEO1_DECODER 0 -+#define CONFIG_MSZH_DECODER 0 -+#define CONFIG_NUV_DECODER 0 -+#define CONFIG_PAM_DECODER 0 -+#define CONFIG_PBM_DECODER 0 -+#define CONFIG_PCX_DECODER 0 -+#define CONFIG_PGM_DECODER 0 -+#define CONFIG_PGMYUV_DECODER 0 -+#define CONFIG_PICTOR_DECODER 0 -+#define CONFIG_PNG_DECODER 0 -+#define CONFIG_PPM_DECODER 0 -+#define CONFIG_PTX_DECODER 0 -+#define CONFIG_QDRAW_DECODER 0 -+#define CONFIG_QPEG_DECODER 0 -+#define CONFIG_QTRLE_DECODER 0 -+#define CONFIG_R10K_DECODER 0 -+#define CONFIG_R210_DECODER 0 -+#define CONFIG_RAWVIDEO_DECODER 0 -+#define CONFIG_RL2_DECODER 0 -+#define CONFIG_ROQ_DECODER 0 -+#define CONFIG_RPZA_DECODER 0 -+#define CONFIG_RV10_DECODER 0 -+#define CONFIG_RV20_DECODER 0 -+#define CONFIG_RV30_DECODER 0 -+#define CONFIG_RV40_DECODER 0 -+#define CONFIG_SGI_DECODER 0 -+#define CONFIG_SMACKER_DECODER 0 -+#define CONFIG_SMC_DECODER 0 -+#define CONFIG_SNOW_DECODER 0 -+#define CONFIG_SP5X_DECODER 0 -+#define CONFIG_SUNRAST_DECODER 0 -+#define CONFIG_SVQ1_DECODER 0 -+#define CONFIG_SVQ3_DECODER 0 -+#define CONFIG_TARGA_DECODER 0 -+#define CONFIG_THEORA_DECODER 1 -+#define CONFIG_THP_DECODER 0 -+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 -+#define CONFIG_TIFF_DECODER 0 -+#define CONFIG_TMV_DECODER 0 -+#define CONFIG_TRUEMOTION1_DECODER 0 -+#define CONFIG_TRUEMOTION2_DECODER 0 -+#define CONFIG_TSCC_DECODER 0 -+#define CONFIG_TXD_DECODER 0 -+#define CONFIG_ULTI_DECODER 0 -+#define CONFIG_V210_DECODER 0 -+#define CONFIG_V210X_DECODER 0 -+#define CONFIG_VB_DECODER 0 -+#define CONFIG_VC1_DECODER 0 -+#define CONFIG_VC1_VDPAU_DECODER 0 -+#define CONFIG_VCR1_DECODER 0 -+#define CONFIG_VMDVIDEO_DECODER 0 -+#define CONFIG_VMNC_DECODER 0 -+#define CONFIG_VP3_DECODER 1 -+#define CONFIG_VP5_DECODER 0 -+#define CONFIG_VP6_DECODER 0 -+#define CONFIG_VP6A_DECODER 0 -+#define CONFIG_VP6F_DECODER 0 -+#define CONFIG_VP8_DECODER 0 -+#define CONFIG_VQA_DECODER 0 -+#define CONFIG_WMV1_DECODER 0 -+#define CONFIG_WMV2_DECODER 0 -+#define CONFIG_WMV3_DECODER 0 -+#define CONFIG_WMV3_VDPAU_DECODER 0 -+#define CONFIG_WNV1_DECODER 0 -+#define CONFIG_XAN_WC3_DECODER 0 -+#define CONFIG_XL_DECODER 0 -+#define CONFIG_YOP_DECODER 0 -+#define CONFIG_ZLIB_DECODER 0 -+#define CONFIG_ZMBV_DECODER 0 -+#define CONFIG_AAC_DECODER 0 -+#define CONFIG_AAC_LATM_DECODER 0 -+#define CONFIG_AC3_DECODER 0 -+#define CONFIG_ALAC_DECODER 0 -+#define CONFIG_ALS_DECODER 0 -+#define CONFIG_AMRNB_DECODER 0 -+#define CONFIG_APE_DECODER 0 -+#define CONFIG_ATRAC1_DECODER 0 -+#define CONFIG_ATRAC3_DECODER 0 -+#define CONFIG_BINKAUDIO_DCT_DECODER 0 -+#define CONFIG_BINKAUDIO_RDFT_DECODER 0 -+#define CONFIG_COOK_DECODER 0 -+#define CONFIG_DCA_DECODER 0 -+#define CONFIG_DSICINAUDIO_DECODER 0 -+#define CONFIG_EAC3_DECODER 0 -+#define CONFIG_FLAC_DECODER 0 -+#define CONFIG_GSM_DECODER 0 -+#define CONFIG_GSM_MS_DECODER 0 -+#define CONFIG_IMC_DECODER 0 -+#define CONFIG_MACE3_DECODER 0 -+#define CONFIG_MACE6_DECODER 0 -+#define CONFIG_MLP_DECODER 0 -+#define CONFIG_MP1_DECODER 0 -+#define CONFIG_MP1FLOAT_DECODER 0 -+#define CONFIG_MP2_DECODER 0 -+#define CONFIG_MP2FLOAT_DECODER 0 -+#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3FLOAT_DECODER 0 -+#define CONFIG_MP3ADU_DECODER 0 -+#define CONFIG_MP3ADUFLOAT_DECODER 0 -+#define CONFIG_MP3ON4_DECODER 0 -+#define CONFIG_MP3ON4FLOAT_DECODER 0 -+#define CONFIG_MPC7_DECODER 0 -+#define CONFIG_MPC8_DECODER 0 -+#define CONFIG_NELLYMOSER_DECODER 0 -+#define CONFIG_QCELP_DECODER 0 -+#define CONFIG_QDM2_DECODER 0 -+#define CONFIG_RA_144_DECODER 0 -+#define CONFIG_RA_288_DECODER 0 -+#define CONFIG_SHORTEN_DECODER 0 -+#define CONFIG_SIPR_DECODER 0 -+#define CONFIG_SMACKAUD_DECODER 0 -+#define CONFIG_SONIC_DECODER 0 -+#define CONFIG_TRUEHD_DECODER 0 -+#define CONFIG_TRUESPEECH_DECODER 0 -+#define CONFIG_TTA_DECODER 0 -+#define CONFIG_TWINVQ_DECODER 0 -+#define CONFIG_VMDAUDIO_DECODER 0 -+#define CONFIG_VORBIS_DECODER 1 -+#define CONFIG_WAVPACK_DECODER 0 -+#define CONFIG_WMAPRO_DECODER 0 -+#define CONFIG_WMAV1_DECODER 0 -+#define CONFIG_WMAV2_DECODER 0 -+#define CONFIG_WMAVOICE_DECODER 0 -+#define CONFIG_WS_SND1_DECODER 0 -+#define CONFIG_PCM_ALAW_DECODER 0 -+#define CONFIG_PCM_BLURAY_DECODER 0 -+#define CONFIG_PCM_DVD_DECODER 0 -+#define CONFIG_PCM_F32BE_DECODER 0 -+#define CONFIG_PCM_F32LE_DECODER 1 -+#define CONFIG_PCM_F64BE_DECODER 0 -+#define CONFIG_PCM_F64LE_DECODER 0 -+#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_S16LE_DECODER 1 -+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S24BE_DECODER 0 -+#define CONFIG_PCM_S24DAUD_DECODER 0 -+#define CONFIG_PCM_S24LE_DECODER 0 -+#define CONFIG_PCM_S32BE_DECODER 0 -+#define CONFIG_PCM_S32LE_DECODER 0 -+#define CONFIG_PCM_U8_DECODER 1 -+#define CONFIG_PCM_U16BE_DECODER 0 -+#define CONFIG_PCM_U16LE_DECODER 0 -+#define CONFIG_PCM_U24BE_DECODER 0 -+#define CONFIG_PCM_U24LE_DECODER 0 -+#define CONFIG_PCM_U32BE_DECODER 0 -+#define CONFIG_PCM_U32LE_DECODER 0 -+#define CONFIG_PCM_ZORK_DECODER 0 -+#define CONFIG_INTERPLAY_DPCM_DECODER 0 -+#define CONFIG_ROQ_DPCM_DECODER 0 -+#define CONFIG_SOL_DPCM_DECODER 0 -+#define CONFIG_XAN_DPCM_DECODER 0 -+#define CONFIG_ADPCM_4XM_DECODER 0 -+#define CONFIG_ADPCM_ADX_DECODER 0 -+#define CONFIG_ADPCM_CT_DECODER 0 -+#define CONFIG_ADPCM_EA_DECODER 0 -+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 -+#define CONFIG_ADPCM_EA_R1_DECODER 0 -+#define CONFIG_ADPCM_EA_R2_DECODER 0 -+#define CONFIG_ADPCM_EA_R3_DECODER 0 -+#define CONFIG_ADPCM_EA_XAS_DECODER 0 -+#define CONFIG_ADPCM_G722_DECODER 0 -+#define CONFIG_ADPCM_G726_DECODER 0 -+#define CONFIG_ADPCM_IMA_AMV_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK3_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK4_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_ISS_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_DECODER 0 -+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 -+#define CONFIG_ADPCM_IMA_WAV_DECODER 0 -+#define CONFIG_ADPCM_IMA_WS_DECODER 0 -+#define CONFIG_ADPCM_MS_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_2_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_3_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_4_DECODER 0 -+#define CONFIG_ADPCM_SWF_DECODER 0 -+#define CONFIG_ADPCM_THP_DECODER 0 -+#define CONFIG_ADPCM_XA_DECODER 0 -+#define CONFIG_ADPCM_YAMAHA_DECODER 0 -+#define CONFIG_DVBSUB_DECODER 0 -+#define CONFIG_DVDSUB_DECODER 0 -+#define CONFIG_PGSSUB_DECODER 0 -+#define CONFIG_XSUB_DECODER 0 -+#define CONFIG_LIBDIRAC_DECODER 0 -+#define CONFIG_LIBGSM_DECODER 0 -+#define CONFIG_LIBGSM_MS_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 -+#define CONFIG_LIBOPENJPEG_DECODER 0 -+#define CONFIG_LIBSCHROEDINGER_DECODER 0 -+#define CONFIG_LIBSPEEX_DECODER 0 -+#define CONFIG_LIBVPX_DECODER 1 -+#define CONFIG_A64MULTI_ENCODER 0 -+#define CONFIG_A64MULTI5_ENCODER 0 -+#define CONFIG_ASV1_ENCODER 0 -+#define CONFIG_ASV2_ENCODER 0 -+#define CONFIG_BMP_ENCODER 0 -+#define CONFIG_DNXHD_ENCODER 0 -+#define CONFIG_DVVIDEO_ENCODER 0 -+#define CONFIG_FFV1_ENCODER 0 -+#define CONFIG_FFVHUFF_ENCODER 0 -+#define CONFIG_FLASHSV_ENCODER 0 -+#define CONFIG_FLV_ENCODER 0 -+#define CONFIG_GIF_ENCODER 0 -+#define CONFIG_H261_ENCODER 0 -+#define CONFIG_H263_ENCODER 0 -+#define CONFIG_H263P_ENCODER 0 -+#define CONFIG_HUFFYUV_ENCODER 0 -+#define CONFIG_JPEGLS_ENCODER 0 -+#define CONFIG_LJPEG_ENCODER 0 -+#define CONFIG_MJPEG_ENCODER 0 -+#define CONFIG_MPEG1VIDEO_ENCODER 0 -+#define CONFIG_MPEG2VIDEO_ENCODER 0 -+#define CONFIG_MPEG4_ENCODER 0 -+#define CONFIG_MSMPEG4V1_ENCODER 0 -+#define CONFIG_MSMPEG4V2_ENCODER 0 -+#define CONFIG_MSMPEG4V3_ENCODER 0 -+#define CONFIG_PAM_ENCODER 0 -+#define CONFIG_PBM_ENCODER 0 -+#define CONFIG_PCX_ENCODER 0 -+#define CONFIG_PGM_ENCODER 0 -+#define CONFIG_PGMYUV_ENCODER 0 -+#define CONFIG_PNG_ENCODER 0 -+#define CONFIG_PPM_ENCODER 0 -+#define CONFIG_QTRLE_ENCODER 0 -+#define CONFIG_RAWVIDEO_ENCODER 0 -+#define CONFIG_ROQ_ENCODER 0 -+#define CONFIG_RV10_ENCODER 0 -+#define CONFIG_RV20_ENCODER 0 -+#define CONFIG_SGI_ENCODER 0 -+#define CONFIG_SNOW_ENCODER 0 -+#define CONFIG_SVQ1_ENCODER 0 -+#define CONFIG_TARGA_ENCODER 0 -+#define CONFIG_TIFF_ENCODER 0 -+#define CONFIG_V210_ENCODER 0 -+#define CONFIG_WMV1_ENCODER 0 -+#define CONFIG_WMV2_ENCODER 0 -+#define CONFIG_ZLIB_ENCODER 0 -+#define CONFIG_ZMBV_ENCODER 0 -+#define CONFIG_AAC_ENCODER 0 -+#define CONFIG_AC3_ENCODER 0 -+#define CONFIG_ALAC_ENCODER 0 -+#define CONFIG_FLAC_ENCODER 0 -+#define CONFIG_MP2_ENCODER 0 -+#define CONFIG_NELLYMOSER_ENCODER 0 -+#define CONFIG_RA_144_ENCODER 0 -+#define CONFIG_SONIC_ENCODER 0 -+#define CONFIG_SONIC_LS_ENCODER 0 -+#define CONFIG_VORBIS_ENCODER 0 -+#define CONFIG_WMAV1_ENCODER 0 -+#define CONFIG_WMAV2_ENCODER 0 -+#define CONFIG_PCM_ALAW_ENCODER 0 -+#define CONFIG_PCM_F32BE_ENCODER 0 -+#define CONFIG_PCM_F32LE_ENCODER 0 -+#define CONFIG_PCM_F64BE_ENCODER 0 -+#define CONFIG_PCM_F64LE_ENCODER 0 -+#define CONFIG_PCM_MULAW_ENCODER 0 -+#define CONFIG_PCM_S8_ENCODER 0 -+#define CONFIG_PCM_S16BE_ENCODER 0 -+#define CONFIG_PCM_S16LE_ENCODER 0 -+#define CONFIG_PCM_S24BE_ENCODER 0 -+#define CONFIG_PCM_S24DAUD_ENCODER 0 -+#define CONFIG_PCM_S24LE_ENCODER 0 -+#define CONFIG_PCM_S32BE_ENCODER 0 -+#define CONFIG_PCM_S32LE_ENCODER 0 -+#define CONFIG_PCM_U8_ENCODER 0 -+#define CONFIG_PCM_U16BE_ENCODER 0 -+#define CONFIG_PCM_U16LE_ENCODER 0 -+#define CONFIG_PCM_U24BE_ENCODER 0 -+#define CONFIG_PCM_U24LE_ENCODER 0 -+#define CONFIG_PCM_U32BE_ENCODER 0 -+#define CONFIG_PCM_U32LE_ENCODER 0 -+#define CONFIG_PCM_ZORK_ENCODER 0 -+#define CONFIG_ROQ_DPCM_ENCODER 0 -+#define CONFIG_ADPCM_ADX_ENCODER 0 -+#define CONFIG_ADPCM_G722_ENCODER 0 -+#define CONFIG_ADPCM_G726_ENCODER 0 -+#define CONFIG_ADPCM_IMA_QT_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 -+#define CONFIG_ADPCM_MS_ENCODER 0 -+#define CONFIG_ADPCM_SWF_ENCODER 0 -+#define CONFIG_ADPCM_YAMAHA_ENCODER 0 -+#define CONFIG_DVBSUB_ENCODER 0 -+#define CONFIG_DVDSUB_ENCODER 0 -+#define CONFIG_XSUB_ENCODER 0 -+#define CONFIG_LIBDIRAC_ENCODER 0 -+#define CONFIG_LIBFAAC_ENCODER 0 -+#define CONFIG_LIBGSM_ENCODER 0 -+#define CONFIG_LIBGSM_MS_ENCODER 0 -+#define CONFIG_LIBMP3LAME_ENCODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 -+#define CONFIG_LIBSCHROEDINGER_ENCODER 0 -+#define CONFIG_LIBTHEORA_ENCODER 0 -+#define CONFIG_LIBVORBIS_ENCODER 0 -+#define CONFIG_LIBVPX_ENCODER 1 -+#define CONFIG_LIBX264_ENCODER 0 -+#define CONFIG_LIBXAVS_ENCODER 0 -+#define CONFIG_LIBXVID_ENCODER 0 -+#define CONFIG_H263_VAAPI_HWACCEL 0 -+#define CONFIG_H264_DXVA2_HWACCEL 0 -+#define CONFIG_H264_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG2_DXVA2_HWACCEL 0 -+#define CONFIG_MPEG2_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG4_VAAPI_HWACCEL 0 -+#define CONFIG_VC1_DXVA2_HWACCEL 0 -+#define CONFIG_VC1_VAAPI_HWACCEL 0 -+#define CONFIG_WMV3_DXVA2_HWACCEL 0 -+#define CONFIG_WMV3_VAAPI_HWACCEL 0 -+#define CONFIG_AAC_PARSER 0 -+#define CONFIG_AAC_LATM_PARSER 0 -+#define CONFIG_AC3_PARSER 0 -+#define CONFIG_CAVSVIDEO_PARSER 0 -+#define CONFIG_DCA_PARSER 0 -+#define CONFIG_DIRAC_PARSER 0 -+#define CONFIG_DNXHD_PARSER 0 -+#define CONFIG_DVBSUB_PARSER 0 -+#define CONFIG_DVDSUB_PARSER 0 -+#define CONFIG_H261_PARSER 0 -+#define CONFIG_H263_PARSER 0 -+#define CONFIG_H264_PARSER 0 -+#define CONFIG_MJPEG_PARSER 0 -+#define CONFIG_MLP_PARSER 0 -+#define CONFIG_MPEG4VIDEO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGVIDEO_PARSER 0 -+#define CONFIG_PNM_PARSER 0 -+#define CONFIG_VC1_PARSER 0 -+#define CONFIG_VP3_PARSER 0 -+#define CONFIG_VP8_PARSER 0 -+#define CONFIG_AAC_ADTSTOASC_BSF 0 -+#define CONFIG_CHOMP_BSF 0 -+#define CONFIG_DUMP_EXTRADATA_BSF 0 -+#define CONFIG_H264_MP4TOANNEXB_BSF 0 -+#define CONFIG_MPEG4VIDEO_ES_BSF 0 -+#define CONFIG_IMX_DUMP_HEADER_BSF 0 -+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 -+#define CONFIG_MP3_HEADER_COMPRESS_BSF 0 -+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0 -+#define CONFIG_MOV2TEXTSUB_BSF 0 -+#define CONFIG_NOISE_BSF 0 -+#define CONFIG_REMOVE_EXTRADATA_BSF 0 -+#define CONFIG_TEXT2MOVSUB_BSF 0 -+#define CONFIG_VC1_ASFTORCV_BSF 0 -+#define CONFIG_VC1_ASFTOANNEXG_BSF 0 -+#define CONFIG_AAC_DEMUXER 0 -+#define CONFIG_AC3_DEMUXER 0 -+#define CONFIG_AEA_DEMUXER 0 -+#define CONFIG_AIFF_DEMUXER 0 -+#define CONFIG_AMR_DEMUXER 0 -+#define CONFIG_ANM_DEMUXER 0 -+#define CONFIG_APC_DEMUXER 0 -+#define CONFIG_APE_DEMUXER 0 -+#define CONFIG_APPLEHTTP_DEMUXER 0 -+#define CONFIG_ASF_DEMUXER 0 -+#define CONFIG_ASS_DEMUXER 0 -+#define CONFIG_AU_DEMUXER 0 -+#define CONFIG_AVI_DEMUXER 0 -+#define CONFIG_AVISYNTH_DEMUXER 0 -+#define CONFIG_AVS_DEMUXER 0 -+#define CONFIG_BETHSOFTVID_DEMUXER 0 -+#define CONFIG_BFI_DEMUXER 0 -+#define CONFIG_BINK_DEMUXER 0 -+#define CONFIG_C93_DEMUXER 0 -+#define CONFIG_CAF_DEMUXER 0 -+#define CONFIG_CAVSVIDEO_DEMUXER 0 -+#define CONFIG_CDG_DEMUXER 0 -+#define CONFIG_DAUD_DEMUXER 0 -+#define CONFIG_DIRAC_DEMUXER 0 -+#define CONFIG_DNXHD_DEMUXER 0 -+#define CONFIG_DSICIN_DEMUXER 0 -+#define CONFIG_DTS_DEMUXER 0 -+#define CONFIG_DV_DEMUXER 0 -+#define CONFIG_DXA_DEMUXER 0 -+#define CONFIG_EA_DEMUXER 0 -+#define CONFIG_EA_CDATA_DEMUXER 0 -+#define CONFIG_EAC3_DEMUXER 0 -+#define CONFIG_FFM_DEMUXER 0 -+#define CONFIG_FILMSTRIP_DEMUXER 0 -+#define CONFIG_FLAC_DEMUXER 0 -+#define CONFIG_FLIC_DEMUXER 0 -+#define CONFIG_FLV_DEMUXER 0 -+#define CONFIG_FOURXM_DEMUXER 0 -+#define CONFIG_G722_DEMUXER 0 -+#define CONFIG_GSM_DEMUXER 0 -+#define CONFIG_GXF_DEMUXER 0 -+#define CONFIG_H261_DEMUXER 0 -+#define CONFIG_H263_DEMUXER 0 -+#define CONFIG_H264_DEMUXER 0 -+#define CONFIG_IDCIN_DEMUXER 0 -+#define CONFIG_IFF_DEMUXER 0 -+#define CONFIG_IMAGE2_DEMUXER 0 -+#define CONFIG_IMAGE2PIPE_DEMUXER 0 -+#define CONFIG_INGENIENT_DEMUXER 0 -+#define CONFIG_IPMOVIE_DEMUXER 0 -+#define CONFIG_ISS_DEMUXER 0 -+#define CONFIG_IV8_DEMUXER 0 -+#define CONFIG_IVF_DEMUXER 0 -+#define CONFIG_LMLM4_DEMUXER 0 -+#define CONFIG_LXF_DEMUXER 0 -+#define CONFIG_M4V_DEMUXER 0 -+#define CONFIG_MATROSKA_DEMUXER 1 -+#define CONFIG_MJPEG_DEMUXER 0 -+#define CONFIG_MLP_DEMUXER 0 -+#define CONFIG_MM_DEMUXER 0 -+#define CONFIG_MMF_DEMUXER 0 -+#define CONFIG_MOV_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MPC_DEMUXER 0 -+#define CONFIG_MPC8_DEMUXER 0 -+#define CONFIG_MPEGPS_DEMUXER 0 -+#define CONFIG_MPEGTS_DEMUXER 0 -+#define CONFIG_MPEGTSRAW_DEMUXER 0 -+#define CONFIG_MPEGVIDEO_DEMUXER 0 -+#define CONFIG_MSNWC_TCP_DEMUXER 0 -+#define CONFIG_MTV_DEMUXER 0 -+#define CONFIG_MVI_DEMUXER 0 -+#define CONFIG_MXF_DEMUXER 0 -+#define CONFIG_NC_DEMUXER 0 -+#define CONFIG_NSV_DEMUXER 0 -+#define CONFIG_NUT_DEMUXER 0 -+#define CONFIG_NUV_DEMUXER 0 -+#define CONFIG_OGG_DEMUXER 1 -+#define CONFIG_OMA_DEMUXER 0 -+#define CONFIG_PCM_ALAW_DEMUXER 0 -+#define CONFIG_PCM_MULAW_DEMUXER 0 -+#define CONFIG_PCM_F64BE_DEMUXER 0 -+#define CONFIG_PCM_F64LE_DEMUXER 0 -+#define CONFIG_PCM_F32BE_DEMUXER 0 -+#define CONFIG_PCM_F32LE_DEMUXER 0 -+#define CONFIG_PCM_S32BE_DEMUXER 0 -+#define CONFIG_PCM_S32LE_DEMUXER 0 -+#define CONFIG_PCM_S24BE_DEMUXER 0 -+#define CONFIG_PCM_S24LE_DEMUXER 0 -+#define CONFIG_PCM_S16BE_DEMUXER 0 -+#define CONFIG_PCM_S16LE_DEMUXER 0 -+#define CONFIG_PCM_S8_DEMUXER 0 -+#define CONFIG_PCM_U32BE_DEMUXER 0 -+#define CONFIG_PCM_U32LE_DEMUXER 0 -+#define CONFIG_PCM_U24BE_DEMUXER 0 -+#define CONFIG_PCM_U24LE_DEMUXER 0 -+#define CONFIG_PCM_U16BE_DEMUXER 0 -+#define CONFIG_PCM_U16LE_DEMUXER 0 -+#define CONFIG_PCM_U8_DEMUXER 0 -+#define CONFIG_PVA_DEMUXER 0 -+#define CONFIG_QCP_DEMUXER 0 -+#define CONFIG_R3D_DEMUXER 0 -+#define CONFIG_RAWVIDEO_DEMUXER 0 -+#define CONFIG_RL2_DEMUXER 0 -+#define CONFIG_RM_DEMUXER 0 -+#define CONFIG_ROQ_DEMUXER 0 -+#define CONFIG_RPL_DEMUXER 0 -+#define CONFIG_RSO_DEMUXER 0 -+#define CONFIG_RTP_DEMUXER 0 -+#define CONFIG_RTSP_DEMUXER 0 -+#define CONFIG_SAP_DEMUXER 0 -+#define CONFIG_SDP_DEMUXER 0 -+#define CONFIG_SEGAFILM_DEMUXER 0 -+#define CONFIG_SHORTEN_DEMUXER 0 -+#define CONFIG_SIFF_DEMUXER 0 -+#define CONFIG_SMACKER_DEMUXER 0 -+#define CONFIG_SOL_DEMUXER 0 -+#define CONFIG_SOX_DEMUXER 0 -+#define CONFIG_SRT_DEMUXER 0 -+#define CONFIG_STR_DEMUXER 0 -+#define CONFIG_SWF_DEMUXER 0 -+#define CONFIG_THP_DEMUXER 0 -+#define CONFIG_TIERTEXSEQ_DEMUXER 0 -+#define CONFIG_TMV_DEMUXER 0 -+#define CONFIG_TRUEHD_DEMUXER 0 -+#define CONFIG_TTA_DEMUXER 0 -+#define CONFIG_TXD_DEMUXER 0 -+#define CONFIG_TTY_DEMUXER 0 -+#define CONFIG_VC1_DEMUXER 0 -+#define CONFIG_VC1T_DEMUXER 0 -+#define CONFIG_VMD_DEMUXER 0 -+#define CONFIG_VOC_DEMUXER 0 -+#define CONFIG_VQF_DEMUXER 0 -+#define CONFIG_W64_DEMUXER 0 -+#define CONFIG_WAV_DEMUXER 1 -+#define CONFIG_WC3_DEMUXER 0 -+#define CONFIG_WEBP_DEMUXER 0 -+#define CONFIG_WSAUD_DEMUXER 0 -+#define CONFIG_WSVQA_DEMUXER 0 -+#define CONFIG_WV_DEMUXER 0 -+#define CONFIG_XA_DEMUXER 0 -+#define CONFIG_YOP_DEMUXER 0 -+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 -+#define CONFIG_LIBNUT_DEMUXER 0 -+#define CONFIG_A64_MUXER 0 -+#define CONFIG_AC3_MUXER 0 -+#define CONFIG_ADTS_MUXER 0 -+#define CONFIG_AIFF_MUXER 0 -+#define CONFIG_AMR_MUXER 0 -+#define CONFIG_ASF_MUXER 0 -+#define CONFIG_ASS_MUXER 0 -+#define CONFIG_ASF_STREAM_MUXER 0 -+#define CONFIG_AU_MUXER 0 -+#define CONFIG_AVI_MUXER 0 -+#define CONFIG_AVM2_MUXER 0 -+#define CONFIG_CAVSVIDEO_MUXER 0 -+#define CONFIG_CRC_MUXER 0 -+#define CONFIG_DAUD_MUXER 0 -+#define CONFIG_DIRAC_MUXER 0 -+#define CONFIG_DNXHD_MUXER 0 -+#define CONFIG_DTS_MUXER 0 -+#define CONFIG_DV_MUXER 0 -+#define CONFIG_EAC3_MUXER 0 -+#define CONFIG_FFM_MUXER 0 -+#define CONFIG_FILMSTRIP_MUXER 0 -+#define CONFIG_FLAC_MUXER 0 -+#define CONFIG_FLV_MUXER 0 -+#define CONFIG_FRAMECRC_MUXER 0 -+#define CONFIG_FRAMEMD5_MUXER 0 -+#define CONFIG_G722_MUXER 0 -+#define CONFIG_GIF_MUXER 0 -+#define CONFIG_GXF_MUXER 0 -+#define CONFIG_H261_MUXER 0 -+#define CONFIG_H263_MUXER 0 -+#define CONFIG_H264_MUXER 0 -+#define CONFIG_IMAGE2_MUXER 0 -+#define CONFIG_IMAGE2PIPE_MUXER 0 -+#define CONFIG_IPOD_MUXER 0 -+#define CONFIG_M4V_MUXER 0 -+#define CONFIG_MD5_MUXER 0 -+#define CONFIG_MATROSKA_MUXER 0 -+#define CONFIG_MATROSKA_AUDIO_MUXER 0 -+#define CONFIG_MJPEG_MUXER 0 -+#define CONFIG_MLP_MUXER 0 -+#define CONFIG_MMF_MUXER 0 -+#define CONFIG_MOV_MUXER 0 -+#define CONFIG_MP2_MUXER 0 -+#define CONFIG_MP3_MUXER 0 -+#define CONFIG_MP4_MUXER 0 -+#define CONFIG_MPEG1SYSTEM_MUXER 0 -+#define CONFIG_MPEG1VCD_MUXER 0 -+#define CONFIG_MPEG1VIDEO_MUXER 0 -+#define CONFIG_MPEG2DVD_MUXER 0 -+#define CONFIG_MPEG2SVCD_MUXER 0 -+#define CONFIG_MPEG2VIDEO_MUXER 0 -+#define CONFIG_MPEG2VOB_MUXER 0 -+#define CONFIG_MPEGTS_MUXER 0 -+#define CONFIG_MPJPEG_MUXER 0 -+#define CONFIG_MXF_MUXER 0 -+#define CONFIG_MXF_D10_MUXER 0 -+#define CONFIG_NULL_MUXER 0 -+#define CONFIG_NUT_MUXER 0 -+#define CONFIG_OGG_MUXER 0 -+#define CONFIG_PCM_ALAW_MUXER 0 -+#define CONFIG_PCM_MULAW_MUXER 0 -+#define CONFIG_PCM_F64BE_MUXER 0 -+#define CONFIG_PCM_F64LE_MUXER 0 -+#define CONFIG_PCM_F32BE_MUXER 0 -+#define CONFIG_PCM_F32LE_MUXER 0 -+#define CONFIG_PCM_S32BE_MUXER 0 -+#define CONFIG_PCM_S32LE_MUXER 0 -+#define CONFIG_PCM_S24BE_MUXER 0 -+#define CONFIG_PCM_S24LE_MUXER 0 -+#define CONFIG_PCM_S16BE_MUXER 0 -+#define CONFIG_PCM_S16LE_MUXER 0 -+#define CONFIG_PCM_S8_MUXER 0 -+#define CONFIG_PCM_U32BE_MUXER 0 -+#define CONFIG_PCM_U32LE_MUXER 0 -+#define CONFIG_PCM_U24BE_MUXER 0 -+#define CONFIG_PCM_U24LE_MUXER 0 -+#define CONFIG_PCM_U16BE_MUXER 0 -+#define CONFIG_PCM_U16LE_MUXER 0 -+#define CONFIG_PCM_U8_MUXER 0 -+#define CONFIG_PSP_MUXER 0 -+#define CONFIG_RAWVIDEO_MUXER 0 -+#define CONFIG_RM_MUXER 0 -+#define CONFIG_ROQ_MUXER 0 -+#define CONFIG_RSO_MUXER 0 -+#define CONFIG_RTP_MUXER 0 -+#define CONFIG_RTSP_MUXER 0 -+#define CONFIG_SAP_MUXER 0 -+#define CONFIG_SOX_MUXER 0 -+#define CONFIG_SPDIF_MUXER 0 -+#define CONFIG_SRT_MUXER 0 -+#define CONFIG_SWF_MUXER 0 -+#define CONFIG_TG2_MUXER 0 -+#define CONFIG_TGP_MUXER 0 -+#define CONFIG_TRUEHD_MUXER 0 -+#define CONFIG_VC1T_MUXER 0 -+#define CONFIG_VOC_MUXER 0 -+#define CONFIG_WAV_MUXER 0 -+#define CONFIG_WEBM_MUXER 0 -+#define CONFIG_WEBP_MUXER 0 -+#define CONFIG_YUV4MPEGPIPE_MUXER 0 -+#define CONFIG_LIBNUT_MUXER 0 -+#define CONFIG_ANULL_FILTER 0 -+#define CONFIG_ANULLSRC_FILTER 0 -+#define CONFIG_ANULLSINK_FILTER 0 -+#define CONFIG_ASPECT_FILTER 0 -+#define CONFIG_BLACKFRAME_FILTER 0 -+#define CONFIG_CROP_FILTER 0 -+#define CONFIG_CROPDETECT_FILTER 0 -+#define CONFIG_DRAWBOX_FILTER 0 -+#define CONFIG_FIFO_FILTER 0 -+#define CONFIG_FORMAT_FILTER 0 -+#define CONFIG_FREI0R_FILTER 0 -+#define CONFIG_HFLIP_FILTER 0 -+#define CONFIG_NOFORMAT_FILTER 0 -+#define CONFIG_NULL_FILTER 0 -+#define CONFIG_OCV_SMOOTH_FILTER 0 -+#define CONFIG_PAD_FILTER 0 -+#define CONFIG_PIXDESCTEST_FILTER 0 -+#define CONFIG_PIXELASPECT_FILTER 0 -+#define CONFIG_SCALE_FILTER 0 -+#define CONFIG_SETPTS_FILTER 0 -+#define CONFIG_SETTB_FILTER 0 -+#define CONFIG_SLICIFY_FILTER 0 -+#define CONFIG_TRANSPOSE_FILTER 0 -+#define CONFIG_UNSHARP_FILTER 0 -+#define CONFIG_VFLIP_FILTER 0 -+#define CONFIG_YADIF_FILTER 0 -+#define CONFIG_BUFFER_FILTER 0 -+#define CONFIG_COLOR_FILTER 0 -+#define CONFIG_NULLSRC_FILTER 0 -+#define CONFIG_NULLSINK_FILTER 0 -+#define CONFIG_CONCAT_PROTOCOL 0 -+#define CONFIG_FILE_PROTOCOL 0 -+#define CONFIG_GOPHER_PROTOCOL 0 -+#define CONFIG_HTTP_PROTOCOL 0 -+#define CONFIG_MMSH_PROTOCOL 0 -+#define CONFIG_MMST_PROTOCOL 0 -+#define CONFIG_MD5_PROTOCOL 0 -+#define CONFIG_PIPE_PROTOCOL 0 -+#define CONFIG_RTMP_PROTOCOL 0 -+#define CONFIG_RTMPT_PROTOCOL 0 -+#define CONFIG_RTMPE_PROTOCOL 0 -+#define CONFIG_RTMPTE_PROTOCOL 0 -+#define CONFIG_RTMPS_PROTOCOL 0 -+#define CONFIG_RTP_PROTOCOL 0 -+#define CONFIG_TCP_PROTOCOL 0 -+#define CONFIG_UDP_PROTOCOL 0 -+#define CONFIG_ALSA_INDEV 0 -+#define CONFIG_BKTR_INDEV 0 -+#define CONFIG_DV1394_INDEV 0 -+#define CONFIG_JACK_INDEV 0 -+#define CONFIG_OSS_INDEV 0 -+#define CONFIG_V4L2_INDEV 0 -+#define CONFIG_V4L_INDEV 0 -+#define CONFIG_VFWCAP_INDEV 0 -+#define CONFIG_X11_GRAB_DEVICE_INDEV 0 -+#define CONFIG_LIBDC1394_INDEV 0 -+#define CONFIG_ALSA_OUTDEV 0 -+#define CONFIG_OSS_OUTDEV 0 -+#endif /* FFMPEG_CONFIG_H */ diff --git a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp index a50516051397..d6d97025d241 100644 --- a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp +++ b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp @@ -1,22 +1,29 @@ ---- third_party/ffmpeg/ffmpeg.gyp.orig 2011-05-06 12:05:13.000000000 +0300 -+++ third_party/ffmpeg/ffmpeg.gyp 2011-06-05 17:22:39.293163655 +0300 -@@ -50,7 +50,7 @@ - }, { - 'ffmpeg_config%': '<(target_arch)', - }], -- ['OS=="mac" or OS=="win"', { -+ ['OS=="mac" or OS=="win" or OS=="freebsd"', { - 'os_config%': '<(OS)', - }, { # all other Unix OS's use the linux config - 'os_config%': 'linux', -@@ -767,6 +767,10 @@ +--- third_party/ffmpeg/ffmpeg.gyp.orig 2011-09-14 02:43:26.000000000 +0300 ++++ third_party/ffmpeg/ffmpeg.gyp 2011-09-14 03:03:08.000000000 +0300 +@@ -528,6 +528,9 @@ + 'libraries': [ + '-lvpx', + ], ++ 'ldflags': [ ++ '-L<(prefix_dir)/lib', ++ ], + }], + ], + }, +@@ -642,7 +645,7 @@ + }, { + # Using libvpx provided by the system. + 'include_dirs': [ +- '/usr/include/vpx', ++ '<(prefix_dir)/include', + ], + } + ], +@@ -941,6 +944,7 @@ 'include_dirs': [ 'config', - 'patched-ffmpeg-mt', -+ # gliaskos: The following include is needed for libvpx, -+ # should remain _after_ patched-ffmpeg-mt or else -+ # ffmpeg_stubs.cc picks up system headers. -+ '/usr/local/include', + 'patched-ffmpeg', ++ '<(prefix_dir)/include', ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/www/chromium/files/patch-third_party__ffmpeg__patched-ffmpeg-mt__libavutil_mem.c b/www/chromium/files/patch-third_party__ffmpeg__patched-ffmpeg-mt__libavutil_mem.c deleted file mode 100644 index f208f07cec86..000000000000 --- a/www/chromium/files/patch-third_party__ffmpeg__patched-ffmpeg-mt__libavutil_mem.c +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/ffmpeg/patched-ffmpeg-mt/libavutil/mem.c.orig 2011-03-25 14:43:09.000000000 +0200 -+++ third_party/ffmpeg/patched-ffmpeg-mt/libavutil/mem.c 2011-03-25 14:43:21.000000000 +0200 -@@ -30,7 +30,7 @@ - #include <stdlib.h> - #include <string.h> - #if HAVE_MALLOC_H --#include <malloc.h> -+#include <stdlib.h> - #endif - - #include "avutil.h" diff --git a/www/chromium/files/patch-third_party__ffmpeg__patched-ffmpeg__libavutil__mem.c b/www/chromium/files/patch-third_party__ffmpeg__patched-ffmpeg__libavutil__mem.c new file mode 100644 index 000000000000..71fa3a38bb9c --- /dev/null +++ b/www/chromium/files/patch-third_party__ffmpeg__patched-ffmpeg__libavutil__mem.c @@ -0,0 +1,11 @@ +--- third_party/ffmpeg/patched-ffmpeg/libavutil/mem.c.orig 2011-09-11 11:03:30.000000000 +0300 ++++ third_party/ffmpeg/patched-ffmpeg/libavutil/mem.c 2011-09-12 23:49:42.000000000 +0300 +@@ -31,7 +31,7 @@ + #include <limits.h> + #include <stdlib.h> + #include <string.h> +-#if HAVE_MALLOC_H ++#if HAVE_MALLOC_H && !defined(__FreeBSD__) + #include <malloc.h> + #endif + diff --git a/www/chromium/files/patch-third_party__icu__icu.gyp b/www/chromium/files/patch-third_party__icu__icu.gyp index 12ce04006392..959732e54bf6 100644 --- a/www/chromium/files/patch-third_party__icu__icu.gyp +++ b/www/chromium/files/patch-third_party__icu__icu.gyp @@ -1,6 +1,6 @@ ---- third_party/icu/icu.gyp.orig 2011-09-11 20:07:49.787935237 +0300 -+++ third_party/icu/icu.gyp 2011-09-11 20:09:30.972764759 +0300 -@@ -524,6 +524,9 @@ +--- third_party/icu/icu.gyp.orig 2011-09-09 23:54:57.000000000 +0300 ++++ third_party/icu/icu.gyp 2011-09-10 00:17:17.000000000 +0300 +@@ -517,6 +517,9 @@ 'defines': [ 'USE_SYSTEM_ICU', ], diff --git a/www/chromium/files/patch-third_party__icu__public__common__unicode__pfreebsd.h b/www/chromium/files/patch-third_party__icu__public__common__unicode__pfreebsd.h deleted file mode 100644 index 0a9bec6cd097..000000000000 --- a/www/chromium/files/patch-third_party__icu__public__common__unicode__pfreebsd.h +++ /dev/null @@ -1,316 +0,0 @@ ---- ./third_party/icu/public/common/unicode/pfreebsd.h.orig 2010-12-20 20:15:08.000000000 +0100 -+++ ./third_party/icu/public/common/unicode/pfreebsd.h 2010-12-20 20:15:08.000000000 +0100 -@@ -0,0 +1,313 @@ -+/* -+****************************************************************************** -+* -+* Copyright (C) 1997-2007, International Business Machines -+* Corporation and others. All Rights Reserved. -+* -+****************************************************************************** -+* -+* FILE NAME : platform.h -+* -+* Date Name Description -+* 05/13/98 nos Creation (content moved here from ptypes.h). -+* 03/02/99 stephen Added AS400 support. -+* 03/30/99 stephen Added Linux support. -+* 04/13/99 stephen Reworked for autoconf. -+****************************************************************************** -+*/ -+ -+/** -+ * \file -+ * \brief Basic types for the platform -+ */ -+ -+/* Define the platform we're on. */ -+#ifndef U_BSD -+#define U_BSD -+#endif -+ -+/* Define whether inttypes.h is available */ -+#ifndef U_HAVE_INTTYPES_H -+#define U_HAVE_INTTYPES_H 1 -+#endif -+ -+/* -+ * Define what support for C++ streams is available. -+ * If U_IOSTREAM_SOURCE is set to 199711, then <iostream> is available -+ * (1997711 is the date the ISO/IEC C++ FDIS was published), and then -+ * one should qualify streams using the std namespace in ICU header -+ * files. -+ * If U_IOSTREAM_SOURCE is set to 198506, then <iostream.h> is -+ * available instead (198506 is the date when Stroustrup published -+ * "An Extensible I/O Facility for C++" at the summer USENIX conference). -+ * If U_IOSTREAM_SOURCE is 0, then C++ streams are not available and -+ * support for them will be silently suppressed in ICU. -+ * -+ */ -+ -+#ifndef U_IOSTREAM_SOURCE -+#define U_IOSTREAM_SOURCE 199711 -+#endif -+ -+/* Determines whether specific types are available */ -+#ifndef U_HAVE_INT8_T -+#define U_HAVE_INT8_T 1 -+#endif -+ -+#ifndef U_HAVE_UINT8_T -+#define U_HAVE_UINT8_T 1 -+#endif -+ -+#ifndef U_HAVE_INT16_T -+#define U_HAVE_INT16_T 1 -+#endif -+ -+#ifndef U_HAVE_UINT16_T -+#define U_HAVE_UINT16_T 1 -+#endif -+ -+#ifndef U_HAVE_INT32_T -+#define U_HAVE_INT32_T 1 -+#endif -+ -+#ifndef U_HAVE_UINT32_T -+#define U_HAVE_UINT32_T 1 -+#endif -+ -+#ifndef U_HAVE_INT64_T -+#define U_HAVE_INT64_T 1 -+#endif -+ -+#ifndef U_HAVE_UINT64_T -+#define U_HAVE_UINT64_T 1 -+#endif -+ -+/*===========================================================================*/ -+/* Generic data types */ -+/*===========================================================================*/ -+ -+#include <sys/types.h> -+ -+/* If your platform does not have the <inttypes.h> header, you may -+ need to edit the typedefs below. */ -+#if U_HAVE_INTTYPES_H -+ -+/* autoconf 2.13 sometimes can't properly find the data types in <inttypes.h> */ -+/* os/390 needs <inttypes.h>, but it doesn't have int8_t, and it sometimes */ -+/* doesn't have uint8_t depending on the OS version. */ -+/* So we have this work around. */ -+#ifdef OS390 -+/* The features header is needed to get (u)int64_t sometimes. */ -+#include <features.h> -+#if ! U_HAVE_INT8_T -+typedef signed char int8_t; -+#endif -+#if !defined(__uint8_t) -+#define __uint8_t 1 -+typedef unsigned char uint8_t; -+#endif -+#endif /* OS390 */ -+ -+#include <inttypes.h> -+ -+#else /* U_HAVE_INTTYPES_H */ -+ -+#if ! U_HAVE_INT8_T -+typedef signed char int8_t; -+#endif -+ -+#if ! U_HAVE_UINT8_T -+typedef unsigned char uint8_t; -+#endif -+ -+#if ! U_HAVE_INT16_T -+typedef signed short int16_t; -+#endif -+ -+#if ! U_HAVE_UINT16_T -+typedef unsigned short uint16_t; -+#endif -+ -+#if ! U_HAVE_INT32_T -+typedef signed int int32_t; -+#endif -+ -+#if ! U_HAVE_UINT32_T -+typedef unsigned int uint32_t; -+#endif -+ -+#if ! U_HAVE_INT64_T -+ typedef signed long long int64_t; -+/* else we may not have a 64-bit type */ -+#endif -+ -+#if ! U_HAVE_UINT64_T -+ typedef unsigned long long uint64_t; -+/* else we may not have a 64-bit type */ -+#endif -+ -+#endif -+ -+/*===========================================================================*/ -+/* Compiler and environment features */ -+/*===========================================================================*/ -+ -+/* Define whether namespace is supported */ -+#ifndef U_HAVE_NAMESPACE -+#define U_HAVE_NAMESPACE 1 -+#endif -+ -+/* Determines the endianness of the platform -+ It's done this way in case multiple architectures are being built at once. -+ For example, Darwin supports fat binaries, which can be both PPC and x86 based. */ -+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) -+#define U_IS_BIG_ENDIAN (BYTE_ORDER == BIG_ENDIAN) -+#else -+#define U_IS_BIG_ENDIAN 0 -+#endif -+ -+/* 1 or 0 to enable or disable threads. If undefined, default is: enable threads. */ -+#define ICU_USE_THREADS 1 -+ -+/* On strong memory model CPUs (e.g. x86 CPUs), we use a safe & quick double check lock. */ -+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -+#define UMTX_STRONG_MEMORY_MODEL 1 -+#endif -+ -+#ifndef U_DEBUG -+#define U_DEBUG 0 -+#endif -+ -+#ifndef U_RELEASE -+#define U_RELEASE 1 -+#endif -+ -+/* Determine whether to disable renaming or not. This overrides the -+ setting in umachine.h which is for all platforms. */ -+#ifndef U_DISABLE_RENAMING -+#define U_DISABLE_RENAMING 0 -+#endif -+ -+/* Determine whether to override new and delete. */ -+#ifndef U_OVERRIDE_CXX_ALLOCATION -+#define U_OVERRIDE_CXX_ALLOCATION 1 -+#endif -+/* Determine whether to override placement new and delete for STL. */ -+#ifndef U_HAVE_PLACEMENT_NEW -+#define U_HAVE_PLACEMENT_NEW 1 -+#endif -+ -+/* Determine whether to enable tracing. */ -+#ifndef U_ENABLE_TRACING -+#define U_ENABLE_TRACING 0 -+#endif -+ -+/* Do we allow ICU users to use the draft APIs by default? */ -+#ifndef U_DEFAULT_SHOW_DRAFT -+#define U_DEFAULT_SHOW_DRAFT 1 -+#endif -+ -+/* Define the library suffix in a C syntax. */ -+#define U_HAVE_LIB_SUFFIX 0 -+#define U_LIB_SUFFIX_C_NAME -+#define U_LIB_SUFFIX_C_NAME_STRING "" -+ -+/*===========================================================================*/ -+/* Character data types */ -+/*===========================================================================*/ -+ -+#if ((defined(OS390) && (!defined(__CHARSET_LIB) || !__CHARSET_LIB))) || defined(OS400) -+# define U_CHARSET_FAMILY 1 -+#endif -+ -+/*===========================================================================*/ -+/* Information about wchar support */ -+/*===========================================================================*/ -+ -+#define U_HAVE_WCHAR_H 1 -+#define U_SIZEOF_WCHAR_T 4 -+ -+#define U_HAVE_WCSCPY 1 -+ -+/** -+ * \def U_DECLARE_UTF16 -+ * Do not use this macro. Use the UNICODE_STRING or U_STRING_DECL macros -+ * instead. -+ * @internal -+ */ -+#if 1 || defined(U_CHECK_UTF16_STRING) -+#if (defined(__xlC__) && defined(__IBM_UTF_LITERAL) && U_SIZEOF_WCHAR_T != 2) \ -+ || (defined(__HP_aCC) && __HP_aCC >= 035000) \ -+ || (defined(__HP_cc) && __HP_cc >= 111106) -+#define U_DECLARE_UTF16(string) u ## string -+#elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) -+/* || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x580) */ -+/* Sun's C compiler has issues with this notation, and it's unreliable. */ -+#define U_DECLARE_UTF16(string) U ## string -+#elif U_SIZEOF_WCHAR_T == 2 \ -+ && (U_CHARSET_FAMILY == 0 || ((defined(OS390) || defined(OS400)) && defined(__UCS2__))) -+#define U_DECLARE_UTF16(string) L ## string -+#endif -+#endif -+ -+/*===========================================================================*/ -+/* Information about POSIX support */ -+/*===========================================================================*/ -+ -+#define U_HAVE_NL_LANGINFO_CODESET 1 -+#define U_NL_LANGINFO_CODESET CODESET -+ -+#if 1 -+#define U_TZSET tzset -+#endif -+#if 0 -+#define U_TIMEZONE -+#endif -+#if 1 -+#define U_TZNAME tzname -+#endif -+ -+#define U_HAVE_MMAP 1 -+#define U_HAVE_POPEN 1 -+ -+/*===========================================================================*/ -+/* Symbol import-export control */ -+/*===========================================================================*/ -+ -+#if 1 -+#define U_EXPORT __attribute__((visibility("default"))) -+/*#elif defined(__HP_aCC) || defined(__HP_cc) -+#define U_EXPORT __declspec(dllexport)*/ -+#else -+#define U_EXPORT -+#endif -+ -+/* U_CALLCONV is releated to U_EXPORT2 */ -+#define U_EXPORT2 -+ -+/* cygwin needs to export/import data */ -+#ifdef U_CYGWIN -+#define U_IMPORT __declspec(dllimport) -+#else -+#define U_IMPORT -+#endif -+ -+/*===========================================================================*/ -+/* Code alignment and C function inlining */ -+/*===========================================================================*/ -+ -+#ifndef U_INLINE -+# ifdef __cplusplus -+# define U_INLINE inline -+# else -+# define U_INLINE inline -+# endif -+#endif -+ -+#define U_ALIGN_CODE(n) -+ -+/*===========================================================================*/ -+/* Programs used by ICU code */ -+/*===========================================================================*/ -+ -+#define U_MAKE "/usr/local/bin/gmake" diff --git a/www/chromium/files/patch-third_party__libevent__freebsd__config.h b/www/chromium/files/patch-third_party__libevent__freebsd__config.h deleted file mode 100644 index 0afcd1cf5e94..000000000000 --- a/www/chromium/files/patch-third_party__libevent__freebsd__config.h +++ /dev/null @@ -1,269 +0,0 @@ ---- ./third_party/libevent/freebsd/config.h.orig 2010-12-20 20:15:08.000000000 +0100 -+++ ./third_party/libevent/freebsd/config.h 2010-12-20 20:15:08.000000000 +0100 -@@ -0,0 +1,266 @@ -+/* config.h. Generated from config.h.in by configure. */ -+/* config.h.in. Generated from configure.in by autoheader. */ -+ -+/* Define if clock_gettime is available in libc */ -+#define DNS_USE_CPU_CLOCK_FOR_ID 1 -+ -+/* Define is no secure id variant is available */ -+/* #undef DNS_USE_GETTIMEOFDAY_FOR_ID */ -+ -+/* Define to 1 if you have the `clock_gettime' function. */ -+#define HAVE_CLOCK_GETTIME 1 -+ -+/* Define if /dev/poll is available */ -+/* #undef HAVE_DEVPOLL */ -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#define HAVE_DLFCN_H 1 -+ -+/* Define if your system supports the epoll system calls */ -+/* #undef HAVE_EPOLL */ -+ -+/* Define to 1 if you have the `epoll_ctl' function. */ -+/* #undef HAVE_EPOLL_CTL */ -+ -+/* Define if your system supports event ports */ -+/* #undef HAVE_EVENT_PORTS */ -+ -+/* Define to 1 if you have the `fcntl' function. */ -+#define HAVE_FCNTL 1 -+ -+/* Define to 1 if you have the <fcntl.h> header file. */ -+#define HAVE_FCNTL_H 1 -+ -+/* Define to 1 if the system has the type `fd_mask'. */ -+#define HAVE_FD_MASK 1 -+ -+/* Define to 1 if you have the `getaddrinfo' function. */ -+#define HAVE_GETADDRINFO 1 -+ -+/* Define to 1 if you have the `getegid' function. */ -+#define HAVE_GETEGID 1 -+ -+/* Define to 1 if you have the `geteuid' function. */ -+#define HAVE_GETEUID 1 -+ -+/* Define to 1 if you have the `getnameinfo' function. */ -+#define HAVE_GETNAMEINFO 1 -+ -+/* Define to 1 if you have the `gettimeofday' function. */ -+#define HAVE_GETTIMEOFDAY 1 -+ -+/* Define to 1 if you have the `inet_ntop' function. */ -+#define HAVE_INET_NTOP 1 -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#define HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if you have the `issetugid' function. */ -+#define HAVE_ISSETUGID 1 -+ -+/* Define to 1 if you have the `kqueue' function. */ -+#define HAVE_KQUEUE 1 -+ -+/* Define to 1 if you have the `nsl' library (-lnsl). */ -+/* #undef HAVE_LIBNSL */ -+ -+/* Define to 1 if you have the `resolv' library (-lresolv). */ -+/* #undef HAVE_LIBRESOLV */ -+ -+/* Define to 1 if you have the `rt' library (-lrt). */ -+#define HAVE_LIBRT 1 -+ -+/* Define to 1 if you have the `socket' library (-lsocket). */ -+/* #undef HAVE_LIBSOCKET */ -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the <netinet/in6.h> header file. */ -+/* #undef HAVE_NETINET_IN6_H */ -+ -+/* Define to 1 if you have the `poll' function. */ -+#define HAVE_POLL 1 -+ -+/* Define to 1 if you have the <poll.h> header file. */ -+#define HAVE_POLL_H 1 -+ -+/* Define to 1 if you have the `port_create' function. */ -+/* #undef HAVE_PORT_CREATE */ -+ -+/* Define to 1 if you have the <port.h> header file. */ -+/* #undef HAVE_PORT_H */ -+ -+/* Define to 1 if you have the `select' function. */ -+#define HAVE_SELECT 1 -+ -+/* Define if F_SETFD is defined in <fcntl.h> */ -+#define HAVE_SETFD 1 -+ -+/* Define to 1 if you have the `sigaction' function. */ -+#define HAVE_SIGACTION 1 -+ -+/* Define to 1 if you have the `signal' function. */ -+#define HAVE_SIGNAL 1 -+ -+/* Define to 1 if you have the <signal.h> header file. */ -+#define HAVE_SIGNAL_H 1 -+ -+/* Define to 1 if you have the <stdarg.h> header file. */ -+#define HAVE_STDARG_H 1 -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#define HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the `strlcpy' function. */ -+#define HAVE_STRLCPY 1 -+ -+/* Define to 1 if you have the `strsep' function. */ -+#define HAVE_STRSEP 1 -+ -+/* Define to 1 if you have the `strtok_r' function. */ -+#define HAVE_STRTOK_R 1 -+ -+/* Define to 1 if you have the `strtoll' function. */ -+#define HAVE_STRTOLL 1 -+ -+/* Define to 1 if the system has the type `struct in6_addr'. */ -+#define HAVE_STRUCT_IN6_ADDR 1 -+ -+/* Define to 1 if you have the <sys/devpoll.h> header file. */ -+/* #undef HAVE_SYS_DEVPOLL_H */ -+ -+/* Define to 1 if you have the <sys/epoll.h> header file. */ -+/* #undef HAVE_SYS_EPOLL_H */ -+ -+/* Define to 1 if you have the <sys/event.h> header file. */ -+#define HAVE_SYS_EVENT_H 1 -+ -+/* Define to 1 if you have the <sys/ioctl.h> header file. */ -+#define HAVE_SYS_IOCTL_H 1 -+ -+/* Define to 1 if you have the <sys/param.h> header file. */ -+#define HAVE_SYS_PARAM_H 1 -+ -+/* Define to 1 if you have the <sys/queue.h> header file. */ -+#define HAVE_SYS_QUEUE_H 1 -+ -+/* Define to 1 if you have the <sys/select.h> header file. */ -+#define HAVE_SYS_SELECT_H 1 -+ -+/* Define to 1 if you have the <sys/socket.h> header file. */ -+#define HAVE_SYS_SOCKET_H 1 -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the <sys/time.h> header file. */ -+#define HAVE_SYS_TIME_H 1 -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */ -+#define HAVE_TAILQFOREACH 1 -+ -+/* Define if timeradd is defined in <sys/time.h> */ -+#define HAVE_TIMERADD 1 -+ -+/* Define if timerclear is defined in <sys/time.h> */ -+#define HAVE_TIMERCLEAR 1 -+ -+/* Define if timercmp is defined in <sys/time.h> */ -+#define HAVE_TIMERCMP 1 -+ -+/* Define if timerisset is defined in <sys/time.h> */ -+#define HAVE_TIMERISSET 1 -+ -+/* Define to 1 if the system has the type `uint16_t'. */ -+#define HAVE_UINT16_T 1 -+ -+/* Define to 1 if the system has the type `uint32_t'. */ -+#define HAVE_UINT32_T 1 -+ -+/* Define to 1 if the system has the type `uint64_t'. */ -+#define HAVE_UINT64_T 1 -+ -+/* Define to 1 if the system has the type `uint8_t'. */ -+#define HAVE_UINT8_T 1 -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define to 1 if you have the `vasprintf' function. */ -+#define HAVE_VASPRINTF 1 -+ -+/* Define if kqueue works correctly with pipes */ -+#define HAVE_WORKING_KQUEUE 1 -+ -+/* Name of package */ -+#define PACKAGE "libevent" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "" -+ -+/* The size of `int', as computed by sizeof. */ -+#define SIZEOF_INT 4 -+ -+/* The size of `long', as computed by sizeof. */ -+#define SIZEOF_LONG 4 -+ -+/* The size of `long long', as computed by sizeof. */ -+#define SIZEOF_LONG_LONG 8 -+ -+/* The size of `short', as computed by sizeof. */ -+#define SIZEOF_SHORT 2 -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ -+#define TIME_WITH_SYS_TIME 1 -+ -+/* Version number of package */ -+#define VERSION "1.4.13-stable" -+ -+/* Define to appropriate substitue if compiler doesnt have __func__ */ -+/* #undef __func__ */ -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef const */ -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef __cplusplus -+/* #undef inline */ -+#endif -+ -+/* Define to `int' if <sys/types.h> does not define. */ -+/* #undef pid_t */ -+ -+/* Define to `unsigned int' if <sys/types.h> does not define. */ -+/* #undef size_t */ -+ -+/* Define to unsigned int if you dont have it */ -+/* #undef socklen_t */ diff --git a/www/chromium/files/patch-third_party__libevent__freebsd__event-config.h b/www/chromium/files/patch-third_party__libevent__freebsd__event-config.h deleted file mode 100644 index 7f841aa04463..000000000000 --- a/www/chromium/files/patch-third_party__libevent__freebsd__event-config.h +++ /dev/null @@ -1,265 +0,0 @@ ---- ./third_party/libevent/freebsd/event-config.h.orig 2010-12-20 20:15:08.000000000 +0100 -+++ ./third_party/libevent/freebsd/event-config.h 2010-12-20 20:15:08.000000000 +0100 -@@ -0,0 +1,262 @@ -+/* event-config.h -+ * Generated by autoconf; post-processed by libevent. -+ * Do not edit this file. -+ * Do not rely on macros in this file existing in later versions. -+ */ -+#ifndef _EVENT_CONFIG_H_ -+#define _EVENT_CONFIG_H_ -+/* config.h. Generated from config.h.in by configure. */ -+/* config.h.in. Generated from configure.in by autoheader. */ -+ -+/* Define if clock_gettime is available in libc */ -+#define _EVENT_DNS_USE_CPU_CLOCK_FOR_ID 1 -+ -+/* Define is no secure id variant is available */ -+/* #undef _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID */ -+ -+/* Define to 1 if you have the `clock_gettime' function. */ -+#define _EVENT_HAVE_CLOCK_GETTIME 1 -+ -+/* Define if /dev/poll is available */ -+/* #undef _EVENT_HAVE_DEVPOLL */ -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#define _EVENT_HAVE_DLFCN_H 1 -+ -+/* Define if your system supports the epoll system calls */ -+/* #undef _EVENT_HAVE_EPOLL */ -+ -+/* Define to 1 if you have the `epoll_ctl' function. */ -+/* #undef _EVENT_HAVE_EPOLL_CTL */ -+ -+/* Define if your system supports event ports */ -+/* #undef _EVENT_HAVE_EVENT_PORTS */ -+ -+/* Define to 1 if you have the `fcntl' function. */ -+#define _EVENT_HAVE_FCNTL 1 -+ -+/* Define to 1 if you have the <fcntl.h> header file. */ -+#define _EVENT_HAVE_FCNTL_H 1 -+ -+/* Define to 1 if you have the `getaddrinfo' function. */ -+#define _EVENT_HAVE_GETADDRINFO 1 -+ -+/* Define to 1 if you have the `getnameinfo' function. */ -+#define _EVENT_HAVE_GETNAMEINFO 1 -+ -+/* Define to 1 if you have the `gettimeofday' function. */ -+#define _EVENT_HAVE_GETTIMEOFDAY 1 -+ -+/* Define to 1 if you have the `inet_ntop' function. */ -+#define _EVENT_HAVE_INET_NTOP 1 -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#define _EVENT_HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if you have the `kqueue' function. */ -+#define _EVENT_HAVE_KQUEUE 1 -+ -+/* Define to 1 if you have the `nsl' library (-lnsl). */ -+/* #undef _EVENT_HAVE_LIBNSL */ -+ -+/* Define to 1 if you have the `resolv' library (-lresolv). */ -+/* #undef _EVENT_HAVE_LIBRESOLV */ -+ -+/* Define to 1 if you have the `rt' library (-lrt). */ -+#define _EVENT_HAVE_LIBRT 1 -+ -+/* Define to 1 if you have the `socket' library (-lsocket). */ -+/* #undef _EVENT_HAVE_LIBSOCKET */ -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#define _EVENT_HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the <netinet/in6.h> header file. */ -+/* #undef _EVENT_HAVE_NETINET_IN6_H */ -+ -+/* Define to 1 if you have the `poll' function. */ -+#define _EVENT_HAVE_POLL 1 -+ -+/* Define to 1 if you have the <poll.h> header file. */ -+#define _EVENT_HAVE_POLL_H 1 -+ -+/* Define to 1 if you have the `port_create' function. */ -+/* #undef _EVENT_HAVE_PORT_CREATE */ -+ -+/* Define to 1 if you have the <port.h> header file. */ -+/* #undef _EVENT_HAVE_PORT_H */ -+ -+/* Define to 1 if you have the `select' function. */ -+#define _EVENT_HAVE_SELECT 1 -+ -+/* Define if F_SETFD is defined in <fcntl.h> */ -+#define _EVENT_HAVE_SETFD 1 -+ -+/* Define to 1 if you have the `sigaction' function. */ -+#define _EVENT_HAVE_SIGACTION 1 -+ -+/* Define to 1 if you have the `signal' function. */ -+#define _EVENT_HAVE_SIGNAL 1 -+ -+/* Define to 1 if you have the <signal.h> header file. */ -+#define _EVENT_HAVE_SIGNAL_H 1 -+ -+/* Define to 1 if you have the <stdarg.h> header file. */ -+#define _EVENT_HAVE_STDARG_H 1 -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#define _EVENT_HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#define _EVENT_HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#define _EVENT_HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#define _EVENT_HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the `strlcpy' function. */ -+#define _EVENT_HAVE_STRLCPY 1 -+ -+/* Define to 1 if you have the `strsep' function. */ -+#define _EVENT_HAVE_STRSEP 1 -+ -+/* Define to 1 if you have the `strtok_r' function. */ -+#define _EVENT_HAVE_STRTOK_R 1 -+ -+/* Define to 1 if you have the `strtoll' function. */ -+#define _EVENT_HAVE_STRTOLL 1 -+ -+/* Define to 1 if the system has the type `struct in6_addr'. */ -+#define _EVENT_HAVE_STRUCT_IN6_ADDR 1 -+ -+/* Define to 1 if you have the <sys/devpoll.h> header file. */ -+/* #undef _EVENT_HAVE_SYS_DEVPOLL_H */ -+ -+/* Define to 1 if you have the <sys/epoll.h> header file. */ -+/* #undef _EVENT_HAVE_SYS_EPOLL_H */ -+ -+/* Define to 1 if you have the <sys/event.h> header file. */ -+#define _EVENT_HAVE_SYS_EVENT_H 1 -+ -+/* Define to 1 if you have the <sys/ioctl.h> header file. */ -+#define _EVENT_HAVE_SYS_IOCTL_H 1 -+ -+/* Define to 1 if you have the <sys/param.h> header file. */ -+#define _EVENT_HAVE_SYS_PARAM_H 1 -+ -+/* Define to 1 if you have the <sys/queue.h> header file. */ -+#define _EVENT_HAVE_SYS_QUEUE_H 1 -+ -+/* Define to 1 if you have the <sys/select.h> header file. */ -+#define _EVENT_HAVE_SYS_SELECT_H 1 -+ -+/* Define to 1 if you have the <sys/socket.h> header file. */ -+#define _EVENT_HAVE_SYS_SOCKET_H 1 -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#define _EVENT_HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the <sys/time.h> header file. */ -+#define _EVENT_HAVE_SYS_TIME_H 1 -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#define _EVENT_HAVE_SYS_TYPES_H 1 -+ -+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */ -+#define _EVENT_HAVE_TAILQFOREACH 1 -+ -+/* Define if timeradd is defined in <sys/time.h> */ -+#define _EVENT_HAVE_TIMERADD 1 -+ -+/* Define if timerclear is defined in <sys/time.h> */ -+#define _EVENT_HAVE_TIMERCLEAR 1 -+ -+/* Define if timercmp is defined in <sys/time.h> */ -+#define _EVENT_HAVE_TIMERCMP 1 -+ -+/* Define if timerisset is defined in <sys/time.h> */ -+#define _EVENT_HAVE_TIMERISSET 1 -+ -+/* Define to 1 if the system has the type `uint16_t'. */ -+#define _EVENT_HAVE_UINT16_T 1 -+ -+/* Define to 1 if the system has the type `uint32_t'. */ -+#define _EVENT_HAVE_UINT32_T 1 -+ -+/* Define to 1 if the system has the type `uint64_t'. */ -+#define _EVENT_HAVE_UINT64_T 1 -+ -+/* Define to 1 if the system has the type `uint8_t'. */ -+#define _EVENT_HAVE_UINT8_T 1 -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#define _EVENT_HAVE_UNISTD_H 1 -+ -+/* Define to 1 if you have the `vasprintf' function. */ -+#define _EVENT_HAVE_VASPRINTF 1 -+ -+/* Define if kqueue works correctly with pipes */ -+#define _EVENT_HAVE_WORKING_KQUEUE 1 -+ -+/* Name of package */ -+#define _EVENT_PACKAGE "libevent" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define _EVENT_PACKAGE_BUGREPORT "" -+ -+/* Define to the full name of this package. */ -+#define _EVENT_PACKAGE_NAME "" -+ -+/* Define to the full name and version of this package. */ -+#define _EVENT_PACKAGE_STRING "" -+ -+/* Define to the one symbol short name of this package. */ -+#define _EVENT_PACKAGE_TARNAME "" -+ -+/* Define to the version of this package. */ -+#define _EVENT_PACKAGE_VERSION "" -+ -+/* The size of `int', as computed by sizeof. */ -+#define _EVENT_SIZEOF_INT 4 -+ -+/* The size of `long', as computed by sizeof. */ -+#define _EVENT_SIZEOF_LONG 8 -+ -+/* The size of `long long', as computed by sizeof. */ -+#define _EVENT_SIZEOF_LONG_LONG 8 -+ -+/* The size of `short', as computed by sizeof. */ -+#define _EVENT_SIZEOF_SHORT 2 -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define _EVENT_STDC_HEADERS 1 -+ -+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ -+#define _EVENT_TIME_WITH_SYS_TIME 1 -+ -+/* Version number of package */ -+#define _EVENT_VERSION "1.4.13-stable" -+ -+/* Define to appropriate substitue if compiler doesnt have __func__ */ -+/* #undef _EVENT___func__ */ -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef _EVENT_const */ -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef _EVENT___cplusplus -+/* #undef _EVENT_inline */ -+#endif -+ -+/* Define to `int' if <sys/types.h> does not define. */ -+/* #undef _EVENT_pid_t */ -+ -+/* Define to `unsigned int' if <sys/types.h> does not define. */ -+/* #undef _EVENT_size_t */ -+ -+/* Define to unsigned int if you dont have it */ -+/* #undef _EVENT_socklen_t */ -+#endif diff --git a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp new file mode 100644 index 000000000000..7fdada3132a9 --- /dev/null +++ b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp @@ -0,0 +1,12 @@ +--- third_party/libjpeg_turbo/libjpeg.gyp.orig 2011-09-10 20:12:17.000000000 +0300 ++++ third_party/libjpeg_turbo/libjpeg.gyp 2011-09-10 20:11:50.000000000 +0300 +@@ -255,6 +255,9 @@ + 'defines': [ + 'USE_SYSTEM_LIBJPEG', + ], ++ 'include_dirs': [ ++ '<(prefix_dir)/include', ++ ], + }, + 'link_settings': { + 'libraries': [ diff --git a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp b/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp deleted file mode 100644 index 791458bc9730..000000000000 --- a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp +++ /dev/null @@ -1,24 +0,0 @@ ---- third_party/libphonenumber/libphonenumber.gyp.orig 2011-09-11 22:49:01.224163225 +0300 -+++ third_party/libphonenumber/libphonenumber.gyp 2011-09-11 22:50:12.446499446 +0300 -@@ -14,8 +14,6 @@ - 'cpp/src', - '<(protoc_out_dir)', - '../protobuf/src', -- '../icu/public/common', -- '../icu/public/i18n', - ], - 'defines': [ - 'U_USING_ICU_NAMESPACE=0', -@@ -26,6 +24,12 @@ - 'U_STATIC_IMPLEMENTATION', - ], - }], -+ ['use_system_icu == 0', { -+ 'include_dirs': [ -+ '../icu/public/common', -+ '../icu/public/i18n', -+ ], -+ }], - ], - }, - 'targets': [{ diff --git a/www/chromium/files/patch-third_party__libvpx__libvpx.gyp b/www/chromium/files/patch-third_party__libvpx__libvpx.gyp index 7321bcde470e..09e4285b8bbc 100644 --- a/www/chromium/files/patch-third_party__libvpx__libvpx.gyp +++ b/www/chromium/files/patch-third_party__libvpx__libvpx.gyp @@ -1,6 +1,42 @@ ---- ./third_party/libvpx/libvpx.gyp.orig 2010-12-16 02:34:53.000000000 +0100 -+++ ./third_party/libvpx/libvpx.gyp 2010-12-20 20:15:08.000000000 +0100 -@@ -35,6 +35,11 @@ +--- third_party/libvpx/libvpx.gyp.orig 2011-08-30 12:19:17.000000000 +0300 ++++ third_party/libvpx/libvpx.gyp 2011-09-08 02:22:17.000000000 +0300 +@@ -4,7 +4,7 @@ + { + 'variables': { + 'conditions': [ +- ['OS=="mac" or OS=="linux"', { ++ ['OS=="mac" or OS=="linux" or OS=="freebsd"', { + 'asm_obj_extension': 'o', + }], + ['OS=="win"', { +@@ -13,7 +13,7 @@ + ], + }, + 'conditions': [ +- [ '(OS=="linux" or OS=="mac" or OS=="win") and target_arch!="arm" and target_arch!="arm-neon"', { ++ [ '(OS=="linux" or OS=="freebsd" or OS=="mac" or OS=="win") and target_arch!="arm" and target_arch!="arm-neon"', { + 'targets': [ + { + # This libvpx target contains both encoder and decoder. +@@ -25,7 +25,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx', + 'yasm_path': '<(PRODUCT_DIR)/yasm', + 'conditions': [ +- [ 'OS=="linux" and target_arch=="ia32"', { ++ [ '(OS=="linux" or OS=="freebsd") and target_arch=="ia32"', { + 'yasm_flags': [ + '-felf32', + '-m', 'x86', +@@ -33,7 +33,7 @@ + '-I', 'source/libvpx', + ], + }], +- [ 'OS=="linux" and target_arch=="x64"', { ++ [ '(OS=="linux" or OS=="freebsd") and target_arch=="x64"', { + 'yasm_flags': [ + '-felf64', + '-m', 'amd64', +@@ -265,6 +265,11 @@ 'libvpx_path': 'lib/linux/arm', }, }], diff --git a/www/chromium/files/patch-third_party__tcmalloc__chromium__src__config_freebsd.h b/www/chromium/files/patch-third_party__tcmalloc__chromium__src__config_freebsd.h deleted file mode 100644 index 76ee37af39d6..000000000000 --- a/www/chromium/files/patch-third_party__tcmalloc__chromium__src__config_freebsd.h +++ /dev/null @@ -1,237 +0,0 @@ ---- ./third_party/tcmalloc/chromium/src/config_freebsd.h.orig 2010-12-20 20:15:08.000000000 +0100 -+++ ./third_party/tcmalloc/chromium/src/config_freebsd.h 2010-12-20 20:15:08.000000000 +0100 -@@ -0,0 +1,234 @@ -+/* src/config.h. Generated from config.h.in by configure. */ -+/* src/config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* Define to 1 if compiler supports __builtin_stack_pointer */ -+/* #undef HAVE_BUILTIN_STACK_POINTER */ -+ -+/* Define to 1 if you have the <conflict-signal.h> header file. */ -+/* #undef HAVE_CONFLICT_SIGNAL_H */ -+ -+/* Define to 1 if you have the declaration of `cfree', and to 0 if you don't. -+ */ -+#define HAVE_DECL_CFREE 0 -+ -+/* Define to 1 if you have the declaration of `memalign', and to 0 if you -+ don't. */ -+#define HAVE_DECL_MEMALIGN 0 -+ -+/* Define to 1 if you have the declaration of `posix_memalign', and to 0 if -+ you don't. */ -+#define HAVE_DECL_POSIX_MEMALIGN 0 -+ -+/* Define to 1 if you have the declaration of `pvalloc', and to 0 if you -+ don't. */ -+#define HAVE_DECL_PVALLOC 0 -+ -+/* Define to 1 if you have the declaration of `uname', and to 0 if you don't. -+ */ -+#define HAVE_DECL_UNAME 1 -+ -+/* Define to 1 if you have the declaration of `valloc', and to 0 if you don't. -+ */ -+#define HAVE_DECL_VALLOC 0 -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#define HAVE_DLFCN_H 1 -+ -+/* Define to 1 if the system has the type `Elf32_Versym'. */ -+#define HAVE_ELF32_VERSYM 1 -+ -+/* Define to 1 if you have the <execinfo.h> header file. */ -+#define HAVE_EXECINFO_H 1 -+ -+/* Define to 1 if you have the <fcntl.h> header file. */ -+#define HAVE_FCNTL_H 1 -+ -+/* Define to 1 if you have the <features.h> header file. */ -+/* #undef HAVE_FEATURES_H */ -+ -+/* Define to 1 if you have the `geteuid' function. */ -+#define HAVE_GETEUID 1 -+ -+/* Define to 1 if you have the `getpagesize' function. */ -+#define HAVE_GETPAGESIZE 1 -+ -+/* Define to 1 if you have the <glob.h> header file. */ -+#define HAVE_GLOB_H 1 -+ -+/* Define to 1 if you have the <grp.h> header file. */ -+#define HAVE_GRP_H 1 -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#define HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if you have the <libunwind.h> header file. */ -+/* #undef HAVE_LIBUNWIND_H */ -+ -+/* Define to 1 if you have the <linux/ptrace.h> header file. */ -+/* #undef HAVE_LINUX_PTRACE_H */ -+ -+/* Define to 1 if you have the <malloc.h> header file. */ -+/* #undef HAVE_MALLOC_H */ -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have a working `mmap' system call. */ -+#define HAVE_MMAP 1 -+ -+/* define if the compiler implements namespaces */ -+#define HAVE_NAMESPACES 1 -+ -+/* Define to 1 if you have the <poll.h> header file. */ -+#define HAVE_POLL_H 1 -+ -+/* define if libc has program_invocation_name */ -+/* #undef HAVE_PROGRAM_INVOCATION_NAME */ -+ -+/* Define if you have POSIX threads libraries and header files. */ -+#define HAVE_PTHREAD 1 -+ -+/* Define to 1 if you have the <pwd.h> header file. */ -+#define HAVE_PWD_H 1 -+ -+/* Define to 1 if you have the `sbrk' function. */ -+#define HAVE_SBRK 1 -+ -+/* Define to 1 if you have the <sched.h> header file. */ -+#define HAVE_SCHED_H 1 -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#define HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if the system has the type `struct mallinfo'. */ -+/* #undef HAVE_STRUCT_MALLINFO */ -+ -+/* Define to 1 if you have the <sys/prctl.h> header file. */ -+/* #undef HAVE_SYS_PRCTL_H */ -+ -+/* Define to 1 if you have the <sys/resource.h> header file. */ -+#define HAVE_SYS_RESOURCE_H 1 -+ -+/* Define to 1 if you have the <sys/socket.h> header file. */ -+#define HAVE_SYS_SOCKET_H 1 -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the <sys/syscall.h> header file. */ -+#define HAVE_SYS_SYSCALL_H 1 -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the <sys/wait.h> header file. */ -+#define HAVE_SYS_WAIT_H 1 -+ -+/* Define to 1 if compiler supports __thread */ -+#define HAVE_TLS 1 -+ -+/* Define to 1 if you have the <ucontext.h> header file. */ -+#define HAVE_UCONTEXT_H 1 -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define to 1 if you have the <unwind.h> header file. */ -+/* #undef HAVE_UNWIND_H */ -+ -+/* define if your compiler has __attribute__ */ -+#define HAVE___ATTRIBUTE__ 1 -+ -+/* Define to 1 if the system has the type `__int64'. */ -+/* #undef HAVE___INT64 */ -+ -+/* prefix where we look for installed files */ -+#define INSTALL_PREFIX "/usr/local" -+ -+/* Define to 1 if int32_t is equivalent to intptr_t */ -+/* #undef INT32_EQUALS_INTPTR */ -+#if defined(__i386__) -+#define INT32_EQUALS_INTPTR 1 -+#endif -+ -+/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -+/* #undef NO_MINUS_C_MINUS_O */ -+ -+/* Name of package */ -+#define PACKAGE "google-perftools" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "opensource@google.com" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "google-perftools" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "google-perftools 1.3" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "google-perftools" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "1.3" -+ -+/* How to access the PC from a struct ucontext */ -+#if defined(__i386__) -+#define PC_FROM_UCONTEXT uc_mcontext.mc_eip -+#else -+#define PC_FROM_UCONTEXT uc_mcontext.mc_rip -+#endif -+ -+/* Always the empty-string on non-windows systems. On windows, should be -+ "__declspec(dllexport)". This way, when we compile the dll, we export our -+ functions/classes. It's safe to define this here because config.h is only -+ used internally, to compile the DLL, and every DLL source file #includes -+ "config.h" before anything else. */ -+#define PERFTOOLS_DLL_DECL -+ -+/* printf format code for printing a size_t and ssize_t */ -+#define PRIdS "zd" -+ -+/* printf format code for printing a size_t and ssize_t */ -+#define PRIuS "zu" -+ -+/* printf format code for printing a size_t and ssize_t */ -+#define PRIxS "zx" -+ -+/* Define to necessary symbol if this constant uses a non-standard name on -+ your system. */ -+/* #undef PTHREAD_CREATE_JOINABLE */ -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* the namespace where STL code like vector<> is defined */ -+#define STL_NAMESPACE std -+ -+/* Version number of package */ -+#define VERSION "1.3" -+ -+/* C99 says: define this to get the PRI... macros from stdint.h */ -+#ifndef __STDC_FORMAT_MACROS -+# define __STDC_FORMAT_MACROS 1 -+#endif -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef __cplusplus -+/* #undef inline */ -+#endif -+ -+ -+#ifdef __MINGW32__ -+#include "windows/mingw.h" -+#endif diff --git a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py index cf2eabea2967..cb984ad61ca0 100644 --- a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py +++ b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py @@ -1,15 +1,6 @@ ---- tools/gyp/pylib/gyp/generator/make.py.orig 2011-04-26 11:14:32.000000000 +0300 -+++ tools/gyp/pylib/gyp/generator/make.py 2011-05-04 21:12:47.761273429 +0300 -@@ -114,7 +114,7 @@ - # export LINK="$(CXX)" - # - # This will allow make to invoke N linker processes as specified in -jN. --LINK ?= flock $(builddir)/linker.lock $(CXX) %(LINK_flags)s -+LINK ?= $(CXX) %(LINK_flags)s - - CC.target ?= $(CC) - CFLAGS.target ?= $(CFLAGS) -@@ -129,13 +129,13 @@ +--- tools/gyp/pylib/gyp/generator/make.py.orig 2011-07-28 11:18:03.000000000 +0300 ++++ tools/gyp/pylib/gyp/generator/make.py 2011-09-07 01:20:36.000000000 +0300 +@@ -239,13 +239,13 @@ # 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. @@ -29,8 +20,8 @@ +AR.host ?= $(AR) ARFLAGS.host := %(ARFLAGS.host)s - # Flags to make gcc output dependency info. Note that you need to be -@@ -249,7 +249,7 @@ + # Define a dir function that can handle spaces. +@@ -365,7 +365,7 @@ # so we can check their command lines. # $? -- new prerequisites # $| -- order-only dependencies diff --git a/www/chromium/files/patch-ui__gfx__surface__surface.gyp b/www/chromium/files/patch-ui__gfx__surface__surface.gyp index ca7689142bcd..7fd590484503 100644 --- a/www/chromium/files/patch-ui__gfx__surface__surface.gyp +++ b/www/chromium/files/patch-ui__gfx__surface__surface.gyp @@ -1,32 +1,17 @@ ---- ui/gfx/surface/surface.gyp.orig 2011-06-29 21:20:25.308574273 +0300 -+++ ui/gfx/surface/surface.gyp 2011-06-29 21:24:36.234570454 +0300 -@@ -13,10 +13,20 @@ - ['toolkit_uses_gtk == 1', { - 'sources/': [ - ['include', '/gtk/'], -- ['include', '_(gtk|linux|posix|skia|x)\\.cc$'], -+ ['include', '_(gtk|posix|skia|x)\\.cc$'], - ['include', '/(gtk|x11)_[^/]*\\.cc$'], +--- ui/gfx/surface/surface.gyp.orig 2011-09-09 21:37:36.000000000 +0300 ++++ ui/gfx/surface/surface.gyp 2011-09-09 21:45:23.000000000 +0300 +@@ -14,6 +14,14 @@ + '<(DEPTH)/third_party/angle/include', ], }], -+ ['OS=="linux"', { -+ 'sources/': [ -+ ['include', '_linux\\.cc$'], ++ ['OS == "freebsd"', { ++ 'sources!': [ ++ 'transport_dib_linux.cc', + ], -+ }], -+ ['OS=="freebsd"', { -+ 'sources/': [ -+ ['include', '_freebsd\\.cc$'], ++ 'sources': [ ++ 'transport_dib_freebsd.cc', + ], + }], - ['OS=="mac"', {'sources/': [ - ['include', '/cocoa/'], - ['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'], -@@ -53,6 +63,7 @@ - 'transport_dib_linux.cc', - 'transport_dib_mac.cc', - 'transport_dib_win.cc', -+ 'transport_dib_freebsd.cc', - ], - }, - ], + ], + }, + 'targets': [ diff --git a/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp b/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp index c63a78205ab6..2e1070fc3adb 100644 --- a/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp +++ b/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp @@ -1,7 +1,7 @@ ---- v8/src/extensions/experimental/experimental.gyp.orig 2011-09-03 12:13:16.000000000 +0300 -+++ v8/src/extensions/experimental/experimental.gyp 2011-09-11 21:16:10.407508099 +0300 -@@ -51,8 +51,14 @@ - 'language-matcher.h', +--- v8/src/extensions/experimental/experimental.gyp.orig 2011-09-11 19:05:30.000000000 +0300 ++++ v8/src/extensions/experimental/experimental.gyp 2011-09-11 19:05:46.000000000 +0300 +@@ -56,8 +56,14 @@ + 'number-format.h', '<(SHARED_INTERMEDIATE_DIR)/i18n-js.cc', ], + 'conditions': [ @@ -13,6 +13,6 @@ + ], 'include_dirs': [ - '<(icu_src_dir)/public/common', - '../..', + # v8/ is root for all includes. + '../../..' ], - 'dependencies': [ diff --git a/www/chromium/files/patch-v8__src__extensions__experimental__number-format.cc b/www/chromium/files/patch-v8__src__extensions__experimental__number-format.cc new file mode 100644 index 000000000000..ae802b284882 --- /dev/null +++ b/www/chromium/files/patch-v8__src__extensions__experimental__number-format.cc @@ -0,0 +1,48 @@ +--- v8/src/extensions/experimental/number-format.cc.orig 2011-08-30 12:19:09.000000000 +0300 ++++ v8/src/extensions/experimental/number-format.cc 2011-09-10 17:32:54.000000000 +0300 +@@ -36,6 +36,8 @@ + #include "unicode/numfmt.h" + #include "unicode/uchar.h" + #include "unicode/ucurr.h" ++#include "unicode/unum.h" ++#include "unicode/uversion.h" + + namespace v8 { + namespace internal { +@@ -231,6 +233,8 @@ + } + + // Generates ICU number format pattern from given skeleton. ++// TODO(cira): Remove once ICU includes equivalent method ++// (see http://bugs.icu-project.org/trac/ticket/8610). + static icu::DecimalFormat* CreateFormatterFromSkeleton( + const icu::Locale& icu_locale, + const icu::UnicodeString& skeleton, +@@ -251,6 +255,7 @@ + // Case of non-consecutive U+00A4 is taken care of in i18n.js. + int32_t end_index = skeleton.lastIndexOf(currency_symbol, index); + ++#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 6) + icu::NumberFormat::EStyles style; + switch (end_index - index) { + case 0: +@@ -262,6 +267,19 @@ + default: + style = icu::NumberFormat::kPluralCurrencyStyle; + } ++#else // ICU version is 4.8 or above (we ignore versions below 4.0). ++ UNumberFormatStyle style; ++ switch (end_index - index) { ++ case 0: ++ style = UNUM_CURRENCY; ++ break; ++ case 1: ++ style = UNUM_CURRENCY_ISO; ++ break; ++ default: ++ style = UNUM_CURRENCY_PLURAL; ++ } ++#endif + + base_format = static_cast<icu::DecimalFormat*>( + icu::NumberFormat::createInstance(icu_locale, style, *status)); diff --git a/www/chromium/files/patch-views__events__event.h b/www/chromium/files/patch-views__events__event.h new file mode 100644 index 000000000000..b2704264d63d --- /dev/null +++ b/www/chromium/files/patch-views__events__event.h @@ -0,0 +1,11 @@ +--- views/events/event.h.orig 2011-09-10 15:38:07.000000000 +0300 ++++ views/events/event.h 2011-09-10 15:38:29.000000000 +0300 +@@ -90,7 +90,7 @@ + #if defined(OS_WIN) + // Returns the EventFlags in terms of windows flags. + int GetWindowsFlags() const; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) + // Get the views::Event flags from a native GdkEvent. + static int GetFlagsFromGdkEvent(NativeEvent native_event); + #endif diff --git a/www/chromium/files/patch-views_native_types.h b/www/chromium/files/patch-views_native_types.h new file mode 100644 index 000000000000..75c6f35534df --- /dev/null +++ b/www/chromium/files/patch-views_native_types.h @@ -0,0 +1,20 @@ +--- views/native_types.h.orig 2011-09-10 16:05:08.000000000 +0300 ++++ views/native_types.h 2011-09-10 16:05:37.000000000 +0300 +@@ -8,7 +8,7 @@ + + #include "ui/gfx/native_widget_types.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + typedef union _GdkEvent GdkEvent; + #endif + #if defined(USE_X11) +@@ -32,7 +32,7 @@ + #if defined(OS_WIN) + typedef MSG NativeEvent; + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + typedef GdkEvent* NativeEvent; + #endif + #if defined(USE_X11) diff --git a/www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc b/www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc index eeefe747c40a..54c6e53b84ad 100644 --- a/www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc +++ b/www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc @@ -1,20 +1,11 @@ ---- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig 2011-06-27 02:14:17.790782765 +0300 -+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc 2011-06-27 02:13:53.064781555 +0300 -@@ -69,7 +69,7 @@ - #include "printing/metafile_impl.h" - #endif - --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_WIN) - #include "printing/metafile.h" - #include "printing/metafile_skia_wrapper.h" - #endif -@@ -1297,7 +1297,7 @@ +--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig 2011-07-28 11:01:06.000000000 +0300 ++++ webkit/plugins/ppapi/ppapi_plugin_instance.cc 2011-09-07 01:45:08.000000000 +0300 +@@ -1035,7 +1035,7 @@ #endif // defined(OS_WIN) bool ret = false; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) +-#if defined(OS_LINUX) || (defined(OS_MACOSX) && defined(USE_SKIA)) ++#if defined(OS_LINUX) || (defined(OS_MACOSX) && defined(USE_SKIA)) || defined(OS_FREEBSD) // On Linux we just set the final bits in the native metafile // (NativeMetafile and PreviewMetafile must have compatible formats, // i.e. both PDF for this to work). diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 34ac53e259ce..bd9fbadc5e75 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -107,6 +107,8 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/paneGrowHandleLine.png %%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png %%DATADIR%%/resources/inspector/Images/paneSettingsButtons.png +%%DATADIR%%/resources/inspector/Images/paneElementStateButtons.png +%%DATADIR%%/resources/inspector/Images/paneFilterButtons.png %%DATADIR%%/resources/inspector/Images/popoverArrows.png %%DATADIR%%/resources/inspector/Images/popoverBackground.png %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png @@ -141,6 +143,10 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/segmentSelectedEndChromium.png %%DATADIR%%/resources/inspector/Images/sessionStorage.png %%DATADIR%%/resources/inspector/Images/spinner.gif +%%DATADIR%%/resources/inspector/Images/spinnerActive.gif +%%DATADIR%%/resources/inspector/Images/spinnerActiveSelected.gif +%%DATADIR%%/resources/inspector/Images/spinnerInactive.gif +%%DATADIR%%/resources/inspector/Images/spinnerInactiveSelected.gif %%DATADIR%%/resources/inspector/Images/splitviewDimple.png %%DATADIR%%/resources/inspector/Images/splitviewDividerBackground.png %%DATADIR%%/resources/inspector/Images/statusbarBackground.png |