diff options
| author | lioux <lioux@FreeBSD.org> | 2004-11-10 01:48:47 +0000 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2004-11-10 01:48:47 +0000 |
| commit | f9e0e3e3dc7971cd2a41aa15022bced7f9dfc3cb (patch) | |
| tree | 21db56b510c20da513f928429e6d47af099370dd /audio/faad | |
| parent | 8470dad5bc98d30fafc74e241300ddaffdcdee20 (diff) | |
| download | FreeBSD-ports-f9e0e3e3dc7971cd2a41aa15022bced7f9dfc3cb.zip FreeBSD-ports-f9e0e3e3dc7971cd2a41aa15022bced7f9dfc3cb.tar.gz | |
o Have faad depend on mpeg4ip-libmp4v2 so mpeg4ip can use faad
o Bump PORTREVISION
PR: 72205
Submitted by: ahze
Diffstat (limited to 'audio/faad')
| -rw-r--r-- | audio/faad/Makefile | 41 | ||||
| -rw-r--r-- | audio/faad/pkg-plist | 9 |
2 files changed, 6 insertions, 44 deletions
diff --git a/audio/faad/Makefile b/audio/faad/Makefile index b7cdfeb..af6f4cc 100644 --- a/audio/faad/Makefile +++ b/audio/faad/Makefile @@ -7,16 +7,17 @@ PORTNAME= faad2 PORTVERSION= 2.0 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= faac MAINTAINER= ahze@FreeBSD.org COMMENT= A LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder -LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile +LIB_DEPENDS= mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \ + sndfile.1:${PORTSDIR}/audio/libsndfile WRKSRC= ${WRKDIR}/${PORTNAME} @@ -31,9 +32,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 USE_REINPLACE= yes -WANT_SDL= yes -CONFIGURE_ARGS= --with-mp4v2 --with-drm +CONFIGURE_ARGS= --with-drm CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ @@ -48,27 +48,6 @@ WITHOUT_MPEG4IP=yes .endif .endif -.if defined(WITHOUT_MPEG4IP) -PLIST_SUB+= WITHOUT_MPEG4IP="" PLUGIN="@comment " -.else -LIB_DEPENDS+= mp4.0:${PORTSDIR}/multimedia/mpeg4ip -USE_SDL= sdl -PLIST_SUB+= WITHOUT_MPEG4IP="@comment " PLUGIN="" -.endif - -pre-everything:: - @${ECHO_MSG} "===>" -.if !defined(WITHOUT_MPEG4IP) - @${ECHO_MSG} "===> you can disable mpeg4ip support by" - @${ECHO_MSG} "===> defining WITHOUT_MPEG4IP" -.else - @${ECHO_MSG} "===> WARNING: WITHOUT_MPEG4IP is defined" - @${ECHO_MSG} "===> Having WITHOUT_MPEG4IP defined conflicts" - @${ECHO_MSG} "===> with multimedia/mpeg4ip and you will not" - @${ECHO_MSG} "===> be able to install mpeg4ip after you install faad2" -.endif - @${ECHO_MSG} "===>" - pre-patch: build-depends post-patch: @@ -78,11 +57,7 @@ post-patch: ${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake @${REINPLACE_CMD} -e 's|$$lt_target|$$host|' \ ${WRKSRC}/aclocal.m4 -.if !defined(WITHOUT_MPEG4IP) - @${REINPLACE_CMD} -e 's|<SDL|<SDL11|' \ - ${WRKSRC}/plugins/mpeg4ip/faad2.cpp -.endif - @${ECHO_CMD} "SUBDIRS = libfaad common frontend plugins" > \ + @${ECHO_CMD} "SUBDIRS = libfaad common frontend" > \ ${WRKSRC}/Makefile.am .if ${OSVERSION} < 500000 @${REINPLACE_CMD} -e 's|stdint.h|sys/inttypes.h|' \ @@ -93,9 +68,5 @@ post-patch: ${XARGS} -n 5 -x \ ${REINPLACE_CMD} -e \ 's|-O2|${CFLAGS}|' -post-install: -.if defined(WITHOUT_MPEG4IP) - @${INSTALL_DATA} ${WRKSRC}/common/mp4v2/systems.h ${PREFIX}/include -.endif .include <bsd.port.post.mk> diff --git a/audio/faad/pkg-plist b/audio/faad/pkg-plist index fa6cc90..9063f2e 100644 --- a/audio/faad/pkg-plist +++ b/audio/faad/pkg-plist @@ -7,12 +7,3 @@ lib/libfaad.so.0 lib/libmp4ff.a lib/libmp4ff.so lib/libmp4ff.so.0 -%%PLUGIN%%lib/mp4player_plugin/faad2_plugin.a -%%PLUGIN%%lib/mp4player_plugin/faad2_plugin.so -%%PLUGIN%%lib/mp4player_plugin/faad2_plugin.so.0 -%%WITHOUT_MPEG4IP%%include/mp4.h -%%WITHOUT_MPEG4IP%%include/mpeg4ip.h -%%WITHOUT_MPEG4IP%%include/systems.h -%%WITHOUT_MPEG4IP%%lib/libmp4v2.a -%%WITHOUT_MPEG4IP%%lib/libmp4v2.so -%%WITHOUT_MPEG4IP%%lib/libmp4v2.so.0 |
