diff options
author | adamw <adamw@FreeBSD.org> | 2004-02-29 03:40:31 +0800 |
---|---|---|
committer | adamw <adamw@FreeBSD.org> | 2004-02-29 03:40:31 +0800 |
commit | 1e6f49bdfea0592ac4c25b862e7b0439ca83a5ff (patch) | |
tree | 618e643385339868a680ca6383612a575470dfc2 /multimedia/ffmpeg | |
parent | 191437e6b7819c6876f53690468ded96159cbf51 (diff) | |
download | freebsd-ports-gnome-1e6f49bdfea0592ac4c25b862e7b0439ca83a5ff.tar.gz freebsd-ports-gnome-1e6f49bdfea0592ac4c25b862e7b0439ca83a5ff.tar.zst freebsd-ports-gnome-1e6f49bdfea0592ac4c25b862e7b0439ca83a5ff.zip |
Add faad support, unbreak imlib2 support, and fix the pkg-plist. All topped
with a PORTREVISION bump.
Approved by: no response from maintainer
Diffstat (limited to 'multimedia/ffmpeg')
-rw-r--r-- | multimedia/ffmpeg/Makefile | 21 | ||||
-rw-r--r-- | multimedia/ffmpeg/pkg-plist | 2 |
2 files changed, 20 insertions, 3 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index ac0388d52032..03da9d94fd9c 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.4.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia audio net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ffmpeg @@ -78,6 +78,9 @@ WITH_MP3=yes .if exists(${LOCALBASE}/lib/libvorbisenc.so.2) WITH_VORBIS=yes .endif +.if exists(${LOCALBASE}/lib/libfaad.so.0) +WITH_FAAD=yes +.endif ## support activation ## @@ -129,11 +132,13 @@ CONFIGURE_ARGS+= --enable-mp3lame .ifdef(WITH_OPTIMIZED_CFLAGS) CONFIGURE_ARGS+= --extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \ -I${X11BASE}/include \ - -ffast-math -fomit-frame-pointer" + -ffast-math -fomit-frame-pointer" \ + --extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" .else CONFIGURE_ARGS+= --extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \ -I${X11BASE}/include" \ - --disable-opts + --disable-opts" + --extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm " .endif ## vhook @@ -150,6 +155,12 @@ LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --enable-vorbis .endif +## faad +.ifdef(WITH_FAAD) +LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad + +CONFIGURE_ARGS+= --enable-faad +.endif pre-everything:: .ifndef(WITH_FREETYPE2) @@ -185,6 +196,10 @@ pre-everything:: @${ECHO_MSG} 'Define WITH_VORBIS to enable libvorbisenc VORBIS codec' @${ECHO_MSG} .endif +.ifndef(WITH_FAAD) + @${ECHO_MSG} 'Define WITH_FAAD to enable libfaad codec' + @${ECHO_MSG} +.endif .if ${ARCH} == "i386" .if !(defined(WITH_BKTR_FORMAT) && defined(WITH_BKTR_DEV)) @${ECHO_MSG} diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist index c4eabe8ebd3b..a24e68f4e971 100644 --- a/multimedia/ffmpeg/pkg-plist +++ b/multimedia/ffmpeg/pkg-plist @@ -14,6 +14,8 @@ lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.%%SHLIB_VERSION%% lib/libavformat.a +lib/libavformat.so +lib/libavformat.so.%%SHLIB_VERSION%% %%VHOOK%%%%DRAWTEXT%%lib/vhook/drawtext.so %%VHOOK%%lib/vhook/fish.so %%VHOOK%%%%IMLIB2%%lib/vhook/imlib2.so |