From f45881b3822630eda5282b8f016d772c1670df70 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Mon, 24 Aug 2015 23:31:53 +0800 Subject: 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 Signed-off-by: Martin Jansa --- .../0001-configure.sh-quote-local-variables.patch | 40 ---------------- .../libvpx-configure-support-blank-prefix.patch | 42 ++++++++--------- meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb | 55 ---------------------- meta-oe/recipes-multimedia/webm/libvpx_1.4.0.bb | 53 +++++++++++++++++++++ 4 files changed, 74 insertions(+), 116 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch delete mode 100644 meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb create mode 100644 meta-oe/recipes-multimedia/webm/libvpx_1.4.0.bb 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 -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() { diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb deleted file mode 100644 index eb19a576da..0000000000 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "VPX multi-format codec" -DESCRIPTION = "The BSD-licensed libvpx reference implementation provides en- and decoders for VP8 and VP9 bitstreams." -HOMEPAGE = "http://www.webmproject.org/code/" -BUGTRACKER = "http://code.google.com/p/webm/issues/list" -SECTION = "libs/multimedia" -LICENSE = "BSD" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" - -SRC_URI += "http://webm.googlecode.com/files/libvpx-v${PV}.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}" - -# 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' -ARM_INSTRUCTION_SET = "arm" - -CFLAGS += "-fPIC" - -export CC -export LD = "${CC}" - -VPXTARGET_armv5te = "armv5te-linux-gcc" -VPXTARGET_armv6 = "armv6-linux-gcc" -VPXTARGET_armv7a = "armv7-linux-gcc" -VPXTARGET ?= "generic-gnu" - -CONFIGUREOPTS = " \ - --target=${VPXTARGET} \ - --enable-vp8 \ - --enable-vp9 \ - --enable-libs \ - --disable-install-docs \ - --disable-static \ - --enable-shared \ - --prefix=${prefix} \ - --libdir=${libdir} \ -" - -do_configure() { - ${S}/configure ${CONFIGUREOPTS} -} - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.4.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.4.0.bb new file mode 100644 index 0000000000..4d9d2fd97d --- /dev/null +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.4.0.bb @@ -0,0 +1,53 @@ +SUMMARY = "VPX multi-format codec" +DESCRIPTION = "The BSD-licensed libvpx reference implementation provides en- and decoders for VP8 and VP9 bitstreams." +HOMEPAGE = "http://www.webmproject.org/code/" +BUGTRACKER = "http://code.google.com/p/webm/issues/list" +SECTION = "libs/multimedia" +LICENSE = "BSD" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" + +SRC_URI += "http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${BP}.tar.bz2 \ + file://libvpx-configure-support-blank-prefix.patch \ + " +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' +ARM_INSTRUCTION_SET = "arm" + +CFLAGS += "-fPIC" + +export CC +export LD = "${CC}" + +VPXTARGET_armv5te = "armv5te-linux-gcc" +VPXTARGET_armv6 = "armv6-linux-gcc" +VPXTARGET_armv7a = "armv7-linux-gcc" +VPXTARGET ?= "generic-gnu" + +CONFIGUREOPTS = " \ + --target=${VPXTARGET} \ + --enable-vp8 \ + --enable-vp9 \ + --enable-libs \ + --disable-install-docs \ + --disable-static \ + --enable-shared \ + --prefix=${prefix} \ + --libdir=${libdir} \ +" + +do_configure() { + ${S}/configure ${CONFIGUREOPTS} +} + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + -- cgit v1.2.3-54-g00ecf