summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia/webm
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-multimedia/webm')
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch8
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx_1.15.2.bb (renamed from meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb)5
2 files changed, 6 insertions, 7 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 463651aa4a..04c4804c05 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,4 +1,4 @@
1From 2829e6998b7595dd2108c1497fdd02485ef99e2c Mon Sep 17 00:00:00 2001 1From c71898649e300d7e5700cd247d7ae994c7faa406 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 16 Aug 2011 16:04:35 +0200 3Date: Tue, 16 Aug 2011 16:04:35 +0200
4Subject: [PATCH] Upstream: not yet 4Subject: [PATCH] Upstream: not yet
@@ -11,10 +11,10 @@ Upstream-Status: Pending
11 1 file changed, 16 insertions(+), 4 deletions(-) 11 1 file changed, 16 insertions(+), 4 deletions(-)
12 12
13diff --git a/build/make/configure.sh b/build/make/configure.sh 13diff --git a/build/make/configure.sh b/build/make/configure.sh
14index b645a666f..0b99a8b38 100644 14index 8220d5cbe..923daf8bc 100644
15--- a/build/make/configure.sh 15--- a/build/make/configure.sh
16+++ b/build/make/configure.sh 16+++ b/build/make/configure.sh
17@@ -658,6 +658,8 @@ process_common_cmdline() { 17@@ -699,6 +699,8 @@ process_common_cmdline() {
18 ;; 18 ;;
19 --prefix=*) 19 --prefix=*)
20 prefix="${optval}" 20 prefix="${optval}"
@@ -23,7 +23,7 @@ index b645a666f..0b99a8b38 100644
23 ;; 23 ;;
24 --libdir=*) 24 --libdir=*)
25 libdir="${optval}" 25 libdir="${optval}"
26@@ -687,13 +689,23 @@ process_cmdline() { 26@@ -728,13 +730,23 @@ process_cmdline() {
27 } 27 }
28 28
29 post_process_common_cmdline() { 29 post_process_common_cmdline() {
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.15.2.bb
index b4d49842ea..a7cd76e0c7 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb
+++ b/meta-oe/recipes-multimedia/webm/libvpx_1.15.2.bb
@@ -7,12 +7,11 @@ LICENSE = "BSD-3-Clause"
7 7
8LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
9 9
10SRCREV = "602e2e8979d111b02c959470da5322797dd96a19" 10SRCREV = "d168454ecd099805c675d4a98c66f4891373302a"
11SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ 11SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main;tag=v${PV} \
12 file://libvpx-configure-support-blank-prefix.patch \ 12 file://libvpx-configure-support-blank-prefix.patch \
13 " 13 "
14 14
15S = "${WORKDIR}/git"
16 15
17# ffmpeg links with this and fails 16# ffmpeg links with this and fails
18# 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' 17# 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'