Revert 47832 - Roll DEPS for libvpx and enable VP8/WebM for Chromium ARM builds.

This broke the Chromium Arm compile: 


  flock /b/slave/chromium-rel-arm/build/src/sconsbuild/linker.lock \/usr/local/crosstool-trusted/arm-2009q3/bin/arm-none-linux-gnueabi-g++ -B/usr/local/tot-binutils/arm-none-linux-gnueabi/bin -shared  -pthread -Wl,-z,noexecstack -Wl,-Bsymbolic -Lout/Release/obj/gen/third_party/ffmpeg -Lthird_party/libvpx/lib/linux/arm-neon --sysroot=/usr/local/arm-rootfs -Wl,--gc-sections -Wl,-soname=libffmpegsumo.so -o out/Release/obj.target/third_party/ffmpeg/libffmpegsumo.so -Wl,--start-group out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/allcodecs.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/audioconvert.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/avpacket.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/bitstream.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/bitstream_filter.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/dsputil.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/eval.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/faanidct.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/fft.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/golomb.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/imgconvert.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/jrevdct.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/libvpxdec.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/mdct.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/mpeg12data.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/mpeg4audio.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/opt.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/options.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/parser.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/pthread.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/raw.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/simple_idct.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/utils.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/vorbis.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/vorbis_data.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/vorbis_dec.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/vp3.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/vp3dsp.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/xiph.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/allformats.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/avi.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/avio.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/aviobuf.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/cutils.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/id3v1.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/isom.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/matroska.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/matroskadec.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/metadata.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/metadata_compat.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/oggdec.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/oggparseogm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/oggparsetheora.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/oggparsevorbis.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/options.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/riff.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/rm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/rmdec.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/utils.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/vorbiscomment.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/avstring.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/base64.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/crc.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/intfloat_readwrite.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/log.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/lzo.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/mathematics.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/mem.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/pixdesc.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/rational.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/pcm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/raw.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/wav.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_arm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_armv6.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_arm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv5te.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv6.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_vfp.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_vfp.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/fft_init_arm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/jrevdct_arm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_arm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv5te.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv6.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/fft_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/int_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/rdft_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/vp3dsp_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/mdct_neon.o -Wl,--end-group -lvpx -lz
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(vpx_codec.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(vp8_dx_iface.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(onyxd_if.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(threading.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(vpx_config.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(scalesystemdependant.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(yv12extend_arm.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(entropy.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(entropymode.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(loopfilter.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(systemdependent.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(decodframe.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(demode.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(detokenize.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(findnearmv.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(quant_common.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
/usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(decodemv.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
collect2: ld returned 1 exit status


TBR=scherkus@chromium.org



git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47841 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 1 deletions

diff --git a/DEPS b/DEPS
index 7980946..ffe0020 100644
--- a/DEPS
+++ b/DEPS
@@ -7,7 +7,7 @@ vars = {
   "chromium_git": "http://src.chromium.org/git",
   "swig_revision": "40423",
   "nacl_revision": "2235",
-  "libvpx_revision": "47824",
+  "libvpx_revision": "47701",
 }
 
 deps = {