From 1a688304ccc6ef6f5eb2c361014c473b325c7283 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Wed, 3 Apr 2019 15:01:11 -1000 Subject: Make libvpx compile --- data/libvpx/_metadata/description | 1 + data/libvpx/_metadata/in.1443.00 | 0 data/libvpx/_metadata/license | 31 ++++++++ data/libvpx/_metadata/maintainer | 1 + data/libvpx/_metadata/priority | 1 + data/libvpx/_metadata/role | 1 + data/libvpx/_metadata/section | 1 + data/libvpx/_metadata/tags | 1 + data/libvpx/_metadata/version | 1 + data/libvpx/libvpx-1.8.0.tar.gz | Bin 0 -> 2879302 bytes data/libvpx/make.sh | 14 ++++ data/libvpx/toolchain.diff | 158 ++++++++++++++++++++++++++++++++++++++ data/libvpx/vp9symbols.diff | 11 +++ data/vpx/_metadata/description | 1 - data/vpx/_metadata/in.1443.00 | 0 data/vpx/_metadata/maintainer | 1 - data/vpx/_metadata/name | 1 - data/vpx/_metadata/priority | 1 - data/vpx/_metadata/role | 1 - data/vpx/_metadata/section | 1 - data/vpx/_metadata/tags | 1 - data/vpx/_metadata/version | 1 - data/vpx/libvpx-1.8.0.tar.gz | Bin 2879302 -> 0 bytes data/vpx/make.sh | 4 - data/vpx/toolchain.diff | 158 -------------------------------------- 25 files changed, 221 insertions(+), 170 deletions(-) create mode 100644 data/libvpx/_metadata/description create mode 100644 data/libvpx/_metadata/in.1443.00 create mode 100644 data/libvpx/_metadata/license create mode 120000 data/libvpx/_metadata/maintainer create mode 100644 data/libvpx/_metadata/priority create mode 100644 data/libvpx/_metadata/role create mode 100644 data/libvpx/_metadata/section create mode 100644 data/libvpx/_metadata/tags create mode 100644 data/libvpx/_metadata/version create mode 100644 data/libvpx/libvpx-1.8.0.tar.gz create mode 100644 data/libvpx/make.sh create mode 100644 data/libvpx/toolchain.diff create mode 100644 data/libvpx/vp9symbols.diff delete mode 100644 data/vpx/_metadata/description delete mode 100644 data/vpx/_metadata/in.1443.00 delete mode 120000 data/vpx/_metadata/maintainer delete mode 100644 data/vpx/_metadata/name delete mode 100644 data/vpx/_metadata/priority delete mode 100644 data/vpx/_metadata/role delete mode 100644 data/vpx/_metadata/section delete mode 100644 data/vpx/_metadata/tags delete mode 100644 data/vpx/_metadata/version delete mode 100644 data/vpx/libvpx-1.8.0.tar.gz delete mode 100644 data/vpx/make.sh delete mode 100644 data/vpx/toolchain.diff diff --git a/data/libvpx/_metadata/description b/data/libvpx/_metadata/description new file mode 100644 index 000000000..6bf7e93de --- /dev/null +++ b/data/libvpx/_metadata/description @@ -0,0 +1 @@ +VP8/VP9 video codec diff --git a/data/libvpx/_metadata/in.1443.00 b/data/libvpx/_metadata/in.1443.00 new file mode 100644 index 000000000..e69de29bb diff --git a/data/libvpx/_metadata/license b/data/libvpx/_metadata/license new file mode 100644 index 000000000..1ce44343c --- /dev/null +++ b/data/libvpx/_metadata/license @@ -0,0 +1,31 @@ +Copyright (c) 2010, The WebM Project authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + * Neither the name of Google, nor the WebM Project, nor the names + of its contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/data/libvpx/_metadata/maintainer b/data/libvpx/_metadata/maintainer new file mode 120000 index 000000000..0c538aadb --- /dev/null +++ b/data/libvpx/_metadata/maintainer @@ -0,0 +1 @@ +../../../people/mac \ No newline at end of file diff --git a/data/libvpx/_metadata/priority b/data/libvpx/_metadata/priority new file mode 100644 index 000000000..134d9bc32 --- /dev/null +++ b/data/libvpx/_metadata/priority @@ -0,0 +1 @@ +optional diff --git a/data/libvpx/_metadata/role b/data/libvpx/_metadata/role new file mode 100644 index 000000000..8d0320866 --- /dev/null +++ b/data/libvpx/_metadata/role @@ -0,0 +1 @@ +developer diff --git a/data/libvpx/_metadata/section b/data/libvpx/_metadata/section new file mode 100644 index 000000000..593877746 --- /dev/null +++ b/data/libvpx/_metadata/section @@ -0,0 +1 @@ +Multimedia diff --git a/data/libvpx/_metadata/tags b/data/libvpx/_metadata/tags new file mode 100644 index 000000000..a8928cec8 --- /dev/null +++ b/data/libvpx/_metadata/tags @@ -0,0 +1 @@ +purpose::library diff --git a/data/libvpx/_metadata/version b/data/libvpx/_metadata/version new file mode 100644 index 000000000..27f9cd322 --- /dev/null +++ b/data/libvpx/_metadata/version @@ -0,0 +1 @@ +1.8.0 diff --git a/data/libvpx/libvpx-1.8.0.tar.gz b/data/libvpx/libvpx-1.8.0.tar.gz new file mode 100644 index 000000000..8dc457e83 Binary files /dev/null and b/data/libvpx/libvpx-1.8.0.tar.gz differ diff --git a/data/libvpx/make.sh b/data/libvpx/make.sh new file mode 100644 index 000000000..b05758c7b --- /dev/null +++ b/data/libvpx/make.sh @@ -0,0 +1,14 @@ +pkg:setup +CROSS="${PKG_TARG}-" ./configure --target="${PKG_TARG}-gcc" --prefix=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/prefix") --disable-static --enable-shared --enable-examples \ + --enable-pic \ + --enable-shared \ + --disable-install-bins \ + --disable-install-srcs \ + --size-limit=16384x16384 \ + --enable-postproc \ + --enable-multi-res-encoding \ + --enable-temporal-denoising \ + --enable-vp9-temporal-denoising \ + --enable-vp9-postproc +pkg:make V=1 +pkg:install diff --git a/data/libvpx/toolchain.diff b/data/libvpx/toolchain.diff new file mode 100644 index 000000000..8f60f97f5 --- /dev/null +++ b/data/libvpx/toolchain.diff @@ -0,0 +1,158 @@ +diff -ur libvpx-1.8.0/build/make/Makefile libvpx-1.8.0+iPhone/build/make/Makefile +--- libvpx-1.8.0/build/make/Makefile 2019-02-04 07:02:33.000000000 -1000 ++++ libvpx-1.8.0+iPhone/build/make/Makefile 2019-04-03 14:16:22.000000000 -1000 +@@ -70,9 +70,15 @@ + ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/ + DIST_DIR?=dist + HOSTCC?=gcc ++ifeq ($(words $(subst -, ,$(TOOLCHAIN))),4) ++TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN))) ++TGT_OS:=$(word 3, $(subst -, ,$(TOOLCHAIN))) ++TGT_CC:=$(word 4, $(subst -, ,$(TOOLCHAIN))) ++else + TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN))) + TGT_OS:=$(word 2, $(subst -, ,$(TOOLCHAIN))) + TGT_CC:=$(word 3, $(subst -, ,$(TOOLCHAIN))) ++endif + quiet:=$(if $(or $(verbose), $(V)),, yes) + qexec=$(if $(quiet),@) + +diff -ur libvpx-1.8.0/build/make/configure.sh libvpx-1.8.0+iPhone/build/make/configure.sh +--- libvpx-1.8.0/build/make/configure.sh 2019-02-04 07:02:33.000000000 -1000 ++++ libvpx-1.8.0+iPhone/build/make/configure.sh 2019-04-03 14:17:28.000000000 -1000 +@@ -771,35 +771,27 @@ + # detect tgt_os + case "$gcctarget" in + *darwin10*) +- tgt_isa=x86_64 + tgt_os=darwin10 + ;; + *darwin11*) +- tgt_isa=x86_64 + tgt_os=darwin11 + ;; + *darwin12*) +- tgt_isa=x86_64 + tgt_os=darwin12 + ;; + *darwin13*) +- tgt_isa=x86_64 + tgt_os=darwin13 + ;; + *darwin14*) +- tgt_isa=x86_64 + tgt_os=darwin14 + ;; + *darwin15*) +- tgt_isa=x86_64 + tgt_os=darwin15 + ;; + *darwin16*) +- tgt_isa=x86_64 + tgt_os=darwin16 + ;; + *darwin17*) +- tgt_isa=x86_64 + tgt_os=darwin17 + ;; + x86_64*mingw32*) +@@ -838,9 +830,16 @@ + # + # Set up toolchain variables + # +- tgt_isa=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $1}') +- tgt_os=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $2}') +- tgt_cc=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $3}') ++ if [ "$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print NF}')" == "4" ]; then ++ tgt_isa=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $1}') ++ tgt_flavor=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $2}') ++ tgt_os=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $3}') ++ tgt_cc=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $4}') ++ else ++ tgt_isa=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $1}') ++ tgt_os=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $2}') ++ tgt_cc=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $3}') ++ fi + + # Mark the specific ISA requested as enabled + soft_enable ${tgt_isa} +@@ -876,12 +875,14 @@ + # Handle darwin variants. Newer SDKs allow targeting older + # platforms, so use the newest one available. + case ${toolchain} in +- arm*-darwin*) +- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" +- iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)" +- if [ -d "${iphoneos_sdk_dir}" ]; then +- add_cflags "-isysroot ${iphoneos_sdk_dir}" +- add_ldflags "-isysroot ${iphoneos_sdk_dir}" ++ arm*-darwin*|aarch64*-darwin*) ++ if [ -z "${CROSS}" ]; then ++ add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" ++ iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)" ++ if [ -d "${iphoneos_sdk_dir}" ]; then ++ add_cflags "-isysroot ${iphoneos_sdk_dir}" ++ add_ldflags "-isysroot ${iphoneos_sdk_dir}" ++ fi + fi + ;; + x86*-darwin*) +@@ -894,6 +895,8 @@ + esac + + case ${toolchain} in ++ aarch64-*-darwin*|arm-*-darwin*) ++ ;; + *-darwin8-*) + add_cflags "-mmacosx-version-min=10.4" + add_ldflags "-mmacosx-version-min=10.4" +@@ -1153,16 +1156,17 @@ + ;; + + darwin*) +- XCRUN_FIND="xcrun --sdk iphoneos --find" +- CXX="$(${XCRUN_FIND} clang++)" +- CC="$(${XCRUN_FIND} clang)" +- AR="$(${XCRUN_FIND} ar)" +- AS="$(${XCRUN_FIND} as)" +- STRIP="$(${XCRUN_FIND} strip)" +- NM="$(${XCRUN_FIND} nm)" +- RANLIB="$(${XCRUN_FIND} ranlib)" ++ if [ -z "${CROSS}" ]; then ++ XCRUN_FIND="xcrun --sdk iphoneos --find }" ++ CXX="${CXX:-$(${XCRUN_FIND}clang++)}" ++ CC="${CC:-$(${XCRUN_FIND}clang)}" ++ AR="${AR:-$(${XCRUN_FIND}ar)}" ++ AS="${AS:-$(${XCRUN_FIND}as)}" ++ STRIP="${STRIP:-$(${XCRUN_FIND}strip)}" ++ NM="${NM:-$(${XCRUN_FIND}nm)}" ++ RANLIB="${RANLIB:-$(${XCRUN_FIND}ranlib)}" + AS_SFX=.S +- LD="${CXX:-$(${XCRUN_FIND} ld)}" ++ LD="${CXX:-$(${XCRUN_FIND}ld)}" + + # ASFLAGS is written here instead of using check_add_asflags + # because we need to overwrite all of ASFLAGS and purge the +@@ -1208,6 +1212,7 @@ + check_add_asflags -fembed-bitcode + check_add_ldflags -fembed-bitcode + fi ++ fi + ;; + + linux*) +diff -ur libvpx-1.8.0/configure libvpx-1.8.0+iPhone/configure +--- libvpx-1.8.0/configure 2019-02-04 07:02:33.000000000 -1000 ++++ libvpx-1.8.0+iPhone/configure 2019-04-03 14:16:22.000000000 -1000 +@@ -100,9 +100,11 @@ + # alphabetically by architecture, generic-gnu last. + all_platforms="${all_platforms} arm64-android-gcc" + all_platforms="${all_platforms} arm64-darwin-gcc" ++all_platforms="${all_platforms} aarch64-apple-darwin17-gcc" + all_platforms="${all_platforms} arm64-linux-gcc" + all_platforms="${all_platforms} arm64-win64-gcc" + all_platforms="${all_platforms} arm64-win64-vs15" ++all_platforms="${all_platforms} arm-apple-darwin11-gcc" + all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8 + all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 + all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 diff --git a/data/libvpx/vp9symbols.diff b/data/libvpx/vp9symbols.diff new file mode 100644 index 000000000..49c1471d3 --- /dev/null +++ b/data/libvpx/vp9symbols.diff @@ -0,0 +1,11 @@ +diff -ur libvpx-1.8.0/libs.mk libvpx-1.8.0+iPhone/libs.mk +--- libvpx-1.8.0/libs.mk 2019-02-04 07:02:33.000000000 -1000 ++++ libvpx-1.8.0+iPhone/libs.mk 2019-04-03 14:50:11.000000000 -1000 +@@ -145,7 +145,6 @@ + endif + CODEC_EXPORTS-yes += vpx/exports_com + CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_enc +-CODEC_EXPORTS-$(CONFIG_VP9_ENCODER) += vpx/exports_spatial_svc + CODEC_EXPORTS-$(CONFIG_DECODERS) += vpx/exports_dec + + INSTALL-LIBS-yes += include/vpx/vpx_codec.h diff --git a/data/vpx/_metadata/description b/data/vpx/_metadata/description deleted file mode 100644 index 6bf7e93de..000000000 --- a/data/vpx/_metadata/description +++ /dev/null @@ -1 +0,0 @@ -VP8/VP9 video codec diff --git a/data/vpx/_metadata/in.1443.00 b/data/vpx/_metadata/in.1443.00 deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/vpx/_metadata/maintainer b/data/vpx/_metadata/maintainer deleted file mode 120000 index 0c538aadb..000000000 --- a/data/vpx/_metadata/maintainer +++ /dev/null @@ -1 +0,0 @@ -../../../people/mac \ No newline at end of file diff --git a/data/vpx/_metadata/name b/data/vpx/_metadata/name deleted file mode 100644 index 8720e86b1..000000000 --- a/data/vpx/_metadata/name +++ /dev/null @@ -1 +0,0 @@ -Vpx diff --git a/data/vpx/_metadata/priority b/data/vpx/_metadata/priority deleted file mode 100644 index 134d9bc32..000000000 --- a/data/vpx/_metadata/priority +++ /dev/null @@ -1 +0,0 @@ -optional diff --git a/data/vpx/_metadata/role b/data/vpx/_metadata/role deleted file mode 100644 index 8d0320866..000000000 --- a/data/vpx/_metadata/role +++ /dev/null @@ -1 +0,0 @@ -developer diff --git a/data/vpx/_metadata/section b/data/vpx/_metadata/section deleted file mode 100644 index 593877746..000000000 --- a/data/vpx/_metadata/section +++ /dev/null @@ -1 +0,0 @@ -Multimedia diff --git a/data/vpx/_metadata/tags b/data/vpx/_metadata/tags deleted file mode 100644 index a8928cec8..000000000 --- a/data/vpx/_metadata/tags +++ /dev/null @@ -1 +0,0 @@ -purpose::library diff --git a/data/vpx/_metadata/version b/data/vpx/_metadata/version deleted file mode 100644 index 27f9cd322..000000000 --- a/data/vpx/_metadata/version +++ /dev/null @@ -1 +0,0 @@ -1.8.0 diff --git a/data/vpx/libvpx-1.8.0.tar.gz b/data/vpx/libvpx-1.8.0.tar.gz deleted file mode 100644 index 8dc457e83..000000000 Binary files a/data/vpx/libvpx-1.8.0.tar.gz and /dev/null differ diff --git a/data/vpx/make.sh b/data/vpx/make.sh deleted file mode 100644 index 07366620e..000000000 --- a/data/vpx/make.sh +++ /dev/null @@ -1,4 +0,0 @@ -pkg:setup -CROSS="${PKG_TARG}-" ./configure --target="${PKG_TARG}-gcc" --prefix=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/prefix") --disable-static --enable-shared -pkg:make V=1 -pkg:install diff --git a/data/vpx/toolchain.diff b/data/vpx/toolchain.diff deleted file mode 100644 index 8f60f97f5..000000000 --- a/data/vpx/toolchain.diff +++ /dev/null @@ -1,158 +0,0 @@ -diff -ur libvpx-1.8.0/build/make/Makefile libvpx-1.8.0+iPhone/build/make/Makefile ---- libvpx-1.8.0/build/make/Makefile 2019-02-04 07:02:33.000000000 -1000 -+++ libvpx-1.8.0+iPhone/build/make/Makefile 2019-04-03 14:16:22.000000000 -1000 -@@ -70,9 +70,15 @@ - ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/ - DIST_DIR?=dist - HOSTCC?=gcc -+ifeq ($(words $(subst -, ,$(TOOLCHAIN))),4) -+TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN))) -+TGT_OS:=$(word 3, $(subst -, ,$(TOOLCHAIN))) -+TGT_CC:=$(word 4, $(subst -, ,$(TOOLCHAIN))) -+else - TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN))) - TGT_OS:=$(word 2, $(subst -, ,$(TOOLCHAIN))) - TGT_CC:=$(word 3, $(subst -, ,$(TOOLCHAIN))) -+endif - quiet:=$(if $(or $(verbose), $(V)),, yes) - qexec=$(if $(quiet),@) - -diff -ur libvpx-1.8.0/build/make/configure.sh libvpx-1.8.0+iPhone/build/make/configure.sh ---- libvpx-1.8.0/build/make/configure.sh 2019-02-04 07:02:33.000000000 -1000 -+++ libvpx-1.8.0+iPhone/build/make/configure.sh 2019-04-03 14:17:28.000000000 -1000 -@@ -771,35 +771,27 @@ - # detect tgt_os - case "$gcctarget" in - *darwin10*) -- tgt_isa=x86_64 - tgt_os=darwin10 - ;; - *darwin11*) -- tgt_isa=x86_64 - tgt_os=darwin11 - ;; - *darwin12*) -- tgt_isa=x86_64 - tgt_os=darwin12 - ;; - *darwin13*) -- tgt_isa=x86_64 - tgt_os=darwin13 - ;; - *darwin14*) -- tgt_isa=x86_64 - tgt_os=darwin14 - ;; - *darwin15*) -- tgt_isa=x86_64 - tgt_os=darwin15 - ;; - *darwin16*) -- tgt_isa=x86_64 - tgt_os=darwin16 - ;; - *darwin17*) -- tgt_isa=x86_64 - tgt_os=darwin17 - ;; - x86_64*mingw32*) -@@ -838,9 +830,16 @@ - # - # Set up toolchain variables - # -- tgt_isa=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $1}') -- tgt_os=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $2}') -- tgt_cc=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $3}') -+ if [ "$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print NF}')" == "4" ]; then -+ tgt_isa=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $1}') -+ tgt_flavor=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $2}') -+ tgt_os=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $3}') -+ tgt_cc=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $4}') -+ else -+ tgt_isa=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $1}') -+ tgt_os=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $2}') -+ tgt_cc=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $3}') -+ fi - - # Mark the specific ISA requested as enabled - soft_enable ${tgt_isa} -@@ -876,12 +875,14 @@ - # Handle darwin variants. Newer SDKs allow targeting older - # platforms, so use the newest one available. - case ${toolchain} in -- arm*-darwin*) -- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" -- iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)" -- if [ -d "${iphoneos_sdk_dir}" ]; then -- add_cflags "-isysroot ${iphoneos_sdk_dir}" -- add_ldflags "-isysroot ${iphoneos_sdk_dir}" -+ arm*-darwin*|aarch64*-darwin*) -+ if [ -z "${CROSS}" ]; then -+ add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" -+ iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)" -+ if [ -d "${iphoneos_sdk_dir}" ]; then -+ add_cflags "-isysroot ${iphoneos_sdk_dir}" -+ add_ldflags "-isysroot ${iphoneos_sdk_dir}" -+ fi - fi - ;; - x86*-darwin*) -@@ -894,6 +895,8 @@ - esac - - case ${toolchain} in -+ aarch64-*-darwin*|arm-*-darwin*) -+ ;; - *-darwin8-*) - add_cflags "-mmacosx-version-min=10.4" - add_ldflags "-mmacosx-version-min=10.4" -@@ -1153,16 +1156,17 @@ - ;; - - darwin*) -- XCRUN_FIND="xcrun --sdk iphoneos --find" -- CXX="$(${XCRUN_FIND} clang++)" -- CC="$(${XCRUN_FIND} clang)" -- AR="$(${XCRUN_FIND} ar)" -- AS="$(${XCRUN_FIND} as)" -- STRIP="$(${XCRUN_FIND} strip)" -- NM="$(${XCRUN_FIND} nm)" -- RANLIB="$(${XCRUN_FIND} ranlib)" -+ if [ -z "${CROSS}" ]; then -+ XCRUN_FIND="xcrun --sdk iphoneos --find }" -+ CXX="${CXX:-$(${XCRUN_FIND}clang++)}" -+ CC="${CC:-$(${XCRUN_FIND}clang)}" -+ AR="${AR:-$(${XCRUN_FIND}ar)}" -+ AS="${AS:-$(${XCRUN_FIND}as)}" -+ STRIP="${STRIP:-$(${XCRUN_FIND}strip)}" -+ NM="${NM:-$(${XCRUN_FIND}nm)}" -+ RANLIB="${RANLIB:-$(${XCRUN_FIND}ranlib)}" - AS_SFX=.S -- LD="${CXX:-$(${XCRUN_FIND} ld)}" -+ LD="${CXX:-$(${XCRUN_FIND}ld)}" - - # ASFLAGS is written here instead of using check_add_asflags - # because we need to overwrite all of ASFLAGS and purge the -@@ -1208,6 +1212,7 @@ - check_add_asflags -fembed-bitcode - check_add_ldflags -fembed-bitcode - fi -+ fi - ;; - - linux*) -diff -ur libvpx-1.8.0/configure libvpx-1.8.0+iPhone/configure ---- libvpx-1.8.0/configure 2019-02-04 07:02:33.000000000 -1000 -+++ libvpx-1.8.0+iPhone/configure 2019-04-03 14:16:22.000000000 -1000 -@@ -100,9 +100,11 @@ - # alphabetically by architecture, generic-gnu last. - all_platforms="${all_platforms} arm64-android-gcc" - all_platforms="${all_platforms} arm64-darwin-gcc" -+all_platforms="${all_platforms} aarch64-apple-darwin17-gcc" - all_platforms="${all_platforms} arm64-linux-gcc" - all_platforms="${all_platforms} arm64-win64-gcc" - all_platforms="${all_platforms} arm64-win64-vs15" -+all_platforms="${all_platforms} arm-apple-darwin11-gcc" - all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8 - all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 - all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 -- cgit v1.2.3