From owner-svn-ports-all@freebsd.org Thu Feb 6 04:57:37 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 8AC3723B715; Thu, 6 Feb 2020 04:57:37 +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 48CmQ934qmz4bj2; Thu, 6 Feb 2020 04:57:37 +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 607F3E751; Thu, 6 Feb 2020 04:57:37 +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 0164vbwD006089; Thu, 6 Feb 2020 04:57:37 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0164vbNZ006088; Thu, 6 Feb 2020 04:57:37 GMT (envelope-from mi@FreeBSD.org) Message-Id: <202002060457.0164vbNZ006088@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Thu, 6 Feb 2020 04:57:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525362 - head/multimedia/x265 X-SVN-Group: ports-head X-SVN-Commit-Author: mi X-SVN-Commit-Paths: head/multimedia/x265 X-SVN-Commit-Revision: 525362 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: Thu, 06 Feb 2020 04:57:37 -0000 Author: mi Date: Thu Feb 6 04:57:36 2020 New Revision: 525362 URL: https://svnweb.freebsd.org/changeset/ports/525362 Log: My usage of -fuse-ld=lld has hidden a linking problem reported by several people. Rework for the default linker to work as well. Also, fix the build on i386, where use of assembler code needs to be disabled for pixel-widths other than 8. PR: 238773 Reported by: VVD, Alan Valentine, kib@, jbeich@ Modified: head/multimedia/x265/Makefile Modified: head/multimedia/x265/Makefile ============================================================================== --- head/multimedia/x265/Makefile Thu Feb 6 03:54:33 2020 (r525361) +++ head/multimedia/x265/Makefile Thu Feb 6 04:57:36 2020 (r525362) @@ -70,10 +70,9 @@ CMAKE_ARGS+= -DMAIN12:BOOL=true .endif .if "${DEFAULT_DEPTH}" != "HI8P" -CMAKE_ARGS+= -DHIGH_BIT_DEPTH:BOOL=true +CMAKE_ARGS+= -DHIGH_BIT_DEPTH:BOOL=true .endif -CFLAGS+= ${OTHER_DEPTHS:C/HI([0-9]+)P/-DLINKED_\1BIT/} CMAKE_OTHER_ARGS=${CMAKE_ARGS:C/.*-D_END_CUSTOM_OPTIONS=1 +//W} .if ${PORT_OPTIONS:MDEBUG} @@ -81,26 +80,41 @@ CFLAGS:= ${CFLAGS:N-O*} -O0 -g .endif .for b in ${OTHER_DEPTHS:C/HI([0-9]+)P/\1/} -EXTRA_LINK_FLAGS+=${WRKSRC:H}/$bbit/libx265.a +EXTRA_LINK_FLAGS+=-L${WRKSRC:H}/$bbit + +.if ${ARCH} == i386 && $b != 8 +ASSEMBLY=false +.else +ASSEMBLY=true +.endif + pre-build:: @${ECHO_MSG} "---> Building the $b-bit library ---" ${MKDIR} ${WRKSRC:H}/$bbit ${CMAKE_BIN} -S ${WRKSRC} -B ${WRKSRC:H}/$bbit \ ${CMAKE_OTHER_ARGS} ${b:C/1./-DHIGH_BIT_DEPTH:BOOL=true/} \ - -DMAIN$b:BOOL=true \ + -DMAIN$b:BOOL=true -DENABLE_ASSEMBLY:BOOL=${ASSEMBLY} \ -DEXPORT_C_API:BOOL=false -DENABLE_CLI=false ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC:H}/$bbit ${MAKE_ARGS} + ${LN} ${WRKSRC:H}/$bbit/libx265.a ${WRKSRC:H}/$bbit/libx265_$bbit.a ${ECHO_MSG} "---> Built the $b-bit library ---" .endfor .if "${EXTRA_LINK_FLAGS}" -CMAKE_ARGS+= -DEXTRA_LINK_FLAGS=${EXTRA_LINK_FLAGS:Q} +CMAKE_ARGS+= -DEXTRA_LINK_FLAGS:STRING="${EXTRA_LINK_FLAGS}" +CMAKE_ARGS+= -DEXTRA_LIB="${OTHER_DEPTHS:C/HI([0-9]+)P/x265_\1bit/:C/ /;/gW}" +CMAKE_ARGS+= ${OTHER_DEPTHS:C/HI([0-9]+)P/-DLINKED_\1BIT:BOOL=true/} .endif -CMAKE_ARGS+= -D_END_CUSTOM_OPTIONS=1 CMAKE_ARGS+= -DENABLE_SHARED:BOOL=true +.if ${ARCH} == i386 && ${DEFAULT_DEPTH} != "HI8P" +CMAKE_ARGS+= -DENABLE_ASSEMBLY:BOOL=false +.else do-test: ${WRKDIR}/.build/test/TestBench +.endif + +CMAKE_ARGS+= -D_END_CUSTOM_OPTIONS=1 .include