Attachment 251963 Details for Bug 280208 – sort out Makefile and pet portclippy

[patch] sort out Makefile and pet portclippy

x265.diff (text/plain), 6.15 KB, created by Vladimir Druzenko on 2024-07-10 16:25:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2024-07-10 16:25:35 UTC

Size: 6.15 KB

patch

obsolete

>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 <bsd.port.options.mk>
> 
> .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
>

Flags:

vvd: maintainer-approval? (freebsd-2024)

Actions: View | Diff

Attachments on bug 280208: 251953 | 251954 | 251963