diff options
Diffstat (limited to 'meta/recipes-multimedia/x264')
3 files changed, 5 insertions, 88 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 deleted file mode 100644 index cb771fb0bf..0000000000 --- a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Christopher Larson <chris_larson@mentor.com> | ||
3 | Date: Tue, 13 Dec 2016 14:22:32 -0700 | ||
4 | Subject: [PATCH] Fix X32 build by disabling asm | ||
5 | |||
6 | This applies gentoo's x32 patch, adjusted slightly, which disables asm support | ||
7 | for x32 as well as correcting -m. | ||
8 | |||
9 | Debian has a different patch which does the same, and there's a superior yet | ||
10 | out of date patch series on the x264 list which keeps asm support enabled, but | ||
11 | doesn't successfully build at this time, and my assembly is very rusty. | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
15 | |||
16 | --- | ||
17 | configure | 14 ++++++++++++-- | ||
18 | 1 file changed, 12 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/configure b/configure | ||
21 | index 51b128d..6ea9469 100755 | ||
22 | --- a/configure | ||
23 | +++ b/configure | ||
24 | @@ -754,7 +754,13 @@ case $host_cpu in | ||
25 | AS_EXT=".asm" | ||
26 | ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" | ||
27 | stack_alignment=16 | ||
28 | - [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" | ||
29 | + if [ $compiler = GNU ]; then | ||
30 | + if cpp_check "" "" "__ILP32__" ; then | ||
31 | + CFLAGS="-mx32 $CFLAGS" && LDFLAGS="-mx32 $LDFLAGS" | ||
32 | + else | ||
33 | + CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" | ||
34 | + fi | ||
35 | + fi | ||
36 | if [ "$SYS" = MACOSX ]; then | ||
37 | ASFLAGS="$ASFLAGS -f macho64 -DPREFIX" | ||
38 | if cc_check '' "-arch x86_64"; then | ||
39 | @@ -773,7 +779,11 @@ case $host_cpu in | ||
40 | RCFLAGS="--target=pe-x86-64 $RCFLAGS" | ||
41 | fi | ||
42 | else | ||
43 | - ASFLAGS="$ASFLAGS -f elf64" | ||
44 | + if cpp_check "" "" "__ILP32__" ; then | ||
45 | + asm=no | ||
46 | + else | ||
47 | + ASFLAGS="$ASFLAGS -f elf64" | ||
48 | + fi | ||
49 | fi | ||
50 | ;; | ||
51 | powerpc*) | ||
diff --git a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch deleted file mode 100644 index 065e3b35b7..0000000000 --- a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From a72bf499a0674fc75eedf15008b424e28f67e4bd Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Gherzan <andrei@gherzan.ro> | ||
3 | Date: Fri, 2 Feb 2018 15:10:08 +0200 | ||
4 | Subject: [PATCH] dont default to cortex-a9 with neon | ||
5 | |||
6 | -march flag is not in CFLAGS so this will always default to | ||
7 | -mcpu=cortex-a8 -mfpu=neon. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
13 | --- | ||
14 | configure | 3 --- | ||
15 | 1 file changed, 3 deletions(-) | ||
16 | |||
17 | diff --git a/configure b/configure | ||
18 | index 0e3ef23..955b993 100755 | ||
19 | --- a/configure | ||
20 | +++ b/configure | ||
21 | @@ -911,9 +911,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then | ||
22 | fi | ||
23 | |||
24 | if [ $asm = auto -a $ARCH = ARM ] ; then | ||
25 | - # set flags so neon is built by default | ||
26 | - [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" | ||
27 | - | ||
28 | cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM | ||
29 | if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then | ||
30 | define HAVE_ARMV6 | ||
31 | -- | ||
32 | 2.4.0 | ||
33 | |||
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index e7d9e75e8d..fae88d24d1 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb | |||
@@ -8,13 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
8 | 8 | ||
9 | DEPENDS = "nasm-native" | 9 | DEPENDS = "nasm-native" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/mirror/x264;branch=stable;protocol=https \ | 11 | SRC_URI = "git://code.videolan.org/videolan/x264.git;branch=stable;protocol=https \ |
12 | file://don-t-default-to-cortex-a9-with-neon.patch \ | ||
13 | file://Fix-X32-build-by-disabling-asm.patch \ | ||
14 | " | 12 | " |
15 | UPSTREAM_CHECK_COMMITS = "1" | 13 | UPSTREAM_CHECK_COMMITS = "1" |
16 | 14 | ||
17 | SRCREV = "baee400fa9ced6f5481a728138fed6e867b0ff7f" | 15 | SRCREV = "31e19f92f00c7003fa115047ce50978bc98c3a0d" |
18 | 16 | ||
19 | PV = "r3039+git" | 17 | PV = "r3039+git" |
20 | 18 | ||
@@ -41,6 +39,7 @@ EXTRA_OECONF = '--prefix=${prefix} \ | |||
41 | --disable-opencl \ | 39 | --disable-opencl \ |
42 | --enable-pic \ | 40 | --enable-pic \ |
43 | ${X264_DISABLE_ASM} \ | 41 | ${X264_DISABLE_ASM} \ |
42 | --extra-cflags="${TUNE_CCARGS}" \ | ||
44 | ' | 43 | ' |
45 | 44 | ||
46 | do_configure() { | 45 | do_configure() { |
@@ -54,3 +53,5 @@ do_install() { | |||
54 | } | 53 | } |
55 | 54 | ||
56 | AS[unexport] = "1" | 55 | AS[unexport] = "1" |
56 | |||
57 | COMPATIBLE_HOST:x86-x32 = "null" | ||