diff options
author | Sam Bingner <sam@bingner.com> | 2019-04-03 15:01:11 -1000 |
---|---|---|
committer | Sam Bingner <sam@bingner.com> | 2019-04-09 23:20:37 -1000 |
commit | 1a688304ccc6ef6f5eb2c361014c473b325c7283 (patch) | |
tree | ca0b08bd889b991f38049dc6051e743a76e93563 /data/vpx | |
parent | d1fe651fddace8beaa2f68e4d111cc053e6f08b9 (diff) |
Make libvpx compile
Diffstat (limited to 'data/vpx')
-rw-r--r-- | data/vpx/_metadata/description | 1 | ||||
-rw-r--r-- | data/vpx/_metadata/in.1443.00 | 0 | ||||
l--------- | data/vpx/_metadata/maintainer | 1 | ||||
-rw-r--r-- | data/vpx/_metadata/name | 1 | ||||
-rw-r--r-- | data/vpx/_metadata/priority | 1 | ||||
-rw-r--r-- | data/vpx/_metadata/role | 1 | ||||
-rw-r--r-- | data/vpx/_metadata/section | 1 | ||||
-rw-r--r-- | data/vpx/_metadata/tags | 1 | ||||
-rw-r--r-- | data/vpx/_metadata/version | 1 | ||||
-rw-r--r-- | data/vpx/libvpx-1.8.0.tar.gz | bin | 2879302 -> 0 bytes | |||
-rw-r--r-- | data/vpx/make.sh | 4 | ||||
-rw-r--r-- | data/vpx/toolchain.diff | 158 |
12 files changed, 0 insertions, 170 deletions
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 --- a/data/vpx/_metadata/in.1443.00 +++ /dev/null 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 Binary files differdeleted file mode 100644 index 8dc457e83..000000000 --- a/data/vpx/libvpx-1.8.0.tar.gz +++ /dev/null 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 |