summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2007-10-09 19:38:24 +0000
committerMichael Johnson <ahze@FreeBSD.org>2007-10-09 19:38:24 +0000
commit0bbbeb0b91fced39db5527dffe3b0a39204a27d1 (patch)
tree0d6195fa13a83f05173d399e0fb2686945a025cb /multimedia
parent- Don't add sunffb video driver to VIDEO_OFF on !sparc64 as it (diff)
pass CONFIGURE_ARGS if WITHOUT_X264 is defined
Requested by: mezz
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 00a9ebdeeb32..313b850d4dd2 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -160,10 +160,12 @@ CONFIGURE_ARGS+= --enable-libvorbis
FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis
.endif
# x264
-.ifndef(WITHOUT_X264) || exists(${LOCALBASE}/lib/libx264.so)
+.ifndef(WITHOUT_X264)
LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
CONFIGURE_ARGS+= --enable-libx264
+.else
+CONFIGURE_ARGS+= --disable-libx264
.endif
## builtin vector, requires mmx
.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)