extra/chromium fixes

extra/chromium/PKGBUILD

@@ -14,9 +14,6 @@
 #  - patch to fix webrtc code for non-android ARM
 #  - patch (hack) to fix skia
 #  - makeflags to -j3, seems to barf higher
-#
-#        moonman <moonman [dot] ca [at] gmail [dot] com>
-#  -added armv6 support
 
 buildarch=4
 
@@ -44,16 +41,13 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
         chromium.desktop
         arm-webrtc-fix.patch
         chromium-arm-r0.patch
-        v6-ffmpeg.patch
         0001-Demand-for-newer-POSIX-macro.patch
         chromium-widevine.patch)
 sha256sums=('3e8c03a5a6ea4cc35017404a58687ca18207eed70781bad7f2d7d70610934c91'
             '7f91c81721092d707d7b94e6555a48bc7fd0bc0e1174df4649bdcd745930e52f'
             '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
-            '3a1c589aa90c0597776d945d34638d43e2d40d93bc1962148815831a5122ac4e'
             '9db0f01517c52e3236ff52e8a664840542a19144a54923ae6aabea3dcfa92c52'
             'df4be49770d508b772f98eda9fc5f37fa71d4c0459437e12f7f3db5892aa1611'
-            '3fbabcbd512494b529e0a0e17560735887acf2291a74653750f9b29f5d45774d'
             'd908939b10161efe658f0f82d2c132bf28dff54e08f02c6fed93815c3656f328'
             '379b746e187de28f80f5a7cd19edcfa31859656826f802a1ede054fcb6dfb221')
 
@@ -115,22 +109,6 @@ build() {
   # CFLAGS are passed through release_extra_cflags below
   export -n CFLAGS CXXFLAGS
 
-if [ "$CARCH" == "armv6h" ]; then
-arch_specific_flags="
-    -Darmv7=0 \
-    -Darmv6=1 \
-    -Darm_fpu=vfp \
-    -Darm_thumb=0 \
-    -Dv8_can_use_vfp_instructions=false \
-    -Dv8_can_use_vfp2_instructions=true"
-fi
-
-if [ "$CARCH" == "armv7h" ]; then
-arch_specific_flags="
-    -Darmv7=1 \
-    -Darm_fpu=neon"
-fi
-
   local _chromium_conf=(
     -Dgoogle_api_key=$_google_api_key
     -Dgoogle_default_client_id=$_google_default_client_id
@@ -182,13 +160,14 @@ fi
     -Dv8_use_arm_eabi_hardfloat=true
     -Darm_float_abi=hard
     -Dsysroot=
-    ${arch_specific_flags})
+    -Darmv7=1
+    -Darm_fpu=neon)
 
   # Re-configure bundled ffmpeg.
-  pushd third_party/ffmpeg > /dev/null || exit 1
-  python2 chromium/scripts/build_ffmpeg.py linux arm --config-only || exit 1
-  chromium/scripts/copy_config.sh || exit 1
-  popd > /dev/null || exit 1
+  #pushd third_party/ffmpeg > /dev/null || exit 1
+  #python2 chromium/scripts/build_ffmpeg.py linux arm --config-only || exit 1
+  #chromium/scripts/copy_config.sh || exit 1
+  #popd > /dev/null || exit 1
 
   build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}"
   build/gyp_chromium --depth=. "${_chromium_conf[@]}"