From nobody Tue Dec 31 14:00:50 2024 X-Original-To: dev-commits-ports-main@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 4YMvkq01tRz5jV6n; Tue, 31 Dec 2024 14:00:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMvkp3vV8z4nW2; Tue, 31 Dec 2024 14:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735653650; 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=ggqJi5lX8y5p50DHf9AsBpQq2zQJ1BryPOTSMeXDTPs=; b=JPMhGOO/ZZvFqWTX4OcpQOxn08nShvhk2OZaDhEgYBB/KFS6KRIEHPWCbFIC5geFyvlFEi P32snFgDGY10w+Nx2eT03BjEaOx+XsfCZwAMMoipmGCvp/UT5mmsDErnwhI5Q677qPvpOl 3EB1OSw0pVdlKVy1++/8aHPyKISxmqa63tCEIYGSD9mSFmyPcBVY+6dd8qMnXdESacy9rJ go4yI0m6wWSpZSngtQjf0FW36p7HXXo32SH13RRezXg6ov7lfpY2gmEaqtbyGMzIK93X8D nT9J/GIc0U4FNSxFEqWkLMZvapcrpRce4D6P5UOrXJjreFK7Jrakil9uIBwBxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735653650; 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=ggqJi5lX8y5p50DHf9AsBpQq2zQJ1BryPOTSMeXDTPs=; b=pXsUOwsXyeDSy56BS9/0FlNjZWI887OimyUDmDw6wnwLDqhBEjMWTPXEkB4prvomhqGEOG r0Gg6XmMK6FIEyMg4ZQ+KX9vFE0VqUn1nU6DAaTWDwQaZPDUZd6dWCgNi7/ujVeds9wNB1 w3WJqeg3FEXvccPi/iIj6UZcBaovdW21AVVWddQ7rIuqKgERWhxs71GqJgn7RGLK20OFhP XtX+RI96ZplYQlDmQXv8h18oBFXEA9j7yioNuP9ZD1KOrybVzNRK/Kva5p3vi031ms5Mhm aBANZJF/PjuyExo6G2MWUciJ5wEr6o09Vxvi7Y5WKBIUqzs9qO5gZHh2/mFp6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735653650; a=rsa-sha256; cv=none; b=W6PwyC9fvRDCxLaqmu0B83yxGdSpJ5l9P9Pi4cyDPmQ1H+pACh7Jq/Nh6+Kvw7VXo44LLy XcNsiEVB65wVFvqQbiEUoxaAz1Aa0S/pkFXO794Qhqkliz8xTnwLkbHaQfap2nlapsqKQK mKYPiokSYj2gd+U24buFokvk+G1xsYw8MG7QOLYNKdWgKvkLETo3L9u5RFurvoxTEfTtBr ogsl3KdaZzGwVuYG9okK2A7uq+OTwqMWoHm/ML1SHnAX4ePugzBAZXL29HJ8Pk0LOI4iia RtIj8wVLy4b8TLjasqd1zktJkBQhu8SQfDsXFlfUcEXMTT0YciJkRQyuiegYBA== 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 4YMvkp24jPzhV4; Tue, 31 Dec 2024 14:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BVE0om4053638; Tue, 31 Dec 2024 14:00:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVE0oXA053635; Tue, 31 Dec 2024 14:00:50 GMT (envelope-from git) Date: Tue, 31 Dec 2024 14:00:50 GMT Message-Id: <202412311400.4BVE0oXA053635@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: e9e6dbc8c49d - main - multimedia/x265: fix build on powerpc, fix runtime on older powerpc64 CPUs List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: e9e6dbc8c49d566c01b7ceb52d38790713a5d59c Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9e6dbc8c49d566c01b7ceb52d38790713a5d59c commit e9e6dbc8c49d566c01b7ceb52d38790713a5d59c Author: Piotr Kubaj AuthorDate: 2024-12-31 11:31:02 +0000 Commit: Piotr Kubaj CommitDate: 2024-12-31 13:59:59 +0000 multimedia/x265: fix build on powerpc, fix runtime on older powerpc64 CPUs 1. Assembly on powerpc seems to be not supported: ld: error: undefined reference due to --no-allow-shlib-undefined: x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int) 2. Do not optimize for POWER8, since our baseline is G5. --- multimedia/x265/Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile index 46d4550d1123..0f84465e8d1b 100644 --- a/multimedia/x265/Makefile +++ b/multimedia/x265/Makefile @@ -1,5 +1,6 @@ PORTNAME= x265 PORTVERSION= 3.6 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/downloads/ \ http://ftp.videolan.org/pub/videolan/x265/ @@ -52,7 +53,7 @@ VMAF_CMAKE_BOOL= ENABLE_LIBVMAF .include -.if ${ARCH:Mpowerpc64*} +.if ${ARCH} == powerpc64le CMAKE_ARGS+= -DCPU_POWER8=ON \ -DENABLE_ALTIVEC=ON .endif @@ -85,7 +86,7 @@ CFLAGS:= ${CFLAGS:N-O*} -O3 .for b in ${OTHER_DEPTHS:C/HI([0-9]+)P/\1/} EXTRA_LINK_FLAGS+= -L${WRKSRC:H}/${b}bit -.if ${ARCH:Mpowerpc64*} +.if ${ARCH} == powerpc64le .if ${b} != 8 ASSEMBLY= false @@ -108,7 +109,7 @@ pre-build:: ${ECHO_MSG} "---> Built the ${b}-bit library ---" .else -.if (${ARCH} == i386 || ${ARCH} == armv7) && $b != 8 +.if ((${ARCH} == i386 || ${ARCH} == armv7) && $b != 8) || ${ARCH} == powerpc || ${ARCH} == powerpc64 ASSEMBLY= false .else ASSEMBLY= true @@ -119,7 +120,7 @@ pre-build:: ${MKDIR} ${WRKSRC:H}/${b}bit ${CMAKE_BIN} -S ${WRKSRC} -B ${WRKSRC:H}/${b}bit \ ${CMAKE_OTHER_ARGS} ${b:C/1./-DHIGH_BIT_DEPTH:BOOL=true/} \ - -DMAIN${b}:BOOL=true -DENABLE_ASSEMBLY:BOOL=${ASSEMBLY} \ + -DMAIN${b}:BOOL=true -DENABLE_ASSEMBLY:BOOL=${ASSEMBLY} -DCPU_POWER8=false -DENABLE_ALTIVEC:BOOL=false \ -DEXPORT_C_API:BOOL=false -DENABLE_CLI=false ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC:H}/${b}bit ${MAKE_ARGS} ${LN} -f ${WRKSRC:H}/${b}bit/libx265.a ${WRKSRC:H}/${b}bit/libx265_${b}bit.a @@ -138,11 +139,14 @@ CMAKE_ARGS+= -DENABLE_SHARED:BOOL=true .if ${ARCH} == i386 && ${DEFAULT_DEPTH} != "HI8P" CMAKE_ARGS+= -DENABLE_ASSEMBLY:BOOL=false .else -.if !${ARCH:Mpowerpc64*} +.if !${ARCH:Mpowerpc*} CMAKE_ARGS+= -DENABLE_ASSEMBLY:BOOL=true -.else +.elif ${ARCH} == powerpc64le CMAKE_ARGS+= -DCPU_POWER8=ON \ -DENABLE_ALTIVEC=ON +.elif ${ARCH} == powerpc64 +CMAKE_ARGS+= -DCPU_POWER8=OFF \ + -DENABLE_ALTIVEC=OFF .endif do-test: