summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-02-04 13:47:04 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-05 12:00:34 +0000
commitb5b12cec764fbe8c58c73dde31dea15b7dd28fd4 (patch)
treec9721ddec73ff1bf7f693059dfd061e6bb6548d3 /meta
parente03c56c30bbed25013323a062aeddd2665710afe (diff)
downloadpoky-b5b12cec764fbe8c58c73dde31dea15b7dd28fd4.tar.gz
x264: upgrade to latest revision
(From OE-Core rev: f7cc44c98792f7c2f479a9bd86d6ed9c96373c00) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch14
-rw-r--r--meta/recipes-multimedia/x264/x264_git.bb4
2 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
index 087a448eec..cb771fb0bf 100644
--- a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
+++ b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
@@ -1,4 +1,4 @@
1From 66b120079fb21ed38cab0900c63360b0a7853eaa Mon Sep 17 00:00:00 2001 1From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com> 2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 13 Dec 2016 14:22:32 -0700 3Date: Tue, 13 Dec 2016 14:22:32 -0700
4Subject: [PATCH] Fix X32 build by disabling asm 4Subject: [PATCH] Fix X32 build by disabling asm
@@ -12,15 +12,16 @@ doesn't successfully build at this time, and my assembly is very rusty.
12 12
13Upstream-Status: Pending 13Upstream-Status: Pending
14Signed-off-by: Christopher Larson <chris_larson@mentor.com> 14Signed-off-by: Christopher Larson <chris_larson@mentor.com>
15
15--- 16---
16 configure | 14 ++++++++++++-- 17 configure | 14 ++++++++++++--
17 1 file changed, 12 insertions(+), 2 deletions(-) 18 1 file changed, 12 insertions(+), 2 deletions(-)
18 19
19diff --git a/configure b/configure 20diff --git a/configure b/configure
20index 3109ec4..844aeae 100755 21index 51b128d..6ea9469 100755
21--- a/configure 22--- a/configure
22+++ b/configure 23+++ b/configure
23@@ -703,7 +703,13 @@ case $host_cpu in 24@@ -754,7 +754,13 @@ case $host_cpu in
24 AS_EXT=".asm" 25 AS_EXT=".asm"
25 ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" 26 ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
26 stack_alignment=16 27 stack_alignment=16
@@ -33,9 +34,9 @@ index 3109ec4..844aeae 100755
33+ fi 34+ fi
34+ fi 35+ fi
35 if [ "$SYS" = MACOSX ]; then 36 if [ "$SYS" = MACOSX ]; then
36 ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX" 37 ASFLAGS="$ASFLAGS -f macho64 -DPREFIX"
37 if cc_check '' "-arch x86_64"; then 38 if cc_check '' "-arch x86_64"; then
38@@ -722,7 +728,11 @@ case $host_cpu in 39@@ -773,7 +779,11 @@ case $host_cpu in
39 RCFLAGS="--target=pe-x86-64 $RCFLAGS" 40 RCFLAGS="--target=pe-x86-64 $RCFLAGS"
40 fi 41 fi
41 else 42 else
@@ -48,6 +49,3 @@ index 3109ec4..844aeae 100755
48 fi 49 fi
49 ;; 50 ;;
50 powerpc*) 51 powerpc*)
51--
522.8.0
53
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index f22930a0ee..39429a8809 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -14,9 +14,9 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \
14 " 14 "
15UPSTREAM_CHECK_COMMITS = "1" 15UPSTREAM_CHECK_COMMITS = "1"
16 16
17SRCREV = "72db437770fd1ce3961f624dd57a8e75ff65ae0b" 17SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c"
18 18
19PV = "r2917+git${SRCPV}" 19PV = "r2991+git${SRCPV}"
20 20
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22