diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-10 23:39:20 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-10 23:45:22 +0200 |
| commit | 8b1c79dc5982aa13d7fc4c6fce82e9febe4ed8f7 (patch) | |
| tree | 975dfe2922f73fc37a24731fb6c26c8464d0f020 /media-video | |
| parent | app-text/grip: use doubleqoutes instead of single quotes. (diff) | |
| download | gentoo-8b1c79dc5982aa13d7fc4c6fce82e9febe4ed8f7.tar.gz gentoo-8b1c79dc5982aa13d7fc4c6fce82e9febe4ed8f7.tar.bz2 gentoo-8b1c79dc5982aa13d7fc4c6fce82e9febe4ed8f7.zip | |
media-video/vlc: Fix build with arm
Thanks-to: tt_1 <herrtimson@yahoo.de>
Tested-by: Alexey Korepanov <kaikaikai@yandex.ru>
Closes: https://bugs.gentoo.org/649798
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch | 65 | ||||
| -rw-r--r-- | media-video/vlc/vlc-3.0.1-r1.ebuild | 1 |
2 files changed, 66 insertions, 0 deletions
diff --git a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch new file mode 100644 index 000000000000..6ea45d5abf0b --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch @@ -0,0 +1,65 @@ +From: Janne Grunau <janne-vlc@jannau.net> +Date: Mon, 19 Feb 2018 00:47:53 +0100 +Subject: arm: make the assembler functions compatible with non ELF/gas + platforms +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Allow assembling arm neon functions for IOS and arm windows. + +Signed-off-by: Martin Storsjö <martin@martin.st> +(cherry picked from commit ec4d9649d1c03fe8f578db38b41dccdf5e11b005) +Signed-off-by: Thomas Guillem <thomas@gllm.fr> + +[Add modules/arm_neon/asm.S missing from orig tarball.] +--- + modules/arm_neon/asm.S | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + create mode 100644 modules/arm_neon/asm.S + +diff --git a/modules/arm_neon/asm.S b/modules/arm_neon/asm.S +new file mode 100644 +index 0000000..728391e +--- /dev/null ++++ b/modules/arm_neon/asm.S +@@ -0,0 +1,39 @@ ++/* ++ * Copyright (c) 2018 Janne Grunau <janne-libav@jannau.net> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifdef __APPLE__ ++# define EXTERN_ASM _ ++#else ++# define EXTERN_ASM ++#endif ++ ++#if defined(__APPLE__) || defined(_WIN32) ++# define HAVE_AS_ARCH_DIRECTIVE 0 ++# define HAVE_AS_FPU_DIRECTIVE 0 ++#else ++# define HAVE_AS_ARCH_DIRECTIVE 1 ++# define HAVE_AS_FPU_DIRECTIVE 1 ++#endif ++ ++.macro function name ++ .globl EXTERN_ASM\name ++#ifdef __ELF__ ++ .type EXTERN_ASM\name, %function ++#endif ++EXTERN_ASM\name: ++.endm diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.1-r1.ebuild index bc0c2a189e6b..f4d4543afd5e 100644 --- a/media-video/vlc/vlc-3.0.1-r1.ebuild +++ b/media-video/vlc/vlc-3.0.1-r1.ebuild @@ -226,6 +226,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460 "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 + "${FILESDIR}"/${P}-arm-neon-fix.patch # bug 649798 "${FILESDIR}"/${P}-qt-5.11.patch # TODO upstream ) |