From nobody Tue Nov 16 17:28:07 2021
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 5EC6C1892AD3;
Tue, 16 Nov 2021 17:28:08 +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 4HttLb5nZxz3JkR;
Tue, 16 Nov 2021 17:28:07 +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 71463115DD;
Tue, 16 Nov 2021 17:28:07 +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 1AGHS7lj098352;
Tue, 16 Nov 2021 17:28:07 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AGHS7lj098351;
Tue, 16 Nov 2021 17:28:07 GMT
(envelope-from git)
Date: Tue, 16 Nov 2021 17:28:07 GMT
Message-Id: <202111161728.1AGHS7lj098351@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Subject: git: e1619d358442 - main - multimedia/x265: add ASM option on powerpc64le and enable by default
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
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: e1619d3584420c014ef8a2c8f76cde671756d8b4
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e1619d3584420c014ef8a2c8f76cde671756d8b4
commit e1619d3584420c014ef8a2c8f76cde671756d8b4
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-11-16 17:25:41 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-11-16 17:25:41 +0000
multimedia/x265: add ASM option on powerpc64le and enable by default
While here, also add the previously uncommitted patch.
---
multimedia/x265/Makefile | 10 ++++++----
.../files/patch-source_common_ppc_intrapred__altivec.cpp | 14 ++++++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index 712a954ff091..967ee47695cb 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -24,7 +24,9 @@ OPTIONS_DEFINE_aarch64= ASM
OPTIONS_DEFINE_amd64= ASM SVTHEVC
OPTIONS_DEFINE_i386= ASM
OPTIONS_DEFINE_powerpc64= ASM
+OPTIONS_DEFINE_powerpc64le= ASM
OPTIONS_DEFAULT_amd64= ASM
+OPTIONS_DEFAULT_powerpc64le= ASM
OPTIONS_MULTI= PixelWidth
OPTIONS_MULTI_PixelWidth=HI8P HI10P HI12P
@@ -65,12 +67,12 @@ BUILD_DEPENDS= as:devel/binutils
USE_GCC= yes
.endif
-.if ${ARCH} == powerpc64 && ${PORT_OPTIONS:MASM}
+.if ${ARCH:Mpowerpc64*} && ${PORT_OPTIONS:MASM}
CMAKE_ARGS+= -DCPU_POWER8=ON \
-DENABLE_ALTIVEC=ON
.endif
-.if ${ARCH} != aarch64 && ${ARCH} != powerpc64 && ${PORT_OPTIONS:MASM}
+.if ${ARCH} != aarch64 && !${ARCH:Mpowerpc64*} && ${PORT_OPTIONS:MASM}
BUILD_DEPENDS= nasm:devel/nasm
.endif
@@ -94,7 +96,7 @@ CFLAGS:= ${CFLAGS:N-O*} -O0 -g
.for b in ${OTHER_DEPTHS:C/HI([0-9]+)P/\1/}
EXTRA_LINK_FLAGS+=-L${WRKSRC:H}/$bbit
-.if ${ARCH} == powerpc64
+.if ${ARCH:Mpowerpc64*}
.if $b != 8 || ! ${PORT_OPTIONS:MASM}
ASSEMBLY=false
@@ -150,7 +152,7 @@ CMAKE_ARGS+= -DENABLE_SHARED:BOOL=true
.if ${ARCH} == i386 && ${DEFAULT_DEPTH} != "HI8P" || ! ${PORT_OPTIONS:MASM}
CMAKE_ARGS+= -DENABLE_ASSEMBLY:BOOL=false
.else
-.if ${ARCH} != powerpc64
+.if !${ARCH:Mpowerpc64*}
CMAKE_ARGS+= -DENABLE_ASSEMBLY:BOOL=true
.else
CMAKE_ARGS+= -DCPU_POWER8=ON \
diff --git a/multimedia/x265/files/patch-source_common_ppc_intrapred__altivec.cpp b/multimedia/x265/files/patch-source_common_ppc_intrapred__altivec.cpp
new file mode 100644
index 000000000000..b7b6cbcbcaf4
--- /dev/null
+++ b/multimedia/x265/files/patch-source_common_ppc_intrapred__altivec.cpp
@@ -0,0 +1,14 @@
+--- source/common/ppc/intrapred_altivec.cpp.orig 2021-11-16 17:20:04 UTC
++++ source/common/ppc/intrapred_altivec.cpp
+@@ -27,7 +27,11 @@
+ #include <assert.h>
+ #include <math.h>
+ #include <cmath>
++#ifdef __linux__
+ #include <linux/types.h>
++#else
++#include <sys/types.h>
++#endif
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdint.h>