recompiled opus for 64bit and added build scripts

2026-02-16 02:20:53 +00:00 · 2014-10-21 03:15:29 -04:00
parent f4f3d7df50
commit 1f19d4de9d
13 changed files with 427 additions and 48 deletions
--- a/BuildScripts/Opus/build.sh
+++ b/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
--- a/BuildScripts/Opus/combine.sh
+++ b/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
--- a/BuildScripts/Opus/config.sh
+++ b/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
+    
+
+
--- a/BuildScripts/Opus/sync.sh
+++ b/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
--- a/BuildScripts/build-ffmpeg.sh
+++ b/BuildScripts/build-ffmpeg.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+SYSROOT_iPHONE="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
+SYSROOT_SIMULATOR="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
+CC_IPHONE="xcrun -sdk iphoneos clang"
+CC_SIMULATOR="xcrun -sdk iphonesimulator clang"
+function build_one {
+    ./configure \
+        --prefix=$PREFIX \
+        --disable-ffmpeg \
+        --disable-ffplay \
+        --disable-ffprobe \
+        --disable-ffserver \
+        --disable-armv5te \
+        --disable-armv6 \
+        --disable-doc \
+        --disable-everything \
+        --disable-debug \
+        --enable-decoder=h264 \
+        --enable-avresample \
+        --enable-cross-compile \
+        --sysroot=$SYSROOT \
+        --target-os=darwin \
+        --cc="$CC" \
+        --extra-cflags="$CFLAGS" \
+        --extra-ldflags="$LDFLAGS" \
+        --enable-pic \
+        $ADDI_FLAGS
+    make clean && make -j4 && make install
+}
+
+
+# armv7
+function build_armv7 {
+    PREFIX="armv7"
+    SYSROOT=$SYSROOT_iPHONE
+    CC=$CC_IPHONE
+    CFLAGS="-arch armv7 -mfpu=neon -miphoneos-version-min=7.1 -fpic"
+    LDFLAGS="-arch armv7 -isysroot $SYSROOT_iPHONE -miphoneos-version-min=7.1"
+    ADDI_FLAGS="--arch=arm --cpu=cortex-a9"
+    build_one
+}
+
+# armv7s
+function build_armv7s {
+    PREFIX="armv7s"
+    SYSROOT=$SYSROOT_iPHONE
+    CC=$CC_IPHONE
+    CFLAGS="-arch armv7s -mfpu=neon -miphoneos-version-min=7.1"
+    LDFLAGS="-arch armv7s -isysroot $SYSROOT_iPHONE -miphoneos-version-min=7.1"
+    ADDI_FLAGS="--arch=arm --cpu=cortex-a9"
+    build_one
+}
+
+# i386
+function build_i386 {
+    PREFIX="i386"
+    SYSROOT=$SYSROOT_SIMULATOR
+    CC=$CC_SIMULATOR
+    CFLAGS="-arch i386"
+    LDFLAGS="-arch i386 -isysroot $SYSROOT_SIMULATOR -mios-simulator-version-min=7.1"
+    ADDI_FLAGS="--arch=i386 --cpu=i386 --disable-asm"
+    build_one
+}
+
+
+# create fat library
+function build_universal {
+    cd armv7/lib
+    for file in *.a
+    do
+        cd ../..
+        xcrun -sdk iphoneos lipo -output universal/lib/$file  -create \
+        -arch armv7 armv7/lib/$file \
+        -arch armv7s armv7s/lib/$file \
+        -arch i386 i386/lib/$file
+        echo "Universal $file created."
+        cd -
+    done
+    cd ../..
+}
+
+echo "FFmpeg directory?"
+read SOURCE
+
+cd $SOURCE
+
+if [ "$1" = "clean" ]
+    then
+        rm -r armv7 armv7s i386 universal
+        make clean
+        exit 0
+fi
+mkdir armv7
+mkdir armv7s
+mkdir i386
+mkdir -p universal/lib
+
+build_armv7
+build_armv7s
+build_i386
+build_universal
+echo "Ouput files in $SOURCE/armv7 $SOURCE/armv7s $SOURCE/i386 $SOURCE/universal"
+
--- a/BuildScripts/build-openssl.sh
+++ b/BuildScripts/build-openssl.sh
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+# Yay shell scripting! This script builds a static version of
+# OpenSSL ${OPENSSL_VERSION} for iOS 7.0 that contains code for
+# armv6, armv7, arm7s and i386.
+
+#set -x
+
+# Setup paths to stuff we need
+
+OPENSSL_VERSION="1.0.1h"
+
+DEVELOPER="/Applications/Xcode.app/Contents/Developer"
+
+SDK_VERSION="7.1"
+MIN_VERSION="7.1"
+
+IPHONEOS_PLATFORM="${DEVELOPER}/Platforms/iPhoneOS.platform"
+IPHONEOS_SDK="${IPHONEOS_PLATFORM}/Developer/SDKs/iPhoneOS.sdk"
+IPHONEOS_GCC="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
+
+IPHONESIMULATOR_PLATFORM="${DEVELOPER}/Platforms/iPhoneSimulator.platform"
+IPHONESIMULATOR_SDK="${IPHONESIMULATOR_PLATFORM}/Developer/SDKs/iPhoneSimulator.sdk"
+IPHONESIMULATOR_GCC="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
+
+# Make sure things actually exist
+
+if [ ! -d "$IPHONEOS_PLATFORM" ]; then
+  echo "Cannot find $IPHONEOS_PLATFORM"
+  exit 1
+fi
+
+if [ ! -d "$IPHONEOS_SDK" ]; then
+  echo "Cannot find $IPHONEOS_SDK"
+  exit 1
+fi
+
+if [ ! -x "$IPHONEOS_GCC" ]; then
+  echo "Cannot find $IPHONEOS_GCC"
+  exit 1
+fi
+
+if [ ! -d "$IPHONESIMULATOR_PLATFORM" ]; then
+  echo "Cannot find $IPHONESIMULATOR_PLATFORM"
+  exit 1
+fi
+
+if [ ! -d "$IPHONESIMULATOR_SDK" ]; then
+  echo "Cannot find $IPHONESIMULATOR_SDK"
+  exit 1
+fi
+
+if [ ! -x "$IPHONESIMULATOR_GCC" ]; then
+  echo "Cannot find $IPHONESIMULATOR_GCC"
+  exit 1
+fi
+
+# Clean up whatever was left from our previous build
+
+rm -rf include lib
+rm -rf /tmp/openssl-${OPENSSL_VERSION}-*
+rm -rf /tmp/openssl-${OPENSSL_VERSION}-*.*-log
+
+build()
+{
+   TARGET=$1
+   ARCH=$2
+   GCC=$3
+   SDK=$4
+   EXTRA=$5
+   rm -rf "openssl-${OPENSSL_VERSION}"
+   tar xfz "openssl-${OPENSSL_VERSION}.tar.gz"
+   pushd .
+   cd "openssl-${OPENSSL_VERSION}"
+   ./Configure ${TARGET} --openssldir="/tmp/openssl-${OPENSSL_VERSION}-${ARCH}" ${EXTRA} &> "/tmp/openssl-${OPENSSL_VERSION}-${ARCH}.log"
+   perl -i -pe 's|static volatile sig_atomic_t intr_signal|static volatile int intr_signal|' crypto/ui/ui_openssl.c
+   perl -i -pe "s|^CC= gcc|CC= ${GCC} -arch ${ARCH} -miphoneos-version-min=${MIN_VERSION}|g" Makefile
+   perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${SDK} \$1|g" Makefile
+   make &> "/tmp/openssl-${OPENSSL_VERSION}-${ARCH}.build-log"
+   make install &> "/tmp/openssl-${OPENSSL_VERSION}-${ARCH}.install-log"
+   popd
+   rm -rf "openssl-${OPENSSL_VERSION}"
+}
+
+mkdir openssl
+cd openssl
+if [ ! -e ${OPENSSL_VERSION}.tar.gz ]; then
+echo "Downloading ${OPENSSL_VERSION}.tar.gz"
+curl -O http://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
+else
+echo "Using ${OPENSSL_VERSION}.tar.gz"
+fi
+
+
+build "BSD-generic32" "armv7" "${IPHONEOS_GCC}" "${IPHONEOS_SDK}" ""
+build "BSD-generic32" "armv7s" "${IPHONEOS_GCC}" "${IPHONEOS_SDK}" ""
+build "BSD-generic64" "arm64" "${IPHONEOS_GCC}" "${IPHONEOS_SDK}" ""
+build "BSD-generic32" "i386" "${IPHONESIMULATOR_GCC}" "${IPHONESIMULATOR_SDK}" ""
+build "BSD-generic64" "x86_64" "${IPHONESIMULATOR_GCC}" "${IPHONESIMULATOR_SDK}" "-DOPENSSL_NO_ASM"
+
+#
+
+mkdir include
+cp -r /tmp/openssl-${OPENSSL_VERSION}-i386/include/openssl include/
+
+mkdir lib
+lipo \
+	"/tmp/openssl-${OPENSSL_VERSION}-armv7/lib/libcrypto.a" \
+	"/tmp/openssl-${OPENSSL_VERSION}-armv7s/lib/libcrypto.a" \
+	"/tmp/openssl-${OPENSSL_VERSION}-arm64/lib/libcrypto.a" \
+	"/tmp/openssl-${OPENSSL_VERSION}-i386/lib/libcrypto.a" \
+	"/tmp/openssl-${OPENSSL_VERSION}-x86_64/lib/libcrypto.a" \
+	-create -output lib/libcrypto.a
+lipo \
+	"/tmp/openssl-${OPENSSL_VERSION}-armv7/lib/libssl.a" \
+	"/tmp/openssl-${OPENSSL_VERSION}-armv7s/lib/libssl.a" \
+	"/tmp/openssl-${OPENSSL_VERSION}-arm64/lib/libssl.a" \
+	"/tmp/openssl-${OPENSSL_VERSION}-i386/lib/libssl.a" \
+	"/tmp/openssl-${OPENSSL_VERSION}-x86_64/lib/libssl.a" \
+	-create -output lib/libssl.a
+
+rm -rf "/tmp/openssl-${OPENSSL_VERSION}-*"
+rm -rf "/tmp/openssl-${OPENSSL_VERSION}-*.*-log"
+