diff options
| author | Brendan Fabeny <bf@FreeBSD.org> | 2011-08-01 11:40:31 +0800 |
|---|---|---|
| committer | Brendan Fabeny <bf@FreeBSD.org> | 2011-08-01 11:40:31 +0800 |
| commit | 07b6aa4bc800ec403d9188f2a774912ca6323fca (patch) | |
| tree | 613d4d89c8349c201227c55555fec32c15437226 /multimedia/mencoder | |
| parent | d2b287688c9c9f1d16dd002791a0b785dc604a54 (diff) | |
| download | freebsd-ports-gnome-07b6aa4bc800ec403d9188f2a774912ca6323fca.tar.gz freebsd-ports-gnome-07b6aa4bc800ec403d9188f2a774912ca6323fca.tar.zst freebsd-ports-gnome-07b6aa4bc800ec403d9188f2a774912ca6323fca.zip | |
Enable libass by default; do not silently override user-specified
libass option; disable enca autodetection when libass is disabled;
bump portrevision
Approved by: Thomas Zander (maintainer)
Diffstat (limited to 'multimedia/mencoder')
| -rw-r--r-- | multimedia/mencoder/Makefile | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 10128fc70092..dbecf4fae38c 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -6,7 +6,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Convenient video file and movie encoder RESTRICTED= Port has restricted dependencies @@ -41,7 +41,7 @@ OPTIONS+= X264 "Enable x264 (H.264) video codec support" on OPTIONS+= VPX "Enable VP8 video via libvpx" off OPTIONS+= DIRAC "Enable dirac video codec support" off OPTIONS+= SCHROEDINGER "Dirac codec via libschroedinger" off -OPTIONS+= ASS "Enable ASS/SSA subtitle rendering" Off +OPTIONS+= ASS "Enable ASS/SSA subtitle rendering" on OPTIONS+= REALPLAYER "Enable real player plugin" off OPTIONS+= LIVEMEDIA "Enable LIVE555 streaming support" off OPTIONS+= SMB "Enable Samba input support" off @@ -65,12 +65,6 @@ TOOLFILES= aconvert.sh binary_codecs.sh calcbpp.pl \ psnr-video.sh qepdvcd.sh subedit.pl \ subsearch.sh w32codec_dl.pl wma2ogg.pl \ -# fix for bug when libass is installed, mplayer configure does not -# uphold --disable-ass -.if exists(${LOCALBASE}/lib/libass.so) -WITH_ASS= yes -.endif - .include <bsd.port.pre.mk> LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame @@ -99,10 +93,10 @@ ALL_TARGET= mencoder .if defined(WITH_ASS) LIB_DEPENDS+= ass.5:${PORTSDIR}/multimedia/libass -USE_GNOME+= pkgconfig +BUILD_DEPENDS += pkg-config:${PORTSDIR}/devel/pkg-config LIBASS_PKGCONFIG_CFLAGS= pkg-config --cflags --silence-errors libass .else -CONFIGURE_ARGS+= --disable-ass --disable-ass-internal +CONFIGURE_ARGS+= --disable-ass --disable-ass-internal --disable-enca LIBASS_PKGCONFIG_CFLAGS= ${ECHO_CMD} .endif |