summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-05-22 22:10:53 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-05-22 22:10:53 +0800
commitfc31e6fc9e56c2157d44c7f016cc5684e88a0527 (patch)
treea53d6674d6203741439bf3e7b154b8c1e86856f2 /multimedia
parent2cf350c995fb495f60fb6e948bf93be15486fd82 (diff)
downloadmarcuscom-ports-fc31e6fc9e56c2157d44c7f016cc5684e88a0527.tar
marcuscom-ports-fc31e6fc9e56c2157d44c7f016cc5684e88a0527.tar.gz
marcuscom-ports-fc31e6fc9e56c2157d44c7f016cc5684e88a0527.tar.bz2
marcuscom-ports-fc31e6fc9e56c2157d44c7f016cc5684e88a0527.tar.lz
marcuscom-ports-fc31e6fc9e56c2157d44c7f016cc5684e88a0527.tar.xz
marcuscom-ports-fc31e6fc9e56c2157d44c7f016cc5684e88a0527.tar.zst
marcuscom-ports-fc31e6fc9e56c2157d44c7f016cc5684e88a0527.zip
- Better detect ffmpeg-devel
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6307 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc-devel/Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 23ea8fd0b..b35226eb1 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -3,7 +3,7 @@
# Whom: Brian Somers <brian@FreeBSD.org>
#
# $FreeBSD: ports/multimedia/vlc-devel/Makefile,v 1.146 2006/05/22 01:12:07 ahze Exp $
-# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.9 2006/05/15 02:56:23 ahze Exp $
+# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.10 2006/05/22 01:50:17 ahze Exp $
#
# *** PLEASE READ Makefile.inc for more information on knobs ***
#
@@ -77,7 +77,7 @@ CPPFLAGS+= -I${X11BASE}/include/wx-2.6/
BROKEN=Does not compile with perl ${PERL_VERSION}
.endif
-.if exists(${LOCALBASE}/lib/libavutil-CVS.so) || !exists(${LOCALBASE}/lib/libavformat.a)
+.if exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) || !exists(${LOCALBASE}/lib/libavformat.a)
LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
.else
LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
@@ -168,6 +168,13 @@ CONFIGURE_ENV+= WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
CONFIGURE_ARGS+=--disable-wxwidgets
.endif
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=--enable-hal
+.else
+CONFIGURE_ARGS+=--disable-hal
+.endif
+
.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)
LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
CONFIGURE_ARGS+= --enable-arts