From nobody Wed Jan 10 09:47:21 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T92yd57q5z56Qmc; Wed, 10 Jan 2024 09:47:21 +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 4T92yd3gDZz48ZF; Wed, 10 Jan 2024 09:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704880041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bL/DwXHmfO8t7xF7cBqTxuWRQjTH7nRqORtUFzxxQSw=; b=LJOBAeylrbUQoIG55ERzv5zsceSPot5xpC/UPZxLCtB8MOSArtIPzaSoxh9ZBP2V8ieJHI VKtJ0PJUuxCpeg4IxS1Kt2CjLsEYLyMbvfvQS2dJ7Bd6Eyq+97lYIyTMGre/NSp4PGnejr wR2a0i/P4ZJ+3hjHfxyVMql2IZ69Xi1Vwr/SUYra7caQkd2Dkt+EetjV92EBwZUdxy1GH4 +/KGMdweptTMvmC4OgnFQecZ+YEbi/WQZ8mCzQgmoW5wSfoBE/2c6xC5hqagJrQ2GeYkNd 5LZFwxjlCY/QCqHjWRX9wDzU6WKUHin6qUcx+rxcotLwf+W3todDsZGIBssqJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704880041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bL/DwXHmfO8t7xF7cBqTxuWRQjTH7nRqORtUFzxxQSw=; b=rOP3Lz/xxLZw2BRJ0GTuuggrQyNdmW3AxZVTLTP4FU5P28dZY+H1s08yz+ehgZxAt1MudH hM6Sm+qG0RI1GJNfmNyIKkfleI+KxPHVc3uJOP2nTnMVFJh41UK2HnJ8xLBotBVzm8WLCd NAWegBWVXrTuhffUv3ky3b9oUrpcsTFXRwSeReSRLJbvLCAbgDqf2lT3ZNTzGff+HyWxM3 eXFxPOrTOQ0FnC+rWpOsk6ocZxrMzZDOBI1RIlJLUo1i/Sym9GD5+hb7DotMQC4wH3uYpE U4q0Ldt/y4nlm7JYYiecqxO8FJziSxgSNn/udGe40p9rTEKEPZ/F/Ih6lNx/Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704880041; a=rsa-sha256; cv=none; b=k8bVnyGsZNLgGwNQJy2ji+vPG5QIzVo1YuQK+UipRHU0O3jdwIo9kdWcehXbGKjl1bmLNr IcWZg863qUYfLKVryv3yqvu1JW6hOiPb1z8l5gOesbm6IJV6qyZdgpyG2QotDS2fYYMPtV fjJWtyYFpLds3+r2qES2mb2WXrJCzToCC2gU8SuiqqTxrHTnRs/JwH22kDhWV89L33yasy Y/QW0Hz7uPROsO6L642vbNLY8AmAMb6cagNXu/khXQidA0lf0dsDR0jQEQSi2UH+0FjkMf /4qYwSDw1e700YkzGJ74daWtZk4RBTcLRFX+0gVdRSvJHApVjgRwvyVuLsI3lA== 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 4T92yd2knVzW6G; Wed, 10 Jan 2024 09:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40A9lL4X076677; Wed, 10 Jan 2024 09:47:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40A9lLhu076675; Wed, 10 Jan 2024 09:47:21 GMT (envelope-from git) Date: Wed, 10 Jan 2024 09:47:21 GMT Message-Id: <202401100947.40A9lLhu076675@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: 951dfc6f76db - main - multimedia/libx264: fix build on powerpc64le on 15 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 951dfc6f76dba7e53ebd8d4497918b4fc8c953b6 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=951dfc6f76dba7e53ebd8d4497918b4fc8c953b6 commit 951dfc6f76dba7e53ebd8d4497918b4fc8c953b6 Author: Piotr Kubaj AuthorDate: 2024-01-05 22:58:04 +0000 Commit: Piotr Kubaj CommitDate: 2024-01-10 09:46:56 +0000 multimedia/libx264: fix build on powerpc64le on 15 cc: error: unsupported option '-mabi=' for target 'powerpc64le-unknown-freebsd15.0' --- multimedia/libx264/Makefile | 3 --- multimedia/x264/files/patch-configure | 27 ++++++++++++++++++--------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/multimedia/libx264/Makefile b/multimedia/libx264/Makefile index 819813278a9d..487cb9514621 100644 --- a/multimedia/libx264/Makefile +++ b/multimedia/libx264/Makefile @@ -7,9 +7,6 @@ COMMENT= H.264/MPEG-4 AVC Video Encoding (Library) MASTERDIR= ${.CURDIR}/../x264 PLIST= ${.CURDIR}/pkg-plist -NOT_FOR_ARCHS= powerpc64le -NOT_FOR_ARCHS_REASON= endian test failed - # Clear dependency on libx264 (itself), see x264/Makefile LIB_DEPENDS= # diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index c2dfba0cefa9..07d1103cdc7a 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2020-09-12 17:23:57 UTC +--- configure.orig 2024-01-05 22:26:57 UTC +++ configure -@@ -743,12 +743,6 @@ case $host_cpu in +@@ -744,12 +744,6 @@ case $host_cpu in AS_EXT=".asm" ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" if [ $compiler = GNU ]; then @@ -13,7 +13,7 @@ CFLAGS="-m32 $CFLAGS" LDFLAGS="-m32 $LDFLAGS" fi -@@ -763,7 +757,7 @@ case $host_cpu in +@@ -764,7 +758,7 @@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf32" fi ;; @@ -22,7 +22,16 @@ ARCH="X86_64" AS="${AS-nasm}" AS_EXT=".asm" -@@ -952,7 +946,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p +@@ -801,7 +795,7 @@ case $host_cpu in + if [ $SYS = MACOSX ] ; then + CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4" + else +- CFLAGS="$CFLAGS -maltivec -mabi=altivec" ++ CFLAGS="$CFLAGS -maltivec" + define HAVE_ALTIVEC_H + fi + if [ "$vsx" != "no" ] ; then +@@ -958,7 +952,7 @@ fi fi fi @@ -31,7 +40,7 @@ if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; then VER="$( ($AS --version || echo no assembler) 2>/dev/null | head -n 1 )" echo "Found $VER" -@@ -965,9 +959,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \ +@@ -971,9 +965,6 @@ if [ $asm = auto -a $ARCH = ARM ] ; then fi if [ $asm = auto -a $ARCH = ARM ] ; then @@ -41,7 +50,7 @@ cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then define HAVE_ARMV6 -@@ -978,9 +969,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then +@@ -984,9 +975,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON ASFLAGS="$ASFLAGS -c" else @@ -53,7 +62,7 @@ fi fi -@@ -1012,9 +1002,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then +@@ -1018,9 +1008,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then define HAVE_MSA else @@ -65,7 +74,7 @@ fi fi -@@ -1343,10 +1332,6 @@ if cc_check '' -Wshadow ; then +@@ -1368,10 +1357,6 @@ fi CFLAGS="-Wshadow $CFLAGS" fi @@ -76,7 +85,7 @@ if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then CFLAGS="$CFLAGS -fvisibility=hidden" fi -@@ -1386,6 +1371,9 @@ if [ "$opencl" = "yes" ]; then +@@ -1411,6 +1396,9 @@ if [ "$opencl" = "yes" ]; then opencl="yes" define HAVE_OPENCL "(BIT_DEPTH==8)" libdl="-ldl"