diff options
Diffstat (limited to 'meta-oe/recipes-multimedia/webm')
-rw-r--r-- | meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch | 9 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb (renamed from meta-oe/recipes-multimedia/webm/libvpx_1.7.0.bb) | 16 |
2 files changed, 13 insertions, 12 deletions
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 6ad7f2b478..463651aa4a 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 @@ -1,19 +1,20 @@ -From dc0a5c3d2dd4e79d12a150a246a95c4dc88326f1 Mon Sep 17 00:00:00 2001 +From 2829e6998b7595dd2108c1497fdd02485ef99e2c Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Tue, 16 Aug 2011 16:04:35 +0200 Subject: [PATCH] Upstream: not yet Fix configure to accept "--prefix=" (a blank prefix). +Upstream-Status: Pending --- build/make/configure.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/build/make/configure.sh b/build/make/configure.sh -index 007e020..04d5cbf 100644 +index b645a666f..0b99a8b38 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -581,6 +581,8 @@ process_common_cmdline() { +@@ -658,6 +658,8 @@ process_common_cmdline() { ;; --prefix=*) prefix="${optval}" @@ -22,7 +23,7 @@ index 007e020..04d5cbf 100644 ;; --libdir=*) libdir="${optval}" -@@ -614,13 +616,23 @@ process_cmdline() { +@@ -687,13 +689,23 @@ process_cmdline() { } post_process_common_cmdline() { diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.7.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb index 1d04ed1bdb..b4d49842ea 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.7.0.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb @@ -3,14 +3,13 @@ DESCRIPTION = "The BSD-licensed libvpx reference implementation provides en- and HOMEPAGE = "http://www.webmproject.org/code/" BUGTRACKER = "http://code.google.com/p/webm/issues/list" SECTION = "libs/multimedia" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -# SRCREV for 1.7.0 -SRCREV = "133f83e2c34b8d770ae06aa595cef3e254173fcb" -SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https \ - file://libvpx-configure-support-blank-prefix.patch \ +SRCREV = "602e2e8979d111b02c959470da5322797dd96a19" +SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ + file://libvpx-configure-support-blank-prefix.patch \ " S = "${WORKDIR}/git" @@ -20,13 +19,12 @@ S = "${WORKDIR}/git" ARM_INSTRUCTION_SET = "arm" CFLAGS += "-fPIC" +BUILD_LDFLAGS += "-pthread" export CC export LD = "${CC}" -VPXTARGET_armv5te = "armv5te-linux-gcc" -VPXTARGET_armv6 = "armv6-linux-gcc" -VPXTARGET_armv7a = "armv7-linux-gcc" +VPXTARGET:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7-linux-gcc","generic-gnu",d)}" VPXTARGET ?= "generic-gnu" CONFIGUREOPTS = " \ @@ -49,3 +47,5 @@ do_install() { oe_runmake install DESTDIR=${D} chown -R root:root ${D} } + +BBCLASSEXTEND += "native" |