mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
libvpx: 1.3.0 -> 1.4.0
* update SRC_URI * remove re-definition of S * drop backport patch 0001-configure.sh-quote-local-variables.patch * update context of libvpx-configure-support-blank-prefix.patch Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
09078499f6
commit
f45881b382
|
|
@ -1,40 +0,0 @@
|
|||
From f45fe1668401d72c2937a52385b492216715c0f9 Mon Sep 17 00:00:00 2001
|
||||
From: James Zern <jzern@google.com>
|
||||
Date: Thu, 6 Mar 2014 15:58:37 -0800
|
||||
Subject: [PATCH] configure.sh: quote local variables
|
||||
|
||||
fixes issue #711
|
||||
|
||||
specifying a multiword CC, e.g., CC='gcc -m32', would cause the failure
|
||||
under dash
|
||||
|
||||
reported in
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=498136
|
||||
|
||||
patch by floppymaster at gmail dot com
|
||||
|
||||
Upstream-Status: Backport [f45fe1668401d72c2937a52385b492216715c0f9]
|
||||
|
||||
Change-Id: I2ba246f765646161538622739961ec0f6c2d8c2d
|
||||
---
|
||||
build/make/configure.sh | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
||||
index 449d1b9..43f8e77 100755
|
||||
--- a/build/make/configure.sh
|
||||
+++ b/build/make/configure.sh
|
||||
@@ -405,8 +405,8 @@ true
|
||||
}
|
||||
|
||||
write_common_target_config_mk() {
|
||||
- local CC=${CC}
|
||||
- local CXX=${CXX}
|
||||
+ local CC="${CC}"
|
||||
+ local CXX="${CXX}"
|
||||
enabled ccache && CC="ccache ${CC}"
|
||||
enabled ccache && CXX="ccache ${CXX}"
|
||||
print_webm_license $1 "##" ""
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -13,31 +13,31 @@ Fix configure to accept "--prefix=" (a blank prefix).
|
|||
;;
|
||||
--libdir=*)
|
||||
libdir="${optval}"
|
||||
@@ -471,13 +473,23 @@
|
||||
|
||||
|
||||
post_process_common_cmdline() {
|
||||
- prefix="${prefix:-/usr/local}"
|
||||
+ if [ "$prefixset" != "1" ]
|
||||
+ then
|
||||
+ prefix=/usr/local
|
||||
+ fi
|
||||
+
|
||||
+ # Strip trailing slash
|
||||
prefix="${prefix%/}"
|
||||
+
|
||||
libdir="${libdir:-${prefix}/lib}"
|
||||
libdir="${libdir%/}"
|
||||
- if [ "${libdir#${prefix}}" = "${libdir}" ]; then
|
||||
- die "Libdir ${libdir} must be a subdirectory of ${prefix}"
|
||||
- fi
|
||||
+
|
||||
+ case "$libdir" in
|
||||
+ "${prefix}/"*) ;;
|
||||
+ *)
|
||||
+ die "Libdir ${libdir} must be a subdirectory of ${prefix}"
|
||||
+ ;;
|
||||
+ esac
|
||||
@@ -587,13 +587,23 @@ process_cmdline() {
|
||||
}
|
||||
|
||||
post_process_common_cmdline() {
|
||||
- prefix="${prefix:-/usr/local}"
|
||||
+ if [ "$prefixset" != "1" ]
|
||||
+ then
|
||||
+ prefix=/usr/local
|
||||
+ fi
|
||||
+
|
||||
+ # Strip trailing slash
|
||||
prefix="${prefix%/}"
|
||||
+
|
||||
libdir="${libdir:-${prefix}/lib}"
|
||||
libdir="${libdir%/}"
|
||||
- if [ "${libdir#${prefix}}" = "${libdir}" ]; then
|
||||
- die "Libdir ${libdir} must be a subdirectory of ${prefix}"
|
||||
- fi
|
||||
+
|
||||
+ case "$libdir" in
|
||||
+ "${prefix}/"*) ;;
|
||||
+ *)
|
||||
+ die "Libdir ${libdir} must be a subdirectory of ${prefix}"
|
||||
+ ;;
|
||||
+ esac
|
||||
}
|
||||
|
||||
post_process_cmdline() {
|
||||
|
|
|
|||
|
|
@ -7,13 +7,11 @@ LICENSE = "BSD"
|
|||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
|
||||
|
||||
SRC_URI += "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2 \
|
||||
SRC_URI += "http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${BP}.tar.bz2 \
|
||||
file://libvpx-configure-support-blank-prefix.patch \
|
||||
file://0001-configure.sh-quote-local-variables.patch"
|
||||
SRC_URI[md5sum] = "14783a148872f2d08629ff7c694eb31f"
|
||||
SRC_URI[sha256sum] = "d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9"
|
||||
|
||||
S = "${WORKDIR}/libvpx-v${PV}"
|
||||
"
|
||||
SRC_URI[md5sum] = "63b1d7f59636a42eeeee9225cc14e7de"
|
||||
SRC_URI[sha256sum] = "f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4"
|
||||
|
||||
# ffmpeg links with this and fails
|
||||
# sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
|
||||
Loading…
Reference in New Issue
Block a user