Bug 1239550 - Rename Linux configs under media/ffvpx/ to avoid confusion. r?jya draft
authorJan Beich <jbeich@FreeBSD.org>
Sat, 20 Feb 2016 17:49:15 +0000
changeset 339841 70cd52110fcd34a35d2201841f4a2e89ad8b9093
parent 339840 e7fad7c1d6f36917d2476688d6fa76c53cbc0cb4
child 339842 48f566232dc3d987382a002032d0ff0e84122b8e
push id12805
push userjbeich@FreeBSD.org
push dateSun, 13 Mar 2016 10:57:20 +0000
reviewersjya
bugs1239550
milestone48.0a1
Bug 1239550 - Rename Linux configs under media/ffvpx/ to avoid confusion. r?jya MozReview-Commit-ID: 5v12WOP00CW
media/ffvpx/README_MOZILLA
media/ffvpx/config.h
media/ffvpx/config_linux32.h
media/ffvpx/config_linux64.asm
media/ffvpx/config_linux64.h
media/ffvpx/config_unix32.h
media/ffvpx/config_unix64.asm
media/ffvpx/config_unix64.h
media/ffvpx/ffvpxcommon.mozbuild
--- a/media/ffvpx/README_MOZILLA
+++ b/media/ffvpx/README_MOZILLA
@@ -12,18 +12,18 @@ Once yasm is upgraded to 1.2 or later, A
 Add --disable-avx2 to configure on those platforms.
 
 configuration files were generated as follow using the configure script:
 ./configure --disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-asm --enable-yasm
 
 config_darwin32.h:
 add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
 
-config_unix32.h:
+config_linux32.h:
 add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
 replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/
 
 
-config_unix64.h/config_unix64.asm:
+config_linux64.h/config_linux64.asm:
 replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
 
 config_win32/64.h/asm:
 add to configure command: --toolchain=msvc
--- a/media/ffvpx/config.h
+++ b/media/ffvpx/config.h
@@ -15,15 +15,15 @@
 #elif defined(XP_DARWIN)
 #if defined(HAVE_64BIT_BUILD)
 #include "config_darwin64.h"
 #else
 #include "config_darwin32.h"
 #endif
 #elif defined(XP_UNIX)
 #if defined(HAVE_64BIT_BUILD)
-#include "config_unix64.h"
+#include "config_linux64.h"
 #else
-#include "config_unix32.h"
+#include "config_linux32.h"
 #endif
 #endif
 #include "config_common.h"
 #endif // MOZ_FFVPX_CONFIG_H
rename from media/ffvpx/config_unix32.h
rename to media/ffvpx/config_linux32.h
rename from media/ffvpx/config_unix64.asm
rename to media/ffvpx/config_linux64.asm
rename from media/ffvpx/config_unix64.h
rename to media/ffvpx/config_linux64.h
--- a/media/ffvpx/ffvpxcommon.mozbuild
+++ b/media/ffvpx/ffvpxcommon.mozbuild
@@ -21,18 +21,18 @@ if CONFIG['FFVPX_AS']:
             ASFLAGS += ['-Pconfig_win64.asm']
     elif CONFIG['OS_ARCH'] == 'Darwin':
         # 32/64-bit macosx assemblers need to prefix symbols with an underscore.
         ASFLAGS += [
             '-Pconfig_darwin64.asm',
             '-DPREFIX'
         ]
     else:
-        # Default to unix, similar to how ASFLAGS setup works in configure.in
-        ASFLAGS += ['-Pconfig_unix64.asm']
+        # Default to Linux, similar to how ASFLAGS setup works in configure.in
+        ASFLAGS += ['-Pconfig_linux64.asm']
 
 LOCAL_INCLUDES += ['/media/ffvpx']
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 # Suppress warnings in third-party code.
 if CONFIG['GNU_CC']:
     CFLAGS += [