diff options
| author | ahze <ahze@FreeBSD.org> | 2005-11-30 01:42:36 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2005-11-30 01:42:36 +0800 |
| commit | 83c0166b2b406d55c65deadb59784440ee899ecf (patch) | |
| tree | 2c4346cbeccb3cdc8b03c2b7afb7adb58ab35ccf | |
| parent | 38d7897211d16da913dde057ab9bb8767d7dc310 (diff) | |
| download | freebsd-ports-gnome-83c0166b2b406d55c65deadb59784440ee899ecf.tar.gz freebsd-ports-gnome-83c0166b2b406d55c65deadb59784440ee899ecf.tar.zst freebsd-ports-gnome-83c0166b2b406d55c65deadb59784440ee899ecf.zip | |
- Fix build if an older version of vlc is already installed
- Fix typo
Submitted by: db@db.net
kysd@po.harenet.ne.jp
| -rw-r--r-- | multimedia/vlc/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 2262d49a6442..328e3e1a07dd 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -235,7 +235,7 @@ MASTER_SITES= http://download2.videolan.org/pub/videolan/testing/${PORTNAME}-${D MAINTAINER= ahze@FreeBSD.org COMMENT= Multimedia streaming server and player for various audio/video formats -RUN_DEPEDNS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera +RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg CONFLICTS= vlc-devel* @@ -264,7 +264,7 @@ PLIST= ${WRKDIR}/plist INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include/vlc/ ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS+= --enable-ffmpeg \ @@ -585,6 +585,7 @@ CONFIGURE_ARGS+=--disable-mp3lame .if !defined(WITHOUT_MATROSKA) LIB_DEPENDS+= matroska.0:${PORTSDIR}/multimedia/libmatroska +BUILD_DEPENDS+= libebml>=0.7.6:${PORTSDIR}/textproc/libebml CONFIGURE_ARGS+=--enable-mkv .else CONFIGURE_ARGS+=--disable-mkv |