recompiled opus for 64bit and added build scripts

BuildScripts/Opus/build.sh

@@ -0,0 +1,128 @@
+#!/bin/bash
+
+set -e
+
+source config.sh
+
+# Number of CPUs (for make -j)
+NCPU=`sysctl -n hw.ncpu`
+if test x$NJOB = x; then
+    NJOB=$NCPU
+fi
+
+PLATFORMBASE=$(xcode-select -print-path)"/Platforms"
+
+SCRIPT_DIR=$( (cd -P $(dirname $0) && pwd) )
+DIST_DIR_BASE=${DIST_DIR_BASE:="$SCRIPT_DIR/dist"}
+
+if [ ! -d opus ]
+then
+  echo "opus source directory does not exist, run sync.sh"
+fi
+
+# PATH=${SCRIPT_DIR}/gas-preprocessor/:$PATH
+
+for ARCH in $ARCHS
+do
+    OPUS_DIR=opus-$ARCH
+    if [ ! -d $OPUS_DIR ]
+    then
+      echo "Directory $OPUS_DIR does not exist, run sync.sh"
+      exit 1
+    fi
+    echo "Compiling source for $ARCH in directory $OPUS_DIR"
+
+    cd $OPUS_DIR
+
+    DIST_DIR=$DIST_DIR_BASE-$ARCH
+    mkdir -p $DIST_DIR
+    CFLAGS_ARCH=$ARCH
+    case $ARCH in
+        armv7)
+            EXTRA_FLAGS="--with-pic --enable-fixed-point"
+            EXTRA_CFLAGS="-mcpu=cortex-a8 -mfpu=neon"
+            PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
+            IOSSDK=iPhoneOS${IOSSDK_VER}
+            ;;
+        armv7s)
+            EXTRA_FLAGS="--with-pic --enable-fixed-point"
+            EXTRA_CFLAGS="-mcpu=cortex-a9 -mfpu=neon -miphoneos-version-min=6.0"
+            PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
+            IOSSDK=iPhoneOS${IOSSDK_VER}
+            ;;
+        aarch64)
+            CFLAGS_ARCH="arm64"
+            EXTRA_FLAGS="--with-pic --enable-fixed-point"
+            EXTRA_CFLAGS="-miphoneos-version-min=7.1"
+            PLATFORM="${PLATFORMBASE}/iPhoneOS.platform"
+            IOSSDK=iPhoneOS${IOSSDK_VER}
+          ;;
+        x86_64)
+            EXTRA_FLAGS="--with-pic"
+            EXTRA_CFLAGS="-miphoneos-version-min=7.1"
+            PLATFORM="${PLATFORMBASE}/iPhoneSimulator.platform"
+            IOSSDK=iPhoneSimulator${IOSSDK_VER}
+          ;;
+        i386)
+            EXTRA_FLAGS="--with-pic"
+            EXTRA_CFLAGS="-miphoneos-version-min=7.1"
+            PLATFORM="${PLATFORMBASE}/iPhoneSimulator.platform"
+            IOSSDK=iPhoneSimulator${IOSSDK_VER}
+            ;;
+        *)
+            echo "Unsupported architecture ${ARCH}"
+            exit 1
+            ;;
+    esac
+
+    echo "Configuring opus for $ARCH..."
+	
+	./autogen.sh
+	
+	CFLAGS="-g -O2 -pipe -arch ${CFLAGS_ARCH} \
+		-isysroot ${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk \
+		-I${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk/usr/include \
+		${EXTRA_CFLAGS}"
+    LDFLAGS="-arch ${CFLAGS_ARCH} \
+		-isysroot ${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk \
+		-L${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk/usr/lib"
+	
+	export CFLAGS
+	export LDFLAGS
+	
+    export CXXCPP="/usr/bin/cpp"
+    export CPP="$CXXCPP"
+    export CXX="/usr/bin/gcc"
+    export CC="/usr/bin/gcc"
+    export LD="/usr/bin/ld"
+    export AR="/usr/bin/ar"
+    export AS="/usr/bin/ls"
+    export NM="/usr/bin/nm"
+    export RANLIB="/usr/bin/ranlib"
+    export STRIP="/usr/bin/strip"
+	
+    ./configure \
+    	--prefix=$DIST_DIR \
+		--host=${ARCH}-apple-darwin \
+		--with-sysroot=${PLATFORM}/Developer/SDKs/${IOSSDK}.sdk \
+		--enable-static=yes \
+		--enable-shared=no \
+	    --disable-doc \
+		${EXTRA_FLAGS}
+
+    echo "Installing opus for $ARCH..."
+    make clean
+    make -j$NJOB V=1
+    make install
+
+    cd $SCRIPT_DIR
+
+    if [ -d $DIST_DIR/bin ]
+    then
+      rm -rf $DIST_DIR/bin
+    fi
+    if [ -d $DIST_DIR/share ]
+    then
+      rm -rf $DIST_DIR/share
+    fi
+done

BuildScripts/Opus/combine.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+set -e
+
+source config.sh
+
+for ARCH in $ARCHS
+do
+
+  if [ -d dist-$ARCH ]
+  then
+    MAIN_ARCH=$ARCH
+  fi
+done
+
+if [ -z "$MAIN_ARCH" ]
+then
+  echo "Please compile an architecture"
+  exit 1
+fi
+
+
+OUTPUT_DIR="dist-uarch"
+rm -rf $OUTPUT_DIR
+
+mkdir -p $OUTPUT_DIR/lib $OUTPUT_DIR/include
+
+for LIB in dist-$MAIN_ARCH/lib/*.a
+do
+  LIB=`basename $LIB`
+  LIPO_CREATE=""
+  for ARCH in $ARCHS
+  do
+    LIPO_ARCH=$ARCH
+    if [ "$ARCH" = "aarch64" ];
+    then
+      LIPO_ARCH="arm64"
+    fi
+    if [ -d dist-$ARCH ]
+    then
+      LIPO_CREATE="$LIPO_CREATE-arch $LIPO_ARCH dist-$ARCH/lib/$LIB "
+    fi
+  done
+  OUTPUT="$OUTPUT_DIR/lib/$LIB"
+  echo "Creating: $OUTPUT"
+  xcrun -sdk iphoneos lipo -create $LIPO_CREATE -output $OUTPUT
+  xcrun -sdk iphoneos lipo -info $OUTPUT
+done
+
+echo "Copying headers from dist-$MAIN_ARCH..."
+cp -R dist-$MAIN_ARCH/include/* $OUTPUT_DIR/include

BuildScripts/Opus/config.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+OPUS_DIR="opus"
+IOSSDK_VER=8.1
+ARCHS="armv7 armv7s aarch64 i386 x86_64"
+
+remove_arch() {
+	OLD_ARCHS="$ARCHS"
+	NEW_ARCHS=""
+	REMOVAL="$1"
+
+	for ARCH in $OLD_ARCHS; do
+		if [ "$ARCH" != "$REMOVAL" ] ; then
+			NEW_ARCHS="$NEW_ARCHS $ARCH"
+		fi
+	done
+	
+	ARCHS=$NEW_ARCHS
+}
+
+# armv7s is only supported in iOS 6.0+
+CHECK=`echo $IOSSDK_VER '>= 6.0' | bc -l`
+if [ "$CHECK" = "0" ] ; then
+	remove_arch "armv7s"
+fi
+
+# armv6 is not supported any more since iOS 6.0
+CHECK=`echo $IOSSDK_VER '< 6.0' | bc -l`
+if [ "$CHECK" = "0" ] ; then
+	remove_arch "armv6"
+fi
+
+echo 'Architectures to build:' $ARCHS
+    
+
+

BuildScripts/Opus/sync.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+source config.sh
+
+SCRIPT_DIR=$( (cd -P $(dirname $0) && pwd) )
+DIST_DIR_BASE=${DIST_DIR_BASE:="$SCRIPT_DIR/dist"}
+
+git submodule update --init opus
+cd opus
+git checkout master 
+git pull origin master 
+cd ..
+
+for ARCH in $ARCHS
+do
+    OPUS_DIR=opus-$ARCH
+    echo "Syncing source for $ARCH to directory $OPUS_DIR"
+    rsync opus/ $OPUS_DIR/ --exclude '.*' -a --delete
+done