Wed Apr 25 19:25:12 2018 UTC ()
multimedia/x264-devel: Go back to disabled assembler on SunOS, fixes build.


(fhajny)
diff -r1.65 -r1.66 pkgsrc/multimedia/x264-devel/Makefile
cvs diff -r1.65 -r1.66 pkgsrc/multimedia/x264-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/Makefile 2018/02/25 21:57:43 1.65
+++ pkgsrc/multimedia/x264-devel/Attic/Makefile 2018/04/25 19:25:12 1.66
@@ -1,29 +1,32 @@ @@ -1,29 +1,32 @@
1# $NetBSD: Makefile,v 1.65 2018/02/25 21:57:43 adam Exp $ 1# $NetBSD: Makefile,v 1.66 2018/04/25 19:25:12 fhajny Exp $
2 2
3DISTNAME= x264-snapshot-20180224-2245 3DISTNAME= x264-snapshot-20180224-2245
4PKGNAME= ${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//} 4PKGNAME= ${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//}
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ 6MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://www.videolan.org/developers/x264.html 10HOMEPAGE= http://www.videolan.org/developers/x264.html
11COMMENT= GPL licensed H.264 encoder 11COMMENT= GPL licensed H.264 encoder
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
15 15
16.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 16# Assembler code still needs to be disabled on at least SunOS
 17.if ${OPSYS} == "SunOS"
 18CONFIGURE_ARGS+= --disable-asm
 19.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
17BUILD_DEPENDS+= nasm>=2.13.0:../../devel/nasm 20BUILD_DEPENDS+= nasm>=2.13.0:../../devel/nasm
18.endif 21.endif
19 22
20USE_TOOLS+= bash gmake 23USE_TOOLS+= bash gmake
21USE_LIBTOOL= yes 24USE_LIBTOOL= yes
22HAS_CONFIGURE= yes 25HAS_CONFIGURE= yes
23CONFIG_SHELL= ${BASH} 26CONFIG_SHELL= ${BASH}
24CONFIGURE_ARGS+= --enable-shared 27CONFIGURE_ARGS+= --enable-shared
25CONFIGURE_ARGS+= --enable-static 28CONFIGURE_ARGS+= --enable-static
26CONFIGURE_ARGS+= --enable-pic 29CONFIGURE_ARGS+= --enable-pic
27CONFIGURE_ARGS+= --prefix=${PREFIX} 30CONFIGURE_ARGS+= --prefix=${PREFIX}
28.if ${OPSYS} == "Darwin" 31.if ${OPSYS} == "Darwin"
29USE_TOOLS+= perl 32USE_TOOLS+= perl