diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2006-02-05 20:06:59 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2006-02-05 20:06:59 +0000 |
| commit | fff6b0dd5ce953d62c5e3de6ac9d99c95971e324 (patch) | |
| tree | b9e9ec7ba331f61f7ec4f11412a234b59ae59209 /multimedia | |
| parent | BROKEN: Incomplete pkg-plist (diff) | |
- Fix plist if used with old ffmpeg
- Default to using ffmpeg-devel unless ffmpeg is already installed
Notes
Notes:
svn path=/head/; revision=155274
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libquicktime/Makefile | 13 | ||||
| -rw-r--r-- | multimedia/libquicktime/pkg-plist | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 0197d930bb98..35ff5bedca90 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -8,6 +8,7 @@ PORTNAME= libquicktime PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,14 +16,12 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ahze@FreeBSD.org COMMENT= A library for reading and writing quicktime files -LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ - vorbis.3:${PORTSDIR}/audio/libvorbis \ +LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ dv.4:${PORTSDIR}/multimedia/libdv INSTALLS_SHLIB= yes -USE_REINPLACE= yes USE_GL= yes USE_GNOME= gnometarget gnomehack pkgconfig WANT_GNOME= yes @@ -44,6 +43,14 @@ PORTDOCS= api_usage.html codecs.html qt4l_building.html \ .include <bsd.port.pre.mk> +.if exists(${LOCALBASE}/lib/libavutil-CVS.so) || !exists(${LOCALBASE}/lib/libavformat.a) +LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel +PLIST_SUB+= FFMPEG="" +.else +LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +PLIST_SUB+= FFMPEG="@comment " +.endif + .if ${HAVE_GNOME:Mgtk20}!="" || defined(WITH_GTK2) USE_GNOME+= gtk20 PLIST_SUB+= GTK="" diff --git a/multimedia/libquicktime/pkg-plist b/multimedia/libquicktime/pkg-plist index e1f06e34d150..e5fdcb360796 100644 --- a/multimedia/libquicktime/pkg-plist +++ b/multimedia/libquicktime/pkg-plist @@ -21,7 +21,7 @@ lib/libquicktime.so lib/libquicktime.so.0 lib/libquicktime/lqt_audiocodec.so lib/libquicktime/lqt_dv.so -lib/libquicktime/lqt_ffmpeg.so +%%FFMPEG%%lib/libquicktime/lqt_ffmpeg.so %%LAME%%lib/libquicktime/lqt_lame.so lib/libquicktime/lqt_mjpeg.so lib/libquicktime/lqt_opendivx.so |