From owner-svn-ports-all@freebsd.org Fri Feb 7 05:09:17 2020 Return-Path: Delivered-To: svn-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 54B53243119; Fri, 7 Feb 2020 05:09:17 +0000 (UTC) (envelope-from mi@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48DNd91KP1z46pG; Fri, 7 Feb 2020 05:09:17 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23EB6274ED; Fri, 7 Feb 2020 05:09:17 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01759GSd095537; Fri, 7 Feb 2020 05:09:16 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01759GVJ095536; Fri, 7 Feb 2020 05:09:16 GMT (envelope-from mi@FreeBSD.org) Message-Id: <202002070509.01759GVJ095536@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Fri, 7 Feb 2020 05:09:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525461 - head/multimedia/x265 X-SVN-Group: ports-head X-SVN-Commit-Author: mi X-SVN-Commit-Paths: head/multimedia/x265 X-SVN-Commit-Revision: 525461 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Feb 2020 05:09:17 -0000 Author: mi Date: Fri Feb 7 05:09:16 2020 New Revision: 525461 URL: https://svnweb.freebsd.org/changeset/ports/525461 Log: Add nasm to dependencies on ARM-platforms. Disable attempts to use assembly on PPC. Reported by: jbeich Modified: head/multimedia/x265/Makefile Modified: head/multimedia/x265/Makefile ============================================================================== --- head/multimedia/x265/Makefile Fri Feb 7 04:44:24 2020 (r525460) +++ head/multimedia/x265/Makefile Fri Feb 7 05:09:16 2020 (r525461) @@ -18,9 +18,10 @@ COMMENT= H.265/High Efficiency Video Coding (HEVC) for LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC:H}/COPYING +.for a in amd64 i386 aarch64 armv6 armv7 +BUILD_DEPENDS_$a= nasm:devel/nasm +.endfor BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} -BUILD_DEPENDS_amd64= nasm:devel/nasm -BUILD_DEPENDS_i386= nasm:devel/nasm USES= cmake compiler:c++14-lang pathfix @@ -81,7 +82,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} == i386 && $b != 8 +.if ${ARCH} == i386 && $b != 8 || ! ${BUILD_DEPENDS:Mnasm*} ASSEMBLY=false .else ASSEMBLY=true @@ -107,9 +108,10 @@ CMAKE_ARGS+= ${OTHER_DEPTHS:C/HI([0-9]+)P/-DLINKED_\1B CMAKE_ARGS+= -DENABLE_SHARED:BOOL=true -.if ${ARCH} == i386 && ${DEFAULT_DEPTH} != "HI8P" +.if ${ARCH} == i386 && ${DEFAULT_DEPTH} != "HI8P" || ! ${BUILD_DEPENDS:Mnasm*} CMAKE_ARGS+= -DENABLE_ASSEMBLY:BOOL=false .else +CMAKE_ARGS+= -DENABLE_ASSEMBLY:BOOL=true do-test: ${WRKDIR}/.build/test/TestBench .endif