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 E7694138359 for ; Wed, 7 Oct 2020 17:07:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41405E0874; Wed, 7 Oct 2020 17:07:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 2B03EE0874 for ; Wed, 7 Oct 2020 17:07:08 +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 378EC33BEED for ; Wed, 7 Oct 2020 17:07:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4C4B33A for ; Wed, 7 Oct 2020 17:07:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1602090421.44b6376a81a1912b0a5337585b694d38521025e9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/, media-video/ffmpeg/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg/ffmpeg-4.3.1.ebuild media-video/ffmpeg/files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch X-VCS-Directories: media-video/ffmpeg/files/ media-video/ffmpeg/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 44b6376a81a1912b0a5337585b694d38521025e9 X-VCS-Branch: master Date: Wed, 7 Oct 2020 17:07:05 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d69465f2-cdae-4871-a33d-a4dfc28ee1ba X-Archives-Hash: 47361e6bd73f4022468a7ab02dd62950 commit: 44b6376a81a1912b0a5337585b694d38521025e9 Author: Sam James gentoo org> AuthorDate: Wed Oct 7 17:03:52 2020 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 7 17:07:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b6376a media-video/ffmpeg: fix ppc build for 4.3.1 See: https://trac.ffmpeg.org/ticket/8750 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.3.1.ebuild | 1 + .../files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild index e1d995bd1cf..f1f6178b251 100644 --- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild @@ -327,6 +327,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch "${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch + "${FILESDIR}"/${PN}-4.3-altivec-novsx-yuv2rgb.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch b/media-video/ffmpeg/files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch new file mode 100644 index 00000000000..40e7f916172 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch @@ -0,0 +1,23 @@ +Fixes build on ppc. +https://trac.ffmpeg.org/attachment/ticket/8750/ffmpeg_altivec_yuv2rgb_novsx.patch +diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c +index 536545293d..930ef6b98f 100644 +--- a/libswscale/ppc/yuv2rgb_altivec.c ++++ b/libswscale/ppc/yuv2rgb_altivec.c +@@ -283,6 +283,16 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y, + * ------------------------------------------------------------------------------ + */ + ++#if !HAVE_VSX ++static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr) ++{ ++ const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset); ++ vector unsigned char align_perm = vec_lvsl(offset, addr); ++ ++ return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm); ++} ++#endif /* !HAVE_VSX */ ++ + #define DEFCSP420_CVT(name, out_pixels) \ + static int altivec_ ## name(SwsContext *c, const unsigned char **in, \ + int *instrides, int srcSliceY, int srcSliceH, \