diff -r 000000000000 -r 6474c204b198 media/libopus/moz.build
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media/libopus/moz.build	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,98 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+EXPORTS.opus += [
+    'include/opus.h',
+    'include/opus_defines.h',
+    'include/opus_multistream.h',
+    'include/opus_types.h',
+]
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'gkmedias'
+
+DEFINES['OPUS_BUILD'] = True
+DEFINES['OPUS_VERSION'] = '"v1.1-mozilla"'
+DEFINES['USE_ALLOCA'] = True
+
+if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_AS']:
+    DEFINES['OPUS_ARM_ASM'] = True
+    DEFINES['OPUS_ARM_EXTERNAL_ASM'] = True
+    DEFINES['OPUS_ARM_INLINE_ASM'] = True
+    DEFINES['OPUS_ARM_INLINE_EDSP'] = True
+    DEFINES['OPUS_ARM_MAY_HAVE_EDSP'] = True
+    DEFINES['OPUS_ARM_MAY_HAVE_MEDIA'] = True
+    DEFINES['OPUS_ARM_MAY_HAVE_NEON'] = True
+
+if CONFIG['MOZ_DEBUG']:
+    DEFINES['ENABLE_ASSERTIONS'] = True
+
+if CONFIG['OS_ARCH'] in ('Linux', 'Darwin', 'DragonFly', 'FreeBSD',
+                         'NetBSD', 'OpenBSD'):
+    DEFINES['HAVE_LRINTF'] = True
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    DEFINES['inline'] = '__inline'
+    if CONFIG['GNU_CC']:
+        DEFINES['HAVE_LRINTF'] = True
+
+if CONFIG['OS_ARCH'] == 'AIX':
+    DEFINES['alloca'] = '__alloca'
+
+if CONFIG['OS_ARCH'] == 'SunOS':
+    DEFINES['HAVE_ALLOCA_H'] = True
+
+if not CONFIG['MOZ_SAMPLE_TYPE_FLOAT32']:
+    DEFINES['FIXED_POINT'] = 1
+    DEFINES['DISABLE_FLOAT_API'] = True
+
+LOCAL_INCLUDES += [
+    'celt',
+    'include',
+    'silk',
+    'src',
+]
+
+# sources.mozbuild is generated from gen-sources.py when a new libopus is
+# imported.
+include('sources.mozbuild')
+
+SOURCES += celt_sources
+SOURCES += silk_sources
+SOURCES += opus_sources
+
+if CONFIG['MOZ_SAMPLE_TYPE_FLOAT32']:
+    LOCAL_INCLUDES += [
+        'silk/float',
+    ]
+    SOURCES += silk_sources_float
+    SOURCES += opus_sources_float
+else:
+    LOCAL_INCLUDES += [
+        'silk/fixed',
+    ]
+    SOURCES += silk_sources_fixed
+
+if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_AS']:
+    SOURCES += celt_sources_arm
+    GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
+        'celt_pitch_xcorr_arm-gnu',
+    ]]
+    # -Os is significantly slower, enable -O3 unless optimization is disabled
+    if CONFIG['MOZ_OPTIMIZE']:
+      CFLAGS += [
+        '-O3',
+      ]
+      CXXFLAGS += [
+        '-O3',
+      ]
+
+# Suppress warnings in third-party code.
+if CONFIG['GNU_CC']:
+    CFLAGS += ['-Wno-declaration-after-statement']
+    if CONFIG['CLANG_CXX']:
+        CFLAGS += ['-Wno-\#pragma-messages']