Skip to content

V
vlc-2-2
Commit caa52414 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contribs: update libvpx to 1.4.0 

(cherry picked from commit 76c60ba677fb944ab7bcaca549eb106a1c53ad5a)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 151c5791
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 115 deletions
contrib/src/vpx/SHA512SUMS
View file @ caa52414
af26766a3336155c5bc7b8cce7c23228de054287b990f9cacdc35273384a7af4999c01bb623d12143f40107036308a8b3207081efe67936748503c30c985fd6b libvpx-v1.3.0.tar.bz2 70234220e0ed64db000689ec8bea02dadef938a4f4dea96e5781d361c15245456212c1b6aec2b698d32ed423e73917d2303009e49224a2237669cab416dd6984 libvpx-1.4.0.tar.bz2
contrib/src/vpx/libvpx-ios.patch
View file @ caa52414
diff -ru libvpx/build/make/configure.sh libvpx/build/make/configure.sh --- libvpx-1.4.0/build/make/configure.sh.orig 2015-05-05 16:10:54.667129298 +0200
--- libvpx/build/make/configure.sh 2014-11-04 21:34:04.000000000 +0100 +++ libvpx-1.4.0/build/make/configure.sh 2015-05-05 16:13:53.650560142 +0200
+++ libvpx/build/make/configure.sh 2014-11-04 21:36:12.000000000 +0100 @@ -745,58 +745,6 @@
@@ -714,59 +714,6 @@ # Minimum iOS version for all target platforms (darwin and iphonesimulator).
# PIC is probably what we want when building shared libs IOS_VERSION_MIN="6.0"
enabled shared && soft_enable pic
- # Handle darwin variants. Newer SDKs allow targeting older - # Handle darwin variants. Newer SDKs allow targeting older
- # platforms, so find the newest SDK available. - # platforms, so use the newest one available.
- case ${toolchain} in - case ${toolchain} in
- *-darwin*) - *-darwin*)
- if [ -z "${DEVELOPER_DIR}" ]; then - osx_sdk_dir="$(show_darwin_sdk_path macosx)"
- DEVELOPER_DIR=`xcode-select -print-path 2> /dev/null` - if [ -d "${osx_sdk_dir}" ]; then
- [ $? -ne 0 ] && OSX_SKIP_DIR_CHECK=1
- fi
- if [ -z "${OSX_SKIP_DIR_CHECK}" ]; then
- OSX_SDK_ROOTS="${DEVELOPER_DIR}/SDKs"
- OSX_SDK_VERSIONS="MacOSX10.4u.sdk MacOSX10.5.sdk MacOSX10.6.sdk"
- OSX_SDK_VERSIONS="${OSX_SDK_VERSIONS} MacOSX10.7.sdk"
- for v in ${OSX_SDK_VERSIONS}; do
- if [ -d "${OSX_SDK_ROOTS}/${v}" ]; then
- osx_sdk_dir="${OSX_SDK_ROOTS}/${v}"
- fi
- done
- fi
- ;;
- esac
-
- if [ -d "${osx_sdk_dir}" ]; then
- add_cflags "-isysroot ${osx_sdk_dir}" - add_cflags "-isysroot ${osx_sdk_dir}"
- add_ldflags "-isysroot ${osx_sdk_dir}" - add_ldflags "-isysroot ${osx_sdk_dir}"
- fi - fi
- ;;
- esac
- -
- case ${toolchain} in - case ${toolchain} in
- *-darwin8-*) - *-darwin8-*)
- add_cflags "-mmacosx-version-min=10.4" - add_cflags "-mmacosx-version-min=10.4"
- add_ldflags "-mmacosx-version-min=10.4" - add_ldflags "-mmacosx-version-min=10.4"
- ;; - ;;
- *-darwin9-*) - *-darwin9-*)
- add_cflags "-mmacosx-version-min=10.5" - add_cflags "-mmacosx-version-min=10.5"
- add_ldflags "-mmacosx-version-min=10.5" - add_ldflags "-mmacosx-version-min=10.5"
- ;; - ;;
- *-darwin10-*) - *-darwin10-*)
- add_cflags "-mmacosx-version-min=10.6" - add_cflags "-mmacosx-version-min=10.6"
- add_ldflags "-mmacosx-version-min=10.6" - add_ldflags "-mmacosx-version-min=10.6"
- ;; - ;;
- *-darwin11-*) - *-darwin11-*)
- add_cflags "-mmacosx-version-min=10.7" - add_cflags "-mmacosx-version-min=10.7"
- add_ldflags "-mmacosx-version-min=10.7" - add_ldflags "-mmacosx-version-min=10.7"
- ;; - ;;
- *-darwin12-*) - *-darwin12-*)
- add_cflags "-mmacosx-version-min=10.8" - add_cflags "-mmacosx-version-min=10.8"
- add_ldflags "-mmacosx-version-min=10.8" - add_ldflags "-mmacosx-version-min=10.8"
- ;; - ;;
- *-darwin13-*) - *-darwin13-*)
- add_cflags "-mmacosx-version-min=10.9" - add_cflags "-mmacosx-version-min=10.9"
- add_ldflags "-mmacosx-version-min=10.9" - add_ldflags "-mmacosx-version-min=10.9"
- ;; - ;;
- esac - *-darwin14-*)
- add_cflags "-mmacosx-version-min=10.10"
- add_ldflags "-mmacosx-version-min=10.10"
- ;;
- *-iphonesimulator-*)
- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
- add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
- iossim_sdk_dir="$(show_darwin_sdk_path iphonesimulator)"
- if [ -d "${iossim_sdk_dir}" ]; then
- add_cflags "-isysroot ${iossim_sdk_dir}"
- add_ldflags "-isysroot ${iossim_sdk_dir}"
- fi
- ;;
- esac
- -
# Handle Solaris variants. Solaris 10 needs -lposix4 # Handle Solaris variants. Solaris 10 needs -lposix4
case ${toolchain} in case ${toolchain} in
sparc-solaris-*) sparc-solaris-*)
@@ -1070,7 +1017,13 @@ @@ -1149,6 +1097,13 @@
;; case ${tgt_cc} in
gcc*) gcc*)
add_cflags -m${bits} add_cflags -m${bits}
- add_ldflags -m${bits} + case ${tgt_os} in
+ case ${tgt_os} in + darwin*)
+ darwin*) + ;;
+ ;; + *)
+ *) + add_ldflags -m${bits}
+ add_ldflags -m${bits} + ;;
+ ;; + esac
+ esac add_ldflags -m${bits}
link_with_cc=gcc ;;
tune_cflags="-march=" esac
setup_gnu_toolchain
contrib/src/vpx/libvpx-mac.patch
View file @ caa52414
libvpx's configure script hard-codes the SDK location of previous Xcode release in the /Developer folder. However, starting with Xcode 4.3, the SDKs moved to /Applications/Xcode.app/blabla --- libvpx-1.4.0/build/make/configure.sh.orig 2015-05-05 16:03:00.504713016 +0200
VLC's contrib system is clever enough to detect this, but libvpx fails miserably. However, they are providing a work-around for iOS and Android, which is expanded by this patch. +++ libvpx-1.4.0/build/make/configure.sh 2015-05-05 16:05:52.358003947 +0200
@@ -751,6 +751,12 @@
diff -ru libvpx/build/make/configure.sh libvpx/build/make/configure.sh ;;
--- libvpx/build/make/configure.sh 2012-06-08 10:26:47.000000000 +0200 esac
+++ libvpx-fixed/build/make/configure.sh 2012-06-08 10:26:07.000000000 +0200
@@ -628,6 +628,11 @@ + if [ -d "${sdk_path}" ]; then
if [ -d "/Developer/SDKs/MacOSX10.7.sdk" ]; then + case "${sdk_path}" in
osx_sdk_dir="/Developer/SDKs/MacOSX10.7.sdk" + darwin*) osx_sdk_dir=${sdk_path} ;;
fi + esac
+ fi
+
case ${toolchain} in
*-darwin8-*)
add_cflags "-mmacosx-version-min=10.4"
--- libvpx-1.4.0/build/make/configure.sh.orig 2015-05-05 16:06:31.502087047 +0200
+++ libvpx-1.4.0/build/make/configure.sh 2015-05-05 16:09:41.525727635 +0200
@@ -651,6 +651,12 @@
;;
esac
+ if [ -d "${sdk_path}" ]; then + if [ -d "${sdk_path}" ]; then
+ case "${sdk_path}" in + case "${sdk_path}" in
+ darwin*) osx_sdk_dir=${sdk_path} ;; + darwin*) osx_sdk_dir=${sdk_path} ;;
+ esac + esac
+ fi + fi
+
# detect tgt_os
case "$gcctarget" in
*darwin8*)
@@ -751,12 +757,6 @@
;;
esac
case ${toolchain} in - if [ -d "${sdk_path}" ]; then
*-darwin8-*) - case "${sdk_path}" in
- darwin*) osx_sdk_dir=${sdk_path} ;;
- esac
- fi
-
case ${toolchain} in
*-darwin8-*)
add_cflags "-mmacosx-version-min=10.4"
contrib/src/vpx/libvpx-no-cross.patch
View file @ caa52414
--- libvpx-v1.0.0/build/make/configure.sh.orig 2012-01-29 04:59:36.976441000 -0500 --- libvpx-1.4.0/build/make/configure.sh.orig 2015-05-05 16:00:58.682380921 +0200
+++ libvpx-v1.0.0/build/make/configure.sh 2012-01-29 04:59:46.684441001 -0500 +++ libvpx-1.4.0/build/make/configure.sh 2015-05-05 16:02:13.537147158 +0200
@@ -680,7 +680,6 @@ @@ -831,7 +831,6 @@
case ${tgt_cc} in case ${tgt_cc} in
gcc) gcc)
- CROSS=${CROSS:-arm-none-linux-gnueabi-} - CROSS=${CROSS:-arm-none-linux-gnueabi-}
link_with_cc=gcc link_with_cc=gcc
setup_gnu_toolchain setup_gnu_toolchain
arch_int=${tgt_isa##armv} arch_int=${tgt_isa##armv}
contrib/src/vpx/libvpx-sysroot.patch
View file @ caa52414
...@@ -8,24 +8,19 @@ correct sysroot. ...@@ -8,24 +8,19 @@ correct sysroot.
See also https://code.google.com/p/webm/issues/detail?id=809 See also https://code.google.com/p/webm/issues/detail?id=809
diff --git a/build/make/configure.sh b/build/make/configure.sh --- libvpx-1.4.0/build/make/configure.sh.orig 2015-05-05 15:57:26.568321902 +0200
index d4124c7..c420d25 100755 +++ libvpx-1.4.0/build/make/configure.sh 2015-05-05 15:59:04.860202562 +0200
--- a/build/make/configure.sh @@ -941,8 +941,11 @@
+++ b/build/make/configure.sh awk '{ print $1 }' | tail -1`
@@ -939,8 +939,11 @@ EOF fi
awk '{ print $1 }' | tail -1`
fi
- add_cflags "--sysroot=${alt_libc}" - add_cflags "--sysroot=${alt_libc}"
- add_ldflags "--sysroot=${alt_libc}" - add_ldflags "--sysroot=${alt_libc}"
+ # this may happen if toolchain binaries are outside the ndk dir + # this may happen if toolchain binaries are outside the ndk dir
+ if [ "${alt_libc}" ]; then + if [ "${alt_libc}" ]; then
+ add_cflags "--sysroot=${alt_libc}" + add_cflags "--sysroot=${alt_libc}"
+ add_ldflags "--sysroot=${alt_libc}" + add_ldflags "--sysroot=${alt_libc}"
+ fi + fi
# linker flag that routes around a CPU bug in some # linker flag that routes around a CPU bug in some
# Cortex-A8 implementations (NDK Dev Guide) # Cortex-A8 implementations (NDK Dev Guide)
--
1.8.3.2
contrib/src/vpx/rules.mak
View file @ caa52414
# libvpx # libvpx
VPX_VERSION := v1.3.0 VPX_VERSION := 1.4.0
VPX_URL := http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2 VPX_URL := http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-$(VPX_VERSION).tar.bz2
$(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2: $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
$(call download,$(VPX_URL)) $(call download,$(VPX_URL))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment