Fri Jan 26 03:16:46 2024 UTC (122d)
multimedia/x265: Fix cross-build.


(riastradh)
diff -r1.36 -r1.37 pkgsrc/multimedia/x265/Makefile
cvs diff -r1.36 -r1.37 pkgsrc/multimedia/x265/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/x265/Makefile 2023/01/24 18:36:31 1.36
+++ pkgsrc/multimedia/x265/Makefile 2024/01/26 03:16:46 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.36 2023/01/24 18:36:31 wiz Exp $ 1# $NetBSD: Makefile,v 1.37 2024/01/26 03:16:46 riastradh Exp $
2 2
3DISTNAME= x265_3.5 3DISTNAME= x265_3.5
4PKGNAME= ${DISTNAME:S/_/-/} 4PKGNAME= ${DISTNAME:S/_/-/}
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/downloads/ 6MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/downloads/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.x265.org/ 9HOMEPAGE= http://www.x265.org/
10COMMENT= High Efficiency Video Coding (HEVC) 10COMMENT= High Efficiency Video Coding (HEVC)
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13WRKSRC= ${WRKDIR}/${DISTNAME}/source 13WRKSRC= ${WRKDIR}/${DISTNAME}/source
14 14
@@ -21,15 +21,22 @@ CMAKE_ARGS+= -DX265_LATEST_TAG=${PKGVERS @@ -21,15 +21,22 @@ CMAKE_ARGS+= -DX265_LATEST_TAG=${PKGVERS
21 21
22.include "options.mk" 22.include "options.mk"
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" 25.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
26. if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && ${MACHINE_ARCH} == "i386"  26. if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && ${MACHINE_ARCH} == "i386"
27# Avoid text relocations 27# Avoid text relocations
28CMAKE_ARGS+= -DENABLE_ASSEMBLY=OFF 28CMAKE_ARGS+= -DENABLE_ASSEMBLY=OFF
29. else 29. else
30TOOL_DEPENDS+= nasm>=2.13.0:../../devel/nasm 30TOOL_DEPENDS+= nasm>=2.13.0:../../devel/nasm
31. endif 31. endif
32.endif 32.endif
33 33
 34.if ${USE_CROSS_COMPILE:tl} == "yes"
 35CMAKE_ARGS+= -DCMAKE_SYSTEM:STRING=${OPSYS:Q}-${OS_VERSION:Q}
 36CMAKE_ARGS+= -DCMAKE_SYSTEM_NAME:STRING=${OPSYS:Q}
 37CMAKE_ARGS+= -DCMAKE_SYSTEM_VERSION:STRING=${OS_VERSION:Q}
 38CMAKE_ARGS+= -DCMAKE_SYSTEM_PROCESSOR:STRING=${MACHINE_ARCH:Q}
 39.endif
 40
34.include "../../devel/cmake/build.mk" 41.include "../../devel/cmake/build.mk"
35.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"