summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjmcneill <jmcneill@pkgsrc.org>2013-01-10 23:30:53 +0000
committerjmcneill <jmcneill@pkgsrc.org>2013-01-10 23:30:53 +0000
commit92deb7b4e026bb4962b1f0061557df7765a53efd (patch)
tree8cb0d6305afbea07511683f14a785ab9ec19ba02 /multimedia
parent5d847b681ea91829cd65436cb2f53ebdb2a3b0b0 (diff)
downloadpkgsrc-92deb7b4e026bb4962b1f0061557df7765a53efd.tar.gz
libavutil moved to ffmpeg/libavutil, fix for arm build
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mplayer-share/Makefile.common7
1 files changed, 4 insertions, 3 deletions
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index d77a0db6b0e..bbf34f29856 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.51 2012/06/11 13:41:12 wiz Exp $
+# $NetBSD: Makefile.common,v 1.52 2013/01/10 23:30:53 jmcneill Exp $
# used by multimedia/gmplayer/Makefile
# used by multimedia/mencoder/Makefile
# used by multimedia/mplayer/Makefile
@@ -57,11 +57,12 @@ CONFIGURE_ARGS+= --enable-big-endian
.if !empty(MACHINE_PLATFORM:MNetBSD-*-arm)
# Avoid crash with system include file:
pre-patch:
- mv ${WRKSRC}/libavutil/arm/bswap.h ${WRKSRC}/libavutil/arm/avbswap.h
+ mv ${WRKSRC}/ffmpeg/libavutil/arm/bswap.h \
+ ${WRKSRC}/ffmpeg/libavutil/arm/avbswap.h
SUBST_CLASSES+= arm_bswap
SUBST_STAGE.arm_bswap= pre-configure
-SUBST_FILES.arm_bswap= libavutil/bswap.h
+SUBST_FILES.arm_bswap= ffmpeg/libavutil/bswap.h
SUBST_SED.arm_bswap= -e s,\"arm/bswap.h\",\"arm/avbswap.h\",g
SUBST_MESSAGE.arm_bswap= Fixing "arm/bswap.h" conflict in libavutil