From 82edabce75f6cd824a096b05c7cecc2349e6861a Mon Sep 17 00:00:00 2001
From: Christian Duvivier <cduvivier@google.com>
Date: Mon, 6 Aug 2012 15:05:24 -0700
Subject: [PATCH] Add x86_64-darwin11-gcc target.
This allows building on MountainLion as the 10.6 SDK has been
removed from the latest Xcode version (4.4 4F250). Also fix
all warnings for that build.
Change-Id: Ib70bca4a25295f13595f0d10ea9f0229631de5a4
---
build/make/configure.sh | 6 ++++++
build/make/gen_asm_deps.sh | 2 +-
configure | 1 +
vp8/decoder/decodemv.h | 5 +++++
vp8/decoder/decodframe.c | 2 +-
vp8/encoder/bitstream.c | 2 --
6 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/build/make/configure.sh b/build/make/configure.sh
index ab087f1720..552f8c1886 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -623,6 +623,12 @@ process_common_toolchain() {
add_ldflags "-isysroot /Developer/SDKs/MacOSX10.6.sdk"
add_ldflags "-mmacosx-version-min=10.6"
;;
+ *-darwin11-*)
+ add_cflags "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
+ add_cflags "-mmacosx-version-min=10.7"
+ add_ldflags "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
+ add_ldflags "-mmacosx-version-min=10.7"
+ ;;
esac
# Handle Solaris variants. Solaris 10 needs -lposix4
diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
index 7c6c5d5658..a75418aa6b 100755
--- a/build/make/gen_asm_deps.sh
+++ b/build/make/gen_asm_deps.sh
@@ -42,7 +42,7 @@ done
[ -n "$srcfile" ] || show_help
sfx=${sfx:-asm}
-includes=$(egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
+includes=$(egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
#" restore editor state
for inc in ${includes}; do
diff --git a/configure b/configure
index 482657acee..b135874bde 100755
--- a/configure
+++ b/configure
@@ -114,6 +114,7 @@ all_platforms="${all_platforms} x86-win32-vs8"
all_platforms="${all_platforms} x86-win32-vs9"
all_platforms="${all_platforms} x86_64-darwin9-gcc"
all_platforms="${all_platforms} x86_64-darwin10-gcc"
+all_platforms="${all_platforms} x86_64-darwin11-gcc"
all_platforms="${all_platforms} x86_64-linux-gcc"
all_platforms="${all_platforms} x86_64-linux-icc"
all_platforms="${all_platforms} x86_64-solaris-gcc"
diff --git a/vp8/decoder/decodemv.h b/vp8/decoder/decodemv.h
index 9403424479..17bbb5b674 100644
--- a/vp8/decoder/decodemv.h
+++ b/vp8/decoder/decodemv.h
@@ -12,3 +12,8 @@
#include "onyxd_int.h"
void vp8_decode_mode_mvs(VP8D_COMP *);
+void vpx_decode_mb_mode_mv(VP8D_COMP *pbi,
+ MACROBLOCKD *xd,
+ int mb_row,
+ int mb_col);
+void vpx_decode_mode_mvs_init(VP8D_COMP *pbi);
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 475584211c..057104f497 100644
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -63,7 +63,7 @@ static int merge_index(int v, int n, int modulus) {
static int inv_remap_prob(int v, int m) {
const int n = 256;
const int modulus = MODULUS_PARAM;
- int i, w;
+ int i;
v = merge_index(v, n - 1, modulus);
if ((m << 1) <= n) {
i = inv_recenter_nonneg(v + 1, m);
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 1896145db2..574427cf70 100644
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -78,7 +78,6 @@ static int split_index(int i, int n, int modulus) {
static int remap_prob(int v, int m) {
const int n = 256;
const int modulus = MODULUS_PARAM;
- const int max1 = (n - 2 - modulus / 2 + modulus - 1) / modulus;
int i;
if ((m << 1) <= n)
i = recenter_nonneg(v, m) - 1;
@@ -1353,7 +1352,6 @@ static void update_coef_probs2(VP8_COMP *cpi) {
vp8_writer *const w = & cpi->bc;
int update[2];
int savings;
- int bestupdndx[2 * ENTROPY_NODES];
vp8_clear_system_state(); // __asm emms;
// Build the cofficient contexts based on counts collected in encode loop
--
GitLab