diff options
| author | ahze <ahze@FreeBSD.org> | 2006-12-09 10:31:59 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2006-12-09 10:31:59 +0800 |
| commit | 95986988df0276ba9bd5531dd85a7b8996dd6345 (patch) | |
| tree | 8214598a37710af2556afcb90ec0b04943921204 /multimedia/libquicktime | |
| parent | 44fed12257ce3ab0ae5083f63acbae9d32e3046a (diff) | |
| download | freebsd-ports-gnome-95986988df0276ba9bd5531dd85a7b8996dd6345.tar.gz freebsd-ports-gnome-95986988df0276ba9bd5531dd85a7b8996dd6345.tar.zst freebsd-ports-gnome-95986988df0276ba9bd5531dd85a7b8996dd6345.zip | |
- Disable ffmpeg support if multimedia/ffmpeg is installed before building
libquicktime, otherwise depend on multimedia/ffmpeg-devel
Reported by: Randy Pratt <bsd-unix@earthlink.net>
Diffstat (limited to 'multimedia/libquicktime')
| -rw-r--r-- | multimedia/libquicktime/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/libquicktime/pkg-plist | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 97bf1dc6d654..833a161dba2f 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -8,6 +8,7 @@ PORTNAME= libquicktime PORTVERSION= 0.9.9 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,7 +21,7 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \ png.5:${PORTSDIR}/graphics/png \ dv.4:${PORTSDIR}/multimedia/libdv -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GL= yes USE_GNOME= gnometarget gnomehack pkgconfig WANT_GNOME= yes @@ -44,11 +45,12 @@ PORTDOCS= api_usage.html codecs.html qt4l_building.html \ .if exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) || !exists(${LOCALBASE}/lib/libavformat.a) LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel +PLIST_SUB+= FFMPEG="" .else -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +NO_FFMPEG= ${TRUE} +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 34c3a6ba808d..288a570ced9e 100644 --- a/multimedia/libquicktime/pkg-plist +++ b/multimedia/libquicktime/pkg-plist @@ -25,8 +25,8 @@ lib/libquicktime/lqt_dv.la lib/libquicktime/lqt_dv.so %%LAME%%lib/libquicktime/lqt_lame.so %%LAME%%lib/libquicktime/lqt_lame.la -lib/libquicktime/lqt_ffmpeg.la -lib/libquicktime/lqt_ffmpeg.so +%%FFMPEG%%lib/libquicktime/lqt_ffmpeg.la +%%FFMPEG%%lib/libquicktime/lqt_ffmpeg.so lib/libquicktime/lqt_mjpeg.la lib/libquicktime/lqt_mjpeg.so lib/libquicktime/lqt_opendivx.la |