From owner-dev-commits-ports-all@freebsd.org Thu Jul 22 00:55:33 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E5926501EF; Thu, 22 Jul 2021 00:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GVYsK1jzmz4d5Q; Thu, 22 Jul 2021 00:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F313387; Thu, 22 Jul 2021 00:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16M0tW6x079589; Thu, 22 Jul 2021 00:55:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16M0tW8s079588; Thu, 22 Jul 2021 00:55:32 GMT (envelope-from git) Date: Thu, 22 Jul 2021 00:55:32 GMT Message-Id: <202107220055.16M0tW8s079588@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: efd1774d3aae - main - multimedia/handbrake: fix build on powerpc(64) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efd1774d3aae5206f74d0277df73ba89579643a7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 00:55:33 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=efd1774d3aae5206f74d0277df73ba89579643a7 commit efd1774d3aae5206f74d0277df73ba89579643a7 Author: Piotr Kubaj AuthorDate: 2021-07-22 00:55:24 +0000 Commit: Piotr Kubaj CommitDate: 2021-07-22 00:55:24 +0000 multimedia/handbrake: fix build on powerpc(64) For some reason, while there's no issue with building on powerpc64le, there's a problem on powerpc and powerpc64 (same as with multimedia/ffmpeg). --- multimedia/handbrake/Makefile | 3 +++ .../handbrake/files/P02-freebsd-ppc-libswscale.patch | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 12fae398fed2..6c47659f710e 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -128,6 +128,9 @@ pre-configure: # Following patches reduces warnings with clang. ${CP} ${FILESDIR}/P00-freebsd-libavutil-x86-asm-h.patch ${WRKSRC}/contrib/ffmpeg ${CP} ${FILESDIR}/P01-freebsd-ifo_types.h.patch ${WRKSRC}/contrib/libdvdread +# for powerpc64 +# picked from multimedia/ffmpeg/files/patch-libswscale_ppc_yuv2rgb__altivec.c + ${CP} ${FILESDIR}/P02-freebsd-ppc-libswscale.patch ${WRKSRC}/contrib/ffmpeg post-install-X11-on: ${LN} -sf ghb ${STAGEDIR}${PREFIX}/bin/HandBrake diff --git a/multimedia/handbrake/files/P02-freebsd-ppc-libswscale.patch b/multimedia/handbrake/files/P02-freebsd-ppc-libswscale.patch new file mode 100644 index 000000000000..1b6b9966f066 --- /dev/null +++ b/multimedia/handbrake/files/P02-freebsd-ppc-libswscale.patch @@ -0,0 +1,15 @@ +Error: +libswscale/ppc/yuv2rgb_altivec.c:288:36: error: redeclaration of 'vec_xl' must have the 'overloadable' attribute +static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr) + +--- a/libswscale/ppc/yuv2rgb_altivec.c.orig 2021-04-08 21:28:40 UTC ++++ b/libswscale/ppc/yuv2rgb_altivec.c +@@ -284,7 +284,7 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector s + * ------------------------------------------------------------------------------ + */ + +-#if !HAVE_VSX ++#if !HAVE_VSX && !defined(__clang__) + 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);