Sun May 27 15:22:55 2018 UTC ()
xvidcore: disable asm to avoid text relocations on NetBSD/i386 8.0.

Bump PKGREVISION.  Ok'ed by wiz@ in PR pkg/53319.


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

--- pkgsrc/multimedia/xvidcore/Makefile 2016/02/25 15:49:44 1.45
+++ pkgsrc/multimedia/xvidcore/Makefile 2018/05/27 15:22:55 1.46
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1# $NetBSD: Makefile,v 1.45 2016/02/25 15:49:44 jperkin Exp $ 1# $NetBSD: Makefile,v 1.46 2018/05/27 15:22:55 tsutsui Exp $
2 2
3DISTNAME= xvidcore-1.3.3 3DISTNAME= xvidcore-1.3.3
 4PKGREVISION= 1
4CATEGORIES= multimedia 5CATEGORIES= multimedia
5MASTER_SITES= http://downloads.xvid.org/downloads/ 6MASTER_SITES= http://downloads.xvid.org/downloads/
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.xvid.org/ 10HOMEPAGE= http://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) || \
 25 !empty(MACHINE_PLATFORM:MNetBSD-[89].*-i386)
24CONFIGURE_ARGS+= --disable-assembly 26CONFIGURE_ARGS+= --disable-assembly
25.elif ${MACHINE_ARCH} == "i386" 27.elif ${MACHINE_ARCH} == "i386"
26BUILD_DEPENDS+= nasm>=0.98.39nb3:../../devel/nasm 28BUILD_DEPENDS+= nasm>=0.98.39nb3:../../devel/nasm
27#.elif ${MACHINE_ARCH} == "x86_64" 29#.elif ${MACHINE_ARCH} == "x86_64"
28#BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm 30#BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm
29.endif 31.endif
30 32
31CFLAGS.SunOS+= -D__inline=inline 33CFLAGS.SunOS+= -D__inline=inline
32SUBST_CLASSES.SunOS+= ld 34SUBST_CLASSES.SunOS+= ld
33SUBST_MESSAGE.ld= Fixing linker arguments for Solaris 35SUBST_MESSAGE.ld= Fixing linker arguments for Solaris
34SUBST_STAGE.ld= pre-configure 36SUBST_STAGE.ld= pre-configure
35SUBST_FILES.ld= build/generic/configure 37SUBST_FILES.ld= build/generic/configure
36SUBST_SED.ld= -e "s|-Wl,-soname,libxvidcore...(SHARED_EXTENSION)...(API_MAJOR)||" 38SUBST_SED.ld= -e "s|-Wl,-soname,libxvidcore...(SHARED_EXTENSION)...(API_MAJOR)||"