From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5ABDA1382C5 for ; Tue, 10 Apr 2018 21:45:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97908E0821; Tue, 10 Apr 2018 21:45:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61D0BE0821 for ; Tue, 10 Apr 2018 21:45:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A52D4335C0A for ; Tue, 10 Apr 2018 21:45:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 331A025D for ; Tue, 10 Apr 2018 21:45:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1523396722.8b1c79dc5982aa13d7fc4c6fce82e9febe4ed8f7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch media-video/vlc/vlc-3.0.1-r1.ebuild X-VCS-Directories: media-video/vlc/ media-video/vlc/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8b1c79dc5982aa13d7fc4c6fce82e9febe4ed8f7 X-VCS-Branch: master Date: Tue, 10 Apr 2018 21:45:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 76ae3d05-3c31-439a-92e2-c922f72d9ef5 X-Archives-Hash: 3b14d8b106ec890d236ea0d30462ea0a commit: 8b1c79dc5982aa13d7fc4c6fce82e9febe4ed8f7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 10 21:39:20 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 10 21:45:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1c79dc media-video/vlc: Fix build with arm Thanks-to: tt_1 yahoo.de> Tested-by: Alexey Korepanov yandex.ru> Closes: https://bugs.gentoo.org/649798 Package-Manager: Portage-2.3.28, Repoman-2.3.9 media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch | 65 ++++++++++++++++++++++ media-video/vlc/vlc-3.0.1-r1.ebuild | 1 + 2 files changed, 66 insertions(+) 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 00000000000..6ea45d5abf0 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch @@ -0,0 +1,65 @@ +From: Janne Grunau +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ö +(cherry picked from commit ec4d9649d1c03fe8f578db38b41dccdf5e11b005) +Signed-off-by: Thomas Guillem + +[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 ++ * ++ * 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 bc0c2a189e6..f4d4543afd5 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 )