diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2015-08-24 23:31:53 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-31 19:30:54 +0200 |
| commit | f45881b3822630eda5282b8f016d772c1670df70 (patch) | |
| tree | 717145b174b40e795530d6211abfe93e7291a9d0 /meta-oe/recipes-multimedia/webm/libvpx | |
| parent | 09078499f6b8cd6424c300dc0b1564576d0443ac (diff) | |
| download | meta-openembedded-contrib-f45881b3822630eda5282b8f016d772c1670df70.tar.gz | |
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>
Diffstat (limited to 'meta-oe/recipes-multimedia/webm/libvpx')
| -rw-r--r-- | meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch | 40 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch | 42 |
2 files changed, 21 insertions, 61 deletions
diff --git a/meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch b/meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch deleted file mode 100644 index bf94b2dce8..0000000000 --- a/meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch +++ /dev/null @@ -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 - diff --git a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch index 1bf863dfa2..c7a6e51e76 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch +++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch @@ -13,31 +13,31 @@ Fix configure to accept "--prefix=" (a blank prefix). ;; --libdir=*) libdir="${optval}" -@@ -471,13 +473,23 @@ - +@@ -587,13 +587,23 @@ process_cmdline() { + } post_process_common_cmdline() { -- prefix="${prefix:-/usr/local}" -+ if [ "$prefixset" != "1" ] -+ then -+ prefix=/usr/local -+ fi +- prefix="${prefix:-/usr/local}" ++ if [ "$prefixset" != "1" ] ++ then ++ prefix=/usr/local ++ fi + -+ # Strip trailing slash - prefix="${prefix%/}" ++ # 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 + 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 ++ case "$libdir" in ++ "${prefix}/"*) ;; ++ *) ++ die "Libdir ${libdir} must be a subdirectory of ${prefix}" ++ ;; ++ esac } - + post_process_cmdline() { |