diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2007-05-25 17:08:35 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2007-05-25 17:08:35 +0000 |
| commit | bdc75674d0e0c25a7bc860b2d0a6da20bff99ca0 (patch) | |
| tree | fa3f4c8b9b204eb6cd856e8231ad40a057b6936b /multimedia/vlc | |
| parent | - Update to 2007-04-29 (merged from multimedia/ffmpeg-devel) (diff) | |
Use multimedia/ffmpeg now instead of multimedia/ffmpeg-devel
Notes
Notes:
svn path=/head/; revision=191808
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/vlc/Makefile.inc | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index a58a2fad117f..5a6b2e99d30a 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -22,7 +22,7 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Multimedia streaming server and player for various audio/video formats LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ - avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel + avcodec.1:${PORTSDIR}/multimedia/ffmpeg RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc index fef71f2a4bbb..620569d116c5 100644 --- a/multimedia/vlc/Makefile.inc +++ b/multimedia/vlc/Makefile.inc @@ -41,7 +41,7 @@ # # WITH_FAAC=yes # Faac audio encoder (mp4/aac) Support -# ** Only enable this if you compiled multimedia/ffmpeg-devel with WITH_FAAC knob ** +# ** Only enable this if you compiled multimedia/ffmpeg with WITH_FAAC knob ** # # WITH_FAAD=yes # Faad audio decoder (mp4/aac) Support @@ -262,17 +262,6 @@ post-patch: .endif @${REINPLACE_CMD} -e 's|dts_free|dca_free|g' ${WRKSRC}/configure -pre-configure: -.if !exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) && exists(${LOCALBASE}/lib/libavformat.a) - @${ECHO_CMD} "" - @${ECHO_CMD} "ERROR: ${PKGNAME} requires a newer version of FFMpeg" - @${ECHO_CMD} "please deinstall multimedia/ffmpeg before continuing" - @${ECHO_CMD} "the build." - @${ECHO_CMD} "" - @${FALSE} -.endif - - pre-build: @${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \ ${WRKSRC}/vlc-config |