From nobody Thu Jul 25 19:02:18 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 4WVKy3060cz5R5MS; Thu, 25 Jul 2024 19:02:19 +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 4WVKy26jqJz592h; Thu, 25 Jul 2024 19:02:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721934138; 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=qKtKWmqQVa2kMdgez3y8D3oWnovNILJkjf8Zc6rkmVs=; b=JV2kumBxtuXyWcB+l7um1K/kEyXiKSwAvKYKE908lGzsfZrmGW8XCvqd+PC7eVOdBB5Lq6 e0M1zNcaAidtW0ghxJVO5C303PvEYua/A/EsIbo4zOCd8bm/rl3CueksLTPivxu1cCNBtU ReNNy359waMjjXbaRLDl10Lu1bzsKPAX7wd1ePtKt8ypTEz/TczwSW2eRVEjY3xGw+27gt VvVKp+XbYwxtonidkzxcGLacm97NabRzlnHkPuutbVbdWRqV99b8H/5yHUO8MCBtaqUB1F THRTVq8TeOL4ikW74ycCWJ0m5d7MzX2nTFaudbDC94IUbYsPD9Vk53ME+PG/FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721934138; a=rsa-sha256; cv=none; b=OT/slcNzvAyUGscXP7wWs4fhjBwPuLkMT9nmYoA/K0CQe6hoyL3AltRxRB714AhRLprqed 9TgtZs90qTRgyZSV/XMb5fYhAQuX9yl446aSZWh6hpDuRUJlfkx+9ve+VjZZ/V1yW+jlbJ Tv5xJSBSvgqdZW7DTNTEFd9HizA/waoL5gcXX9lN2+ypFJRo8eburTKfm05H3Zy95xYIwB mgGI1i6N5vMtyS2rJXX5vsl+9Rcz8jx3MaUOMg71dbvX5FB6V41vi8ulGsAPMXtelsn/lb MD2F9LrwId6oazL0akPIak249NgDrdMbJwTS+33ukuO3NTMyEsoDhVrywaINJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721934138; 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=qKtKWmqQVa2kMdgez3y8D3oWnovNILJkjf8Zc6rkmVs=; b=kKAmveAVCLVcLM6PlMYcOQYYkezjvkMARRfiPk/BJmQnLyuYhRwMWj11l0BbIzVgjhQc33 lbniCjyuk4lsJuV82i4dSFdZBqPsKuJgzBwRdMDbUBm+pxP4QM/rqRgwyyzE3w676mwDpl aNekQlHHpPd1FFnj2XUPdnPu6iKbKWgBcsOemkkIfCT9WFK+eZZfUExCR5WKIg6krhc3eQ UvL1YGrRv7IWx6FKHSNq7dXhvA3A7cR/Ss0DilqIU8549qwE0/tp9Gs16jJZhxHakPIvQs RZoBqrWU0sVuh/054e49SpGbXX0K7RJOHM3Lkbi8FJZ/rUgmna/2J3Kp3Ba08w== 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 4WVKy26JzZz168W; Thu, 25 Jul 2024 19:02:18 +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 46PJ2IZt091854; Thu, 25 Jul 2024 19:02:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46PJ2IZk091851; Thu, 25 Jul 2024 19:02:18 GMT (envelope-from git) Date: Thu, 25 Jul 2024 19:02:18 GMT Message-Id: <202407251902.46PJ2IZk091851@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: ecee7811204a - main - multimedia/x265: sort out Makefile, pet portclippy 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecee7811204a75e6c90e12e55f7a5f8105899748 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecee7811204a75e6c90e12e55f7a5f8105899748 commit ecee7811204a75e6c90e12e55f7a5f8105899748 Author: Vladimir Druzenko AuthorDate: 2024-07-25 18:59:48 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-25 18:59:48 +0000 multimedia/x265: sort out Makefile, pet portclippy No functional changes. PR: 280208 Approved by: ports@virtual-estates.net (maintainer, timeout > 2 weeks) --- multimedia/x265/Makefile | 101 +++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile index 8be7da1e5909..c37f1d7885a9 100644 --- a/multimedia/x265/Makefile +++ b/multimedia/x265/Makefile @@ -4,8 +4,8 @@ PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/get/${BB_TAG}.tar.gz?meow=/ -PATCH_SITES= https://bitbucket.org/multicoreware/x265_git/commits/8f18e3ad32684eee95e885e718655f93951128c3/raw/ -PATCHFILES+= x265-asm-warnings.patch:-p1 +PATCH_SITES= https://bitbucket.org/multicoreware/x265_git/commits/8f18e3ad32684eee95e885e718655f93951128c3/raw/ +PATCHFILES+= x265-asm-warnings.patch:-p1 MAINTAINER= ports@virtual-estates.net COMMENT= H.265/High Efficiency Video Coding (HEVC) format @@ -15,29 +15,42 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC:H}/COPYING USES= cmake compiler:c++14-lang cpe pathfix dos2unix - CPE_VENDOR= multicorewareinc - +DOS2UNIX_FILES= common/scaler.cpp +USE_LDCONFIG= yes +CMAKE_ARGS= -DENABLE_TESTS=on -DGIT_ARCHETYPE=1 +CMAKE_ON= ENABLE_HDR10_PLUS +LDFLAGS_i386= -Wl,-znotext +EXTRACT_AFTER_ARGS+= --exclude compat --exclude md5\.* --strip-components=1 +PATCH_WRKSRC= ${WRKSRC:H} +WRKSRC= ${WRKDIR}/source BB_TAG= Release_${DISTVERSION} -OPTIONS_DEFINE= DEBUG OPTIMIZED_FLAGS VMAF -OPTIONS_DEFAULT= OPTIMIZED_FLAGS HI8P HI10P HI12P -OPTIONS_DEFINE_aarch64= ASM -OPTIONS_DEFINE_amd64= ASM SVTHEVC -OPTIONS_DEFINE_i386= ASM +OPTIONS_DEFINE= DEBUG OPTIMIZED_FLAGS VMAF +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= HI10P HI12P HI8P OPTIMIZED_FLAGS +OPTIONS_DEFAULT_amd64= ASM OPTIONS_DEFAULT_powerpc64le= ASM -OPTIONS_MULTI= PixelWidth -OPTIONS_MULTI_PixelWidth=HI8P HI10P HI12P +OPTIONS_MULTI= PIXELWIDTH +OPTIONS_MULTI_PIXELWIDTH= HI10P HI12P HI8P + +DEBUG_DESC= Enable debugging +HI10P_DESC= Enable 10-bit pixels (may break on i386) +HI12P_DESC= Enable 12-bit pixels (may break on i386) +HI8P_DESC= Enable 8-bit pixel-width (you, probably, want this) +OPTIMIZED_FLAGS_DESC= Enable O3 optimization +SVTHEVC_DESC= HEVC encoding via SVT-HEVC +VMAF_DESC= Per frame and aggregate VMAF score -DOS2UNIX_FILES= common/scaler.cpp DEBUG_PREVENTS= OPTIMIZED_FLAGS DEBUG_PREVENTS_MSG= Optimizations are incompatible with debugging code DEBUG_CMAKE_ON= -DCMAKE_ASM_NASM_FLAGS:STRING="-g -O0" -OPTIMIZED_FLAGS_VARS= CFLAGS+=-O3 +OPTIMIZED_FLAGS_CFLAGS= -O3 SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc SVTHEVC_CMAKE_BOOL= ENABLE_SVT_HEVC SVTHEVC_CMAKE_ON= -DSVT_HEVC_INCLUDE_DIR:PATH="${LOCALBASE}/include/svt-hevc" @@ -46,22 +59,6 @@ VMAF_USES= localbase:ldflags VMAF_CMAKE_BOOL= ENABLE_LIBVMAF VMAF_CMAKE_ON= -DVMAF_INCLUDE_DIR:PATH="${LOCALBASE}/include/libvmaf" -DEBUG_DESC= Enable debugging -HI8P_DESC= Enable 8-bit pixel-width (you, probably, want this) -HI10P_DESC= Enable 10-bit pixels (may break on i386) -HI12P_DESC= Enable 12-bit pixels (may break on i386) -OPTIMIZED_FLAGS_DESC= Enable O3 optimization -SVTHEVC_DESC= HEVC encoding via SVT-HEVC -VMAF_DESC= Per frame and aggregate VMAF score - -USE_LDCONFIG= yes -CMAKE_ARGS= -DENABLE_TESTS=on -DGIT_ARCHETYPE=1 -CMAKE_ON= ENABLE_HDR10_PLUS -LDFLAGS_i386= -Wl,-znotext -EXTRACT_AFTER_ARGS+= --exclude compat --exclude md5\.* --strip-components=1 -PATCH_WRKSRC= ${WRKSRC:H} -WRKSRC= ${WRKDIR}/source - .include .if ${ARCH} == aarch64 && ${PORT_OPTIONS:MASM} @@ -89,21 +86,21 @@ CMAKE_ARGS+= -DMAIN12:BOOL=true CMAKE_ARGS+= -DHIGH_BIT_DEPTH:BOOL=true .endif -CMAKE_OTHER_ARGS=${CMAKE_ARGS:C/.*-D_END_CUSTOM_OPTIONS=1 +//W} +CMAKE_OTHER_ARGS= ${CMAKE_ARGS:C/.*-D_END_CUSTOM_OPTIONS=1 +//W} .if ${PORT_OPTIONS:MDEBUG} CFLAGS:= ${CFLAGS:N-O*} -O0 -g .endif .for b in ${OTHER_DEPTHS:C/HI([0-9]+)P/\1/} -EXTRA_LINK_FLAGS+=-L${WRKSRC:H}/$bbit +EXTRA_LINK_FLAGS+= -L${WRKSRC:H}/${b}bit .if ${ARCH:Mpowerpc64*} -.if $b != 8 || ! ${PORT_OPTIONS:MASM} -ASSEMBLY=false +.if ${b} != 8 || ! ${PORT_OPTIONS:MASM} +ASSEMBLY= false .else -ASSEMBLY=true +ASSEMBLY= true .endif .if ${PORT_OPTIONS:MASM} @@ -113,33 +110,33 @@ POWER8= false .endif pre-build:: - @${ECHO_MSG} "---> Building the $b-bit library ---" - ${MKDIR} ${WRKSRC:H}/$bbit - ${CMAKE_BIN} -S ${WRKSRC} -B ${WRKSRC:H}/$bbit \ + @${ECHO_MSG} "---> Building the ${b}-bit library ---" + ${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_ALTIVEC=${ASSEMBLY} -DCPU_POWER8=${POWER8} \ + -DMAIN${b}:BOOL=true -DENABLE_ALTIVEC=${ASSEMBLY} -DCPU_POWER8=${POWER8} \ -DEXPORT_C_API:BOOL=false -DENABLE_CLI=false - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC:H}/$bbit ${MAKE_ARGS} - ${LN} -f ${WRKSRC:H}/$bbit/libx265.a ${WRKSRC:H}/$bbit/libx265_$bbit.a - ${ECHO_MSG} "---> Built the $b-bit library ---" + ${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 + ${ECHO_MSG} "---> Built the ${b}-bit library ---" .else -.if ${ARCH} == i386 && $b != 8 || ! ${PORT_OPTIONS:MASM} -ASSEMBLY=false +.if ${ARCH} == i386 && ${b} != 8 || ! ${PORT_OPTIONS:MASM} +ASSEMBLY= false .else -ASSEMBLY=true +ASSEMBLY= true .endif pre-build:: - @${ECHO_MSG} "---> Building the $b-bit library ---" - ${MKDIR} ${WRKSRC:H}/$bbit - ${CMAKE_BIN} -S ${WRKSRC} -B ${WRKSRC:H}/$bbit \ + @${ECHO_MSG} "---> Building the ${b}-bit library ---" + ${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} \ -DEXPORT_C_API:BOOL=false -DENABLE_CLI=false - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC:H}/$bbit ${MAKE_ARGS} - ${LN} -f ${WRKSRC:H}/$bbit/libx265.a ${WRKSRC:H}/$bbit/libx265_$bbit.a - ${ECHO_MSG} "---> Built the $b-bit library ---" + ${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 + ${ECHO_MSG} "---> Built the ${b}-bit library ---" .endif .endfor