From 2f08b9986396cb828c3ef811b73cf8ff90cb200d Mon Sep 17 00:00:00 2001 From: ahze Date: Wed, 17 Nov 2004 01:05:23 +0000 Subject: Fix problem with a52 audio by statically linking Bump PORTREVISION Approved by: adamw (implicit) --- multimedia/vlc-devel/Makefile | 7 ++++++- multimedia/vlc/Makefile | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index 3225826230b..d2dbc7c3968 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -166,6 +166,7 @@ PORTNAME= vlc PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/contrib/:ffmpeg \ @@ -476,7 +477,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatrosk .if !defined(WITHOUT_LIBA52) LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 CONFIGURE_ARGS+=--enable-a52 \ - --with-a52=${LOCALBASE} + --with-a52-tree=${LOCALBASE} .else CONFIGURE_ARGS+=--diable-a52 .endif @@ -639,6 +640,10 @@ post-patch: s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \ ${WRKSRC}/mozilla/Makefile.in .endif +# a52 + @${REINPLACE_CMD} -e 's|include/a52.h|include/a52dec/a52.h|' \ + ${WRKSRC}/modules/audio_filter/converter/a52tofloat32.c \ + ${WRKSRC}/configure # skins2 interface @${REINPLACE_CMD} -e 's|lrint|rint|' \ ${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 3225826230b..d2dbc7c3968 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -166,6 +166,7 @@ PORTNAME= vlc PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/contrib/:ffmpeg \ @@ -476,7 +477,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatrosk .if !defined(WITHOUT_LIBA52) LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 CONFIGURE_ARGS+=--enable-a52 \ - --with-a52=${LOCALBASE} + --with-a52-tree=${LOCALBASE} .else CONFIGURE_ARGS+=--diable-a52 .endif @@ -639,6 +640,10 @@ post-patch: s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \ ${WRKSRC}/mozilla/Makefile.in .endif +# a52 + @${REINPLACE_CMD} -e 's|include/a52.h|include/a52dec/a52.h|' \ + ${WRKSRC}/modules/audio_filter/converter/a52tofloat32.c \ + ${WRKSRC}/configure # skins2 interface @${REINPLACE_CMD} -e 's|lrint|rint|' \ ${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp -- cgit