Thu Jan 10 23:30:53 2013 UTC ()
libavutil moved to ffmpeg/libavutil, fix for arm build


(jmcneill)
diff -r1.51 -r1.52 pkgsrc/multimedia/mplayer-share/Makefile.common
cvs diff -r1.51 -r1.52 pkgsrc/multimedia/mplayer-share/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/Makefile.common 2012/06/11 13:41:12 1.51
+++ pkgsrc/multimedia/mplayer-share/Makefile.common 2013/01/10 23:30:53 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.51 2012/06/11 13:41:12 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.52 2013/01/10 23:30:53 jmcneill Exp $
2# used by multimedia/gmplayer/Makefile 2# used by multimedia/gmplayer/Makefile
3# used by multimedia/mencoder/Makefile 3# used by multimedia/mencoder/Makefile
4# used by multimedia/mplayer/Makefile 4# used by multimedia/mplayer/Makefile
5 5
6MPLAYER_VERSION= 1.1 6MPLAYER_VERSION= 1.1
7 7
8DISTNAME= MPlayer-${MPLAYER_VERSION} 8DISTNAME= MPlayer-${MPLAYER_VERSION}
9 9
10CATEGORIES?= multimedia 10CATEGORIES?= multimedia
11 11
12MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/ 12MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/
13 13
14DIST_SUBDIR= mplayer 14DIST_SUBDIR= mplayer
@@ -47,26 +47,27 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ @@ -47,26 +47,27 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \
47# TMPDIR to ${WRKDIR} 47# TMPDIR to ${WRKDIR}
48CONFIGURE_ENV+= TMPDIR=${WRKDIR} 48CONFIGURE_ENV+= TMPDIR=${WRKDIR}
49 49
50.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
51 51
52# The configure script misdetects endianness on mipseb 52# The configure script misdetects endianness on mipseb
53.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipseb" 53.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipseb"
54CONFIGURE_ARGS+= --enable-big-endian 54CONFIGURE_ARGS+= --enable-big-endian
55.endif 55.endif
56 56
57.if !empty(MACHINE_PLATFORM:MNetBSD-*-arm) 57.if !empty(MACHINE_PLATFORM:MNetBSD-*-arm)
58# Avoid crash with system include file: 58# Avoid crash with system include file:
59pre-patch: 59pre-patch:
60 mv ${WRKSRC}/libavutil/arm/bswap.h ${WRKSRC}/libavutil/arm/avbswap.h 60 mv ${WRKSRC}/ffmpeg/libavutil/arm/bswap.h \
 61 ${WRKSRC}/ffmpeg/libavutil/arm/avbswap.h
61 62
62SUBST_CLASSES+= arm_bswap 63SUBST_CLASSES+= arm_bswap
63SUBST_STAGE.arm_bswap= pre-configure 64SUBST_STAGE.arm_bswap= pre-configure
64SUBST_FILES.arm_bswap= libavutil/bswap.h 65SUBST_FILES.arm_bswap= ffmpeg/libavutil/bswap.h
65SUBST_SED.arm_bswap= -e s,\"arm/bswap.h\",\"arm/avbswap.h\",g 66SUBST_SED.arm_bswap= -e s,\"arm/bswap.h\",\"arm/avbswap.h\",g
66SUBST_MESSAGE.arm_bswap= Fixing "arm/bswap.h" conflict in libavutil 67SUBST_MESSAGE.arm_bswap= Fixing "arm/bswap.h" conflict in libavutil
67 68
68# autodetect code enables these options on NetBSD/arm but it should not 69# autodetect code enables these options on NetBSD/arm but it should not
69CONFIGURE_ARGS+= --disable-armv5te --disable-armv6 --disable-armv6t2 70CONFIGURE_ARGS+= --disable-armv5te --disable-armv6 --disable-armv6t2
70.endif 71.endif
71 72
72.include "../../multimedia/mplayer-share/options.mk" 73.include "../../multimedia/mplayer-share/options.mk"