--- /dev/null
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/chromium
+drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/chromium/
+-rwsr-xr-x root/root usr/lib/chromium/chrome-sandbox
+-rw-r--r-- root/root usr/lib/chromium/chrome.pak
+-rw-r--r-- root/root usr/lib/chromium/chrome_100_percent.pak
+-rwxr-xr-x root/root usr/lib/chromium/chromium
+-rw-r--r-- root/root usr/lib/chromium/content_resources.pak
+-rwxr-xr-x root/root usr/lib/chromium/libffmpegsumo.so
+drwxr-xr-x root/root usr/lib/chromium/locales/
+-rw-r--r-- root/root usr/lib/chromium/locales/en-US.pak
+-rw-r--r-- root/root usr/lib/chromium/resources.pak
+drwxr-xr-x root/root usr/lib/chromium/resources/
+drwxr-xr-x root/root usr/lib/chromium/resources/extension/
+drwxr-xr-x root/root usr/lib/chromium/resources/extension/demo/
+-rw-r--r-- root/root usr/lib/chromium/resources/extension/demo/library.js
+drwxr-xr-x root/root usr/lib/chromium/resources/inspector/
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/AuditsPanel.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/CodeMirrorTextEditor.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/ElementsPanel.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/HeapSnapshotWorker.js
+drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/addIcon.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/applicationCache.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/back.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpoint2.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpoint2_2x.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointBorder.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional2.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional2_2x.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditionalBorder.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditionalCounterBorder.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointCounterBorder.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/checker.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/cookie.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/database.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/databaseTable.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/deleteIcon.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/domain.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/fileSystem.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/forward.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/frame.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/glossyHeader.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/glossyHeaderPressed.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/glossyHeaderSelected.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/glossyHeaderSelectedPressed.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/graphLabelCalloutLeft.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/graphLabelCalloutRight.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/indexedDB.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/indexedDBIndex.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/indexedDBObjectStore.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/localStorage.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/namedFlowOverflow.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneAddButtons.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneElementStateButtons.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneFilterButtons.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneRefreshButtons.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneSettingsButtons.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverArrows.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverBackground.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileGroupIcon.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileIcon.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileSmallIcon.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/programCounterBorder.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/radioDot.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/regionEmpty.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/regionFit.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/regionOverset.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceCSSIcon.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIcon.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIconSmall.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceJSIcon.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcePlainIcon.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcePlainIconSmall.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcesTimeGraphIcon.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchNext.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchPrev.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchSmallBlue.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchSmallBrightBlue.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchSmallGray.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchSmallWhite.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segment.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentEnd.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentHover.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentHoverEnd.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentSelected.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentSelectedEnd.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/sessionStorage.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove_2x.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinner.gif
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerActive.gif
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerActiveSelected.gif
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerInactive.gif
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerInactiveSelected.gif
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarButtonGlyphs.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarButtonGlyphs2x.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarResizerHorizontal.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/statusbarResizerVertical.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbActiveHoriz.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbActiveVert.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbHoriz.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbHoverHoriz.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbHoverVert.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbVert.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillBlue.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillGray.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillGreen.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillOrange.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillPurple.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillRed.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelineHollowPillYellow.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillBlue.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillGray.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillGreen.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillOrange.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillPurple.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillRed.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/timelinePillYellow.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarItemSelected.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/trackHoriz.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/trackVert.png
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/NetworkPanel.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/ProfilesPanel.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/ResourcesPanel.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/ScriptFormatterWorker.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/ScriptsPanel.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/TimelinePanel.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/auditsPanel.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/breadcrumbList.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/breakpointsList.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/buildSystemOnly.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/canvasProfiler.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cmdevtools.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/codemirror.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cssNamedFlows.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/dataGrid.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools.html
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools_extension_api.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/elementsPanel.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/filteredItemSelectionDialog.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/flameChart.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/heapProfiler.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/helpScreen.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/indexedDBViews.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspectorCommon.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/navigatorView.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/networkLogView.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/networkPanel.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/panelEnablerView.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/profilesPanel.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/resourceView.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/resourcesPanel.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/revisionHistory.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/scriptsPanel.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sidebarPane.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/spectrum.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/splitView.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/tabbedPane.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/textPrompt.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/timelinePanel.css
+drwxr-xr-x root/root usr/man/
+drwxr-xr-x root/root usr/man/man1/
+-rw-r--r-- root/root usr/man/man1/chromium.1.gz
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/icons/
+drwxr-xr-x root/root usr/share/icons/hicolor/
+drwxr-xr-x root/root usr/share/icons/hicolor/128x128/
+drwxr-xr-x root/root usr/share/icons/hicolor/128x128/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/chromium.png
+drwxr-xr-x root/root usr/share/icons/hicolor/22x22/
+drwxr-xr-x root/root usr/share/icons/hicolor/22x22/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/22x22/apps/chromium.png
+drwxr-xr-x root/root usr/share/icons/hicolor/24x24/
+drwxr-xr-x root/root usr/share/icons/hicolor/24x24/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/24x24/apps/chromium.png
+drwxr-xr-x root/root usr/share/icons/hicolor/256x256/
+drwxr-xr-x root/root usr/share/icons/hicolor/256x256/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/256x256/apps/chromium.png
+drwxr-xr-x root/root usr/share/icons/hicolor/48x48/
+drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/chromium.png
--- /dev/null
+# Description: Open source version of Google Chrome web browser.
+# URL: http://chromium.org/
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
+# Maintainer: Jose V Beneyto, sepen at crux dot nu
+# Packager: Tadeusz Sosnierz, tadzikes gmail com
+# Depends on: dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage xorg-libxt gperf speech-dispatcher
+
+name=chromium
+version=30.0.1599.114
+release=1
+source=(http://commondatastorage.googleapis.com/chromium-browser-official/$name-$version.tar.xz \
+ $name.sh icu-native-arm.patch ffmpeg-native-arm.patch webrtc-arm_neon.patch)
+
+build() {
+ cd $name-$version
+
+ # avoid 32-bit flags (g++: error: unrecognized command line option '-m32')
+ patch -p1 -i $SRC/icu-native-arm.patch
+ # https://chromium.googlesource.com/chromium/third_party/ffmpeg/+/8a08a6d1dea934cf6507693a7f5285241b5c435b
+ patch -p1 -i $SRC/ffmpeg-native-arm.patch
+ # based on: https://code.google.com/p/chromium/issues/detail?id=154107
+ patch -p1 -i $SRC/webrtc-arm_neon.patch
+
+ # fix for speech-dispatcher >= 0.8
+ sed -e 's|<<(libspeechd_h_prefix)libspeechd.h>|<speech-dispatcher/libspeechd.h>|' \
+ -i build/linux/system.gyp
+
+ export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)"
+ export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)"
+
+ # determine some flags depending on SOC
+ USE_ARMV7=0; USE_ARM_THUMB=0; USE_ARM_NEON=0
+ case $(uname -m) in
+ armv7*) USE_ARMV7=1; USE_ARM_THUMB=1;;
+ esac
+ for flag in $CFLAGS; do
+ case $flag in
+ -mfpu=neon*) USE_ARM_NEON=1;;
+ esac
+ done
+
+ build/gyp_chromium -f make build/all.gyp --depth=. \
+ -Dtarget_arch=arm \
+ -Darm_float_abi=hard \
+ -Darmv7=$USE_ARMV7 \
+ -Darm_thumb=$USE_ARM_THUMB \
+ -Darm_neon=$USE_ARM_NEON \
+ -Dv8_target_arch=arm \
+ -Dv8_use_arm_eabi_hardfloat=1 \
+ -Dsysroot= \
+ -Dno_strict_aliasing=1 \
+ -Dwerror= \
+ -Dlinux_sandbox_path=/usr/lib/chromium/chrome-sandbox \
+ -Dlinux_strip_binary=1 \
+ -Dlinux_use_gold_binary=0 \
+ -Dlinux_use_gold_flags=0 \
+ -Dlinux_use_tmalloc=0 \
+ -Drelease_extra_cflags="$CFLAGS" \
+ -Dproprietary_codecs=1 \
+ -Dffmpeg_branding=Chrome \
+ -Duse_system_libjpeg=1 \
+ -Duse_system_libxslt=1 \
+ -Duse_system_libxml=1 \
+ -Duse_system_bzip2=1 \
+ -Duse_system_zlib=0 \
+ -Duse_system_libpng=0 \
+ -Duse_system_ffmpeg=0 \
+ -Duse_system_yasm=0 \
+ -Duse_system_libevent=1 \
+ -Duse_system_sqlite=0 \
+ -Dremove_webcore_debug_symbols=1 \
+ -Duse_gconf=0 \
+ -Duse_cups=0 \
+ -Duse_gnome_keyring=0 \
+ -Duse_kerberos=0 \
+ -Duse_pulseaudio=0 \
+ -Dlinux_link_gnome_keyring=0 \
+ -Dlinux_link_libpci=1 \
+ -Dlinux_link_libspeechd=1 \
+ -Denable_webrtc=1 \
+ -Ddisable_nacl=1
+
+ # fix issue with nspr libs
+ sed -e "s|LIBS := |LIBS := $LDFLAGS |" -i chrome/chrome.target.mk
+
+ make V=1 chrome chrome_sandbox BUILDTYPE=Release
+
+ install -m 0755 -D out/Release/chrome $PKG/usr/lib/chromium/chromium
+ install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/chromium/chrome-sandbox
+ install -m 0644 -D out/Release/*.pak $PKG/usr/lib/chromium
+ install -m 0755 -D out/Release/libffmpegsumo.so $PKG/usr/lib/chromium
+ install -d $PKG/usr/lib/chromium/locales
+ install -m 0644 out/Release/locales/en-US.pak $PKG/usr/lib/chromium/locales
+ cp -a out/Release/resources $PKG/usr/lib/chromium
+ install -m 0644 -D out/Release/chrome.1 $PKG/usr/man/man1/chromium.1
+
+ for size in 22 24 48 128 256; do
+ install -m 0644 -D chrome/app/theme/chromium/product_logo_${size}.png \
+ $PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
+ done
+
+ install -m 0755 -D $SRC/chromium.sh $PKG/usr/bin/chromium
+}
--- /dev/null
+--- chromium-30.0.1599.114/third_party/ffmpeg/ffmpeg.gyp.orig 2013-10-22 11:54:40.000000000 +0200
++++ chromium-30.0.1599.114/third_party/ffmpeg/ffmpeg.gyp 2013-10-22 11:54:51.000000000 +0200
+@@ -71,6 +71,63 @@
+ 'extra_header': 'chromium/ffmpeg_stub_headers.fragment',
+ },
+ 'conditions': [
++ ['target_arch != "arm"', {
++ 'targets': [
++ {
++ 'target_name': 'ffmpeg_yasm',
++ 'type': 'static_library',
++ # VS2010 does not correctly incrementally link obj files generated
++ # from asm files. This flag disables UseLibraryDependencyInputs to
++ # avoid this problem.
++ 'msvs_2010_disable_uldi_when_referenced': 1,
++ 'includes': [
++ 'ffmpeg_generated.gypi',
++ '../yasm/yasm_compile.gypi',
++ ],
++ 'sources': [
++ '<@(asm_sources)',
++ # XCode doesn't want to link a pure assembly target and will fail
++ # to link when it creates an empty file list. So add a dummy file
++ # keep the linker happy. See http://crbug.com/157073
++ 'xcode_hack.c',
++ ],
++ 'variables': {
++ # Path to platform configuration files.
++ 'platform_config_root': 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)',
++ 'conditions': [
++ ['target_arch == "ia32"', {
++ 'more_yasm_flags': [
++ '-DARCH_X86_32',
++ ],
++ }, {
++ 'more_yasm_flags': [
++ '-DARCH_X86_64',
++ ],
++ }],
++ ['OS == "mac"', {
++ 'more_yasm_flags': [
++ # Necessary to ensure symbols end up with a _ prefix; added by
++ # yasm_compile.gypi for Windows, but not Mac.
++ '-DPREFIX',
++ ]
++ }],
++ ],
++ 'yasm_flags': [
++ '-DPIC',
++ '>@(more_yasm_flags)',
++ '-I', '<(platform_config_root)',
++ '-I', 'libavcodec/x86/',
++ '-I', 'libavutil/x86/',
++ '-I', '.',
++ # Disable warnings, prevents log spam for things we won't fix.
++ '-w',
++ '-P', 'config.asm',
++ ],
++ 'yasm_output_path': '<(shared_generated_dir)/yasm'
++ },
++ },
++ ] # targets
++ }], # arch != arm
+ ['OS == "win" and clang == 0', {
+ # Convert the source code from c99 to c89 if we're on Windows and not
+ # using clang, which can compile c99 directly. Clang support is
+@@ -593,58 +650,5 @@
+ }],
+ ], # conditions
+ },
+- {
+- 'target_name': 'ffmpeg_yasm',
+- 'type': 'static_library',
+- # VS2010 does not correctly incrementally link obj files generated
+- # from asm files. This flag disables UseLibraryDependencyInputs to
+- # avoid this problem.
+- 'msvs_2010_disable_uldi_when_referenced': 1,
+- 'includes': [
+- 'ffmpeg_generated.gypi',
+- '../yasm/yasm_compile.gypi',
+- ],
+- 'sources': [
+- '<@(asm_sources)',
+- # XCode doesn't want to link a pure assembly target and will fail
+- # to link when it creates an empty file list. So add a dummy file
+- # keep the linker happy. See http://crbug.com/157073
+- 'xcode_hack.c',
+- ],
+- 'variables': {
+- # Path to platform configuration files.
+- 'platform_config_root': 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)',
+- 'conditions': [
+- ['target_arch == "ia32"', {
+- 'more_yasm_flags': [
+- '-DARCH_X86_32',
+- ],
+- }, {
+- 'more_yasm_flags': [
+- '-DARCH_X86_64',
+- ],
+- }],
+- ['OS == "mac"', {
+- 'more_yasm_flags': [
+- # Necessary to ensure symbols end up with a _ prefix; added by
+- # yasm_compile.gypi for Windows, but not Mac.
+- '-DPREFIX',
+- ]
+- }],
+- ],
+- 'yasm_flags': [
+- '-DPIC',
+- '>@(more_yasm_flags)',
+- '-I', '<(platform_config_root)',
+- '-I', 'libavcodec/x86/',
+- '-I', 'libavutil/x86/',
+- '-I', '.',
+- # Disable warnings, prevents log spam for things we won't fix.
+- '-w',
+- '-P', 'config.asm',
+- ],
+- 'yasm_output_path': '<(shared_generated_dir)/yasm'
+- },
+- },
+ ], # targets
+ }