summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx.inc38
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch40
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch69
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx/do-not-hardcode-softfp-float-api.patch28
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb19
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb55
6 files changed, 95 insertions, 154 deletions
diff --git a/meta-oe/recipes-multimedia/webm/libvpx.inc b/meta-oe/recipes-multimedia/webm/libvpx.inc
deleted file mode 100644
index 4d8ba9d82..000000000
--- a/meta-oe/recipes-multimedia/webm/libvpx.inc
+++ /dev/null
@@ -1,38 +0,0 @@
1DESCRIPTION = "vpx Multi-Format Codec SDK"
2LICENSE = "BSD"
3
4INC_PR = "r3"
5
6SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2"
7S = "${WORKDIR}/libvpx-v${PV}"
8
9# ffmpeg links with this and fails
10# 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'
11ARM_INSTRUCTION_SET = "arm"
12
13CFLAGS += "-fPIC"
14
15export CC
16export LD = "${CC}"
17
18VPXTARGET_armv5te = "armv5te-linux-gcc"
19VPXTARGET_armv6 = "armv6-linux-gcc"
20VPXTARGET_armv7a = "armv7-linux-gcc"
21VPXTARGET ?= "generic-gnu"
22
23CONFIGUREOPTS = " \
24 --target=${VPXTARGET} \
25 --enable-vp8 \
26 --enable-libs \
27 --disable-install-docs \
28"
29do_configure() {
30 ${S}/configure ${CONFIGUREOPTS}
31}
32do_compile() {
33 oe_runmake
34}
35do_install() {
36 oe_runmake install DESTDIR=${D}
37}
38
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
new file mode 100644
index 000000000..bf94b2dce
--- /dev/null
+++ b/meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch
@@ -0,0 +1,40 @@
1From f45fe1668401d72c2937a52385b492216715c0f9 Mon Sep 17 00:00:00 2001
2From: James Zern <jzern@google.com>
3Date: Thu, 6 Mar 2014 15:58:37 -0800
4Subject: [PATCH] configure.sh: quote local variables
5
6fixes issue #711
7
8specifying a multiword CC, e.g., CC='gcc -m32', would cause the failure
9under dash
10
11reported in
12https://bugs.gentoo.org/show_bug.cgi?id=498136
13
14patch by floppymaster at gmail dot com
15
16Upstream-Status: Backport [f45fe1668401d72c2937a52385b492216715c0f9]
17
18Change-Id: I2ba246f765646161538622739961ec0f6c2d8c2d
19---
20 build/make/configure.sh | 4 ++--
21 1 file changed, 2 insertions(+), 2 deletions(-)
22
23diff --git a/build/make/configure.sh b/build/make/configure.sh
24index 449d1b9..43f8e77 100755
25--- a/build/make/configure.sh
26+++ b/build/make/configure.sh
27@@ -405,8 +405,8 @@ true
28 }
29
30 write_common_target_config_mk() {
31- local CC=${CC}
32- local CXX=${CXX}
33+ local CC="${CC}"
34+ local CXX="${CXX}"
35 enabled ccache && CC="ccache ${CC}"
36 enabled ccache && CXX="ccache ${CXX}"
37 print_webm_license $1 "##" ""
38--
391.8.3.2
40
diff --git a/meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch b/meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch
deleted file mode 100644
index 37f5108a5..000000000
--- a/meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From: John Koleszar <jkoleszar@google.com>
2Date: Thu, 4 Nov 2010 20:59:26 +0000 (-0400)
3Subject: fix integer promotion bug in partition size check
4X-Git-Url: https://review.webmproject.org/gitweb?p=libvpx.git;a=commitdiff_plain;h=9fb80f7170ec48e23c3c7b477149eeb37081c699
5
6fix integer promotion bug in partition size check
7
8The check '(user_data_end - partition < partition_size)' must be
9evaluated as a signed comparison, but because partition_size was
10unsigned, the LHS was promoted to unsigned, causing an incorrect
11result on 32-bit. Instead, check the upper and lower bounds of
12the segment separately.
13
14Change-Id: I6266aba7fd7de084268712a3d2a81424ead7aa06
15---
16
17diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
18index 2d81d61..f5e49a1 100644
19--- a/vp8/decoder/decodframe.c
20+++ b/vp8/decoder/decodframe.c
21@@ -462,7 +462,8 @@ static void setup_token_decoder(VP8D_COMP *pbi,
22 partition_size = user_data_end - partition;
23 }
24
25- if (user_data_end - partition < partition_size)
26+ if (partition + partition_size > user_data_end
27+ || partition + partition_size < partition)
28 vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
29 "Truncated packet or corrupt partition "
30 "%d length", i + 1);
31@@ -580,7 +581,8 @@ int vp8_decode_frame(VP8D_COMP *pbi)
32 (data[0] | (data[1] << 8) | (data[2] << 16)) >> 5;
33 data += 3;
34
35- if (data_end - data < first_partition_length_in_bytes)
36+ if (data + first_partition_length_in_bytes > data_end
37+ || data + first_partition_length_in_bytes < data)
38 vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
39 "Truncated packet or corrupt partition 0 length");
40 vp8_setup_version(pc);
41diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c
42index e7e5356..f0adf5b 100644
43--- a/vp8/vp8_dx_iface.c
44+++ b/vp8/vp8_dx_iface.c
45@@ -253,8 +253,11 @@ static vpx_codec_err_t vp8_peek_si(const uint8_t *data,
46 unsigned int data_sz,
47 vpx_codec_stream_info_t *si)
48 {
49-
50 vpx_codec_err_t res = VPX_CODEC_OK;
51+
52+ if(data + data_sz <= data)
53+ res = VPX_CODEC_INVALID_PARAM;
54+ else
55 {
56 /* Parse uncompresssed part of key frame header.
57 * 3 bytes:- including version, frame type and an offset
58@@ -331,7 +334,10 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx,
59
60 ctx->img_avail = 0;
61
62- /* Determine the stream parameters */
63+ /* Determine the stream parameters. Note that we rely on peek_si to
64+ * validate that we have a buffer that does not wrap around the top
65+ * of the heap.
66+ */
67 if (!ctx->si.h)
68 res = ctx->base.iface->dec.peek_si(data, data_sz, &ctx->si);
69
diff --git a/meta-oe/recipes-multimedia/webm/libvpx/do-not-hardcode-softfp-float-api.patch b/meta-oe/recipes-multimedia/webm/libvpx/do-not-hardcode-softfp-float-api.patch
deleted file mode 100644
index d87169421..000000000
--- a/meta-oe/recipes-multimedia/webm/libvpx/do-not-hardcode-softfp-float-api.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
2
3Upstream-Status: Inappopriate [upstream has it done in other way]
4
5Problem is solved upstream but we have quite old version so backporting patches
6is waste of time.
7
8---
9 build/make/configure.sh | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12--- libvpx-v0.9.5.orig/build/make/configure.sh
13+++ libvpx-v0.9.5/build/make/configure.sh
14@@ -659,12 +659,12 @@ process_common_toolchain() {
15 if enabled iwmmxt || enabled iwmmxt2
16 then
17 check_add_asflags -mcpu=${tgt_isa}
18 elif enabled armv7
19 then
20- check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-ftree-vectorize
21- check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-march=armv7-a
22+ check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon #-ftree-vectorize
23+ check_add_asflags -mcpu=cortex-a8 -mfpu=neon #-march=armv7-a
24 else
25 check_add_cflags -march=${tgt_isa}
26 check_add_asflags -march=${tgt_isa}
27 fi
28
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb b/meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb
deleted file mode 100644
index 597d0e14c..000000000
--- a/meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1require libvpx.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE;md5=6e8dee932c26f2dab503abf70c96d8bb"
4
5PR = "${INC_PR}.0"
6
7SRC_URI += "file://libvpx-configure-support-blank-prefix.patch \
8 file://do-not-hardcode-softfp-float-api.patch \
9 file://CVE-2010-4203.patch \
10"
11
12SRC_URI[md5sum] = "4bf2f2c76700202c1fe9201fcb0680e3"
13SRC_URI[sha256sum] = "2e93968afcded113a7e218de047feecf6659a089058803a9e40fb687de5f9bfa"
14
15CONFIGUREOPTS += " \
16 --prefix=${prefix} \
17 --libdir=${libdir} \
18"
19
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb
new file mode 100644
index 000000000..eb19a576d
--- /dev/null
+++ b/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb
@@ -0,0 +1,55 @@
1SUMMARY = "VPX multi-format codec"
2DESCRIPTION = "The BSD-licensed libvpx reference implementation provides en- and decoders for VP8 and VP9 bitstreams."
3HOMEPAGE = "http://www.webmproject.org/code/"
4BUGTRACKER = "http://code.google.com/p/webm/issues/list"
5SECTION = "libs/multimedia"
6LICENSE = "BSD"
7
8LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
9
10SRC_URI += "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2 \
11 file://libvpx-configure-support-blank-prefix.patch \
12 file://0001-configure.sh-quote-local-variables.patch"
13SRC_URI[md5sum] = "14783a148872f2d08629ff7c694eb31f"
14SRC_URI[sha256sum] = "d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9"
15
16S = "${WORKDIR}/libvpx-v${PV}"
17
18# ffmpeg links with this and fails
19# 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'
20ARM_INSTRUCTION_SET = "arm"
21
22CFLAGS += "-fPIC"
23
24export CC
25export LD = "${CC}"
26
27VPXTARGET_armv5te = "armv5te-linux-gcc"
28VPXTARGET_armv6 = "armv6-linux-gcc"
29VPXTARGET_armv7a = "armv7-linux-gcc"
30VPXTARGET ?= "generic-gnu"
31
32CONFIGUREOPTS = " \
33 --target=${VPXTARGET} \
34 --enable-vp8 \
35 --enable-vp9 \
36 --enable-libs \
37 --disable-install-docs \
38 --disable-static \
39 --enable-shared \
40 --prefix=${prefix} \
41 --libdir=${libdir} \
42"
43
44do_configure() {
45 ${S}/configure ${CONFIGUREOPTS}
46}
47
48do_compile() {
49 oe_runmake
50}
51
52do_install() {
53 oe_runmake install DESTDIR=${D}
54}
55