Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 62C4E84E87 for ; Thu, 9 Nov 2023 16:23:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id yRWEkfbR7Tnl for ; Thu, 9 Nov 2023 16:23:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A73F584CC8 for ; Thu, 9 Nov 2023 16:23:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A0FECFA2F; Thu, 9 Nov 2023 16:23:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169954702431280" MIME-Version: 1.0 Date: Thu, 9 Nov 2023 16:23:44 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/multimedia/x264 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20231109162344.A0FECFA2F@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169954702431280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Nov 9 16:23:44 UTC 2023 Modified Files: pkgsrc/multimedia/x264: Makefile Log Message: x264: Fix building on Darwin/powerpc by disabling (broken) Altivec ASM To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/x264/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169954702431280 Content-Disposition: inline Content-Length: 1359 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/x264/Makefile diff -u pkgsrc/multimedia/x264/Makefile:1.1 pkgsrc/multimedia/x264/Makefile:1.2 --- pkgsrc/multimedia/x264/Makefile:1.1 Mon Sep 26 17:00:21 2022 +++ pkgsrc/multimedia/x264/Makefile Thu Nov 9 16:23:44 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/09/26 17:00:21 adam Exp $ +# $NetBSD: Makefile,v 1.2 2023/11/09 16:23:44 nia Exp $ # Download https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 # Rename to x264-.tar.bz2 and upload to MASTER_SITE_LOCAL. @@ -20,10 +20,12 @@ WRKSRC= ${WRKDIR}/x264-stable # Assembler code still needs to be disabled on at least SunOS. # NetBSD/i386 needs ASM disabled to avoid text relocations. # NetBSD/mips needs ASM disabled because it uses the MSA extension +# Darwin/powerpc needs ASM disabled; it needs Altivec and build fails on G4. # (requires MIPS64 revision 2) and fails to build. .if ${OPSYS} == "SunOS" || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-mips*) + ${MACHINE_PLATFORM:MNetBSD-*-i386} || \ + ${MACHINE_PLATFORM:MNetBSD-*-mips*} || \ + ${MACHINE_PLATFORM:MDarwin-*-powerpc*} CONFIGURE_ARGS+= --disable-asm .elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \ (${OPSYS} == "Darwin" && ${MACHINE_ARCH} == "aarch64") --_----------=_169954702431280--