From be760af685a0f9602928d60380283cf65e009ebf Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 18 Jun 2013 15:38:11 +0000
Subject: [PATCH] extra/chromium fixes

---
 extra/chromium/PKGBUILD | 89 +++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD
index 154963739..15a8a6154 100644
--- a/extra/chromium/PKGBUILD
+++ b/extra/chromium/PKGBUILD
@@ -11,6 +11,7 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - removed NaCl, not for ARM
 #  - adjusted gyp flags for v7h
+#  - use system ffmpeg, added ffmpeg to depends
 #
 #        moonman <moonman [dot] ca [at] gmail [dot] com>
 #  -added armv6 support
@@ -28,7 +29,7 @@ license=('BSD')
 depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'icu'
          'libgcrypt' 'ttf-font' 'udev' 'dbus' 'flac' 'opus' 'libwebp' 'snappy'
          'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'harfbuzz-icu'
-         'desktop-file-utils' 'hicolor-icon-theme')
+         'desktop-file-utils' 'hicolor-icon-theme' 'ffmpeg')
 makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
              'elfutils' 'subversion')
 optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
@@ -106,49 +107,49 @@ arch_specific_flags="
 fi
 
   local _chromium_conf=(
-    -Dgoogle_api_key=$_google_api_key \
-    -Dgoogle_default_client_id=$_google_default_client_id \
-    -Dgoogle_default_client_secret=$_google_default_client_secret \
-    -Dwerror= \
-    -Dlinux_link_gsettings=1 \
-    -Dlinux_link_libpci=1 \
-    -Dlinux_link_libspeechd=1 \
-    -Dlinux_link_pulseaudio=1 \
-    -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
-    -Dlinux_strip_binary=1 \
-    -Dlinux_use_gold_binary=0 \
-    -Dlinux_use_gold_flags=0 \
-    -Drelease_extra_cflags="$CFLAGS -DUSE_EABI_HARDFLOAT" \
-    -Dlibspeechd_h_prefix=speech-dispatcher/ \
-    -Dffmpeg_branding=Chrome \
-    -Dproprietary_codecs=1 \
-    -Duse_system_bzip2=1 \
-    -Duse_system_flac=1 \
-    -Duse_system_ffmpeg=1 \
-    -Duse_system_harfbuzz=1 \
-    -Duse_system_icu=1 \
-    -Duse_system_libevent=1 \
-    -Duse_system_libjpeg=1 \
-    -Duse_system_libpng=1 \
-    -Duse_system_libwebp=1 \
-    -Duse_system_libxml=0 \
-    -Duse_system_opus=1 \
-    -Duse_system_snappy=1 \
-    -Duse_system_ssl=0 \
-    -Duse_system_xdg_utils=1 \
-    -Duse_system_yasm=1 \
-    -Duse_system_zlib=0 \
-    -Duse_gconf=0 \
-    -Ddisable_glibc=1 \
-    -Ddisable_newlib_untar=1 \
-    -Ddisable_sse2=1 \
-    -Dtarget_arch=arm \
-    -Darm_neon=0 \
-    -Dlinux_use_tcmalloc=0 \
-    -Ddisable_nacl=1 \
-    -Dv8_use_arm_eabi_hardfloat=true \
-    -Darm_float_abi=hard \
-    -Denable_webrtc=0 \
+    -Dgoogle_api_key=$_google_api_key
+    -Dgoogle_default_client_id=$_google_default_client_id
+    -Dgoogle_default_client_secret=$_google_default_client_secret
+    -Dwerror=
+    -Dlinux_link_gsettings=1
+    -Dlinux_link_libpci=1
+    -Dlinux_link_libspeechd=1
+    -Dlinux_link_pulseaudio=1
+    -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox
+    -Dlinux_strip_binary=1
+    -Dlinux_use_gold_binary=0
+    -Dlinux_use_gold_flags=0
+    -Drelease_extra_cflags="$CFLAGS -DUSE_EABI_HARDFLOAT"
+    -Dlibspeechd_h_prefix=speech-dispatcher/
+    -Dffmpeg_branding=Chrome
+    -Dproprietary_codecs=1
+    -Duse_system_bzip2=1
+    -Duse_system_flac=1
+    -Duse_system_ffmpeg=1
+    -Duse_system_harfbuzz=1
+    -Duse_system_icu=1
+    -Duse_system_libevent=1
+    -Duse_system_libjpeg=1
+    -Duse_system_libpng=1
+    -Duse_system_libwebp=1
+    -Duse_system_libxml=0
+    -Duse_system_opus=1
+    -Duse_system_snappy=1
+    -Duse_system_ssl=0
+    -Duse_system_xdg_utils=1
+    -Duse_system_yasm=1
+    -Duse_system_zlib=0
+    -Duse_gconf=0
+    -Ddisable_glibc=1
+    -Ddisable_newlib_untar=1
+    -Ddisable_sse2=1
+    -Dtarget_arch=arm
+    -Darm_neon=0
+    -Dlinux_use_tcmalloc=0
+    -Ddisable_nacl=1
+    -Dv8_use_arm_eabi_hardfloat=true
+    -Darm_float_abi=hard
+    -Denable_webrtc=0
     ${arch_specific_flags})
 
   build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}"