Wed Nov 22 16:23:28 2023 UTC ()
xvidcore: always disable asm on NetBSD/i386 to avoid write-enable text.

Bump PKGREVISION to rebuild binaries for i386.


(tsutsui)
diff -r1.50 -r1.51 pkgsrc/multimedia/xvidcore/Makefile
cvs diff -r1.50 -r1.51 pkgsrc/multimedia/xvidcore/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xvidcore/Makefile 2023/06/06 12:42:03 1.50
+++ pkgsrc/multimedia/xvidcore/Makefile 2023/11/22 16:23:28 1.51
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile,v 1.50 2023/06/06 12:42:03 riastradh Exp $ 1# $NetBSD: Makefile,v 1.51 2023/11/22 16:23:28 tsutsui Exp $
2 2
3DISTNAME= xvidcore-1.3.7 3DISTNAME= xvidcore-1.3.7
 4PKGREVISION= 1
4CATEGORIES= multimedia 5CATEGORIES= multimedia
5MASTER_SITES= https://downloads.xvid.com/downloads/ 6MASTER_SITES= https://downloads.xvid.com/downloads/
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.xvid.org/ 10HOMEPAGE= https://www.xvid.org/
10COMMENT= ISO MPEG-4 compliant video codec 11COMMENT= ISO MPEG-4 compliant video codec
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13USE_GCC_RUNTIME= yes 14USE_GCC_RUNTIME= yes
14USE_TOOLS+= gmake 15USE_TOOLS+= gmake
15 16
16.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
17 18
18# the resulting objects from the asm don't link correctly on Solaris. 19# the resulting objects from the asm don't link correctly on Solaris.
19# nor on amd64 -- they are not PIC, but the ABI demands it 20# nor on amd64 -- they are not PIC, but the ABI demands it
20# big patch available from Gentoo, if someone is interested: 21# big patch available from Gentoo, if someone is interested:
21# http://bugs.gentoo.org/show_bug.cgi?id=90287 22# http://bugs.gentoo.org/show_bug.cgi?id=90287
22.if ${OPSYS} == "SunOS" || ${MACHINE_ARCH} == "x86_64" || \ 23.if ${OPSYS} == "SunOS" || ${MACHINE_ARCH} == "x86_64" || \
23 !empty(MACHINE_PLATFORM:MDarwin-*-i386) || \ 24 !empty(MACHINE_PLATFORM:MDarwin-*-i386) || \
24 !empty(MACHINE_PLATFORM:MNetBSD-[89].*-i386) 25 !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
25CONFIGURE_ARGS+= --disable-assembly 26CONFIGURE_ARGS+= --disable-assembly
26.elif ${MACHINE_ARCH} == "i386" 27.elif ${MACHINE_ARCH} == "i386"
27TOOL_DEPENDS+= nasm>=0.98.39nb3:../../devel/nasm 28TOOL_DEPENDS+= nasm>=0.98.39nb3:../../devel/nasm
28#.elif ${MACHINE_ARCH} == "x86_64" 29#.elif ${MACHINE_ARCH} == "x86_64"
29#TOOL_DEPENDS+= yasm>=0.4.0:../../devel/yasm 30#TOOL_DEPENDS+= yasm>=0.4.0:../../devel/yasm
30.endif 31.endif
31 32
32CFLAGS.SunOS+= -D__inline=inline 33CFLAGS.SunOS+= -D__inline=inline
33SUBST_CLASSES.SunOS+= ld 34SUBST_CLASSES.SunOS+= ld
34SUBST_MESSAGE.ld= Fixing linker arguments for Solaris 35SUBST_MESSAGE.ld= Fixing linker arguments for Solaris
35SUBST_STAGE.ld= pre-configure 36SUBST_STAGE.ld= pre-configure
36SUBST_FILES.ld= build/generic/configure 37SUBST_FILES.ld= build/generic/configure
37SUBST_SED.ld= -e "s|-Wl,-soname,libxvidcore...(SHARED_EXTENSION)...(API_MAJOR)||" 38SUBST_SED.ld= -e "s|-Wl,-soname,libxvidcore...(SHARED_EXTENSION)...(API_MAJOR)||"