diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2012-02-11 07:26:29 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2012-02-11 07:26:29 +0800 |
| commit | 2edea2e58c955fdf3bb6a7678b3fdcc9b7f82921 (patch) | |
| tree | b78910246a2eb8fb6647ca544a17735626844477 /multimedia | |
| parent | d45a4b98a270f301c259232d447f47907a777b6a (diff) | |
| download | freebsd-ports-gnome-2edea2e58c955fdf3bb6a7678b3fdcc9b7f82921.tar.gz freebsd-ports-gnome-2edea2e58c955fdf3bb6a7678b3fdcc9b7f82921.tar.zst freebsd-ports-gnome-2edea2e58c955fdf3bb6a7678b3fdcc9b7f82921.zip | |
- Add option for enca charset detection
- Fix v4l support
PR: 164639
Submitted by: "Marat N.Afanasyev" <amarat@ksu.ru>
Fix by: Thomas Zander <thomas.e.zander@googlemail.com> (maintainer)
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mencoder/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile.options | 2 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile.shared | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index f5b80eaac910..ddca86985f37 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -86,6 +86,7 @@ CONFIGURE_ARGS+= --disable-mplayer \ --disable-joystick \ --disable-directfb \ --disable-mpg123 \ + --disable-enca \ --disable-musepack ALL_TARGET= mencoder diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 3d1c1a073f85..eb2d405ef7a8 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= High performance media player supporting many formats .include "${.CURDIR}/Makefile.shared" @@ -66,6 +66,7 @@ OPTIONS+= LIBLZO "Enable external liblzo library" off OPTIONS+= JOYSTICK "Enable joystick support" off OPTIONS+= V4L "Enable Video4Linux TV support" off OPTIONS+= LIBRTMP "Enable RTMPDump Streaming Media support" off +OPTIONS+= ENCA "Enable enca charset detection" off MAN1= mplayer.1 MANCOMPRESSED= no @@ -221,6 +222,12 @@ CONFIGURE_ARGS+=--enable-joystick CONFIGURE_ARGS+=--disable-joystick .endif +.if defined(WITH_ENCA) +LIB_DEPENDS+= enca.5:${PORTSDIR}/converters/enca +.else +CONFIGURE_ARGS+= --disable-enca +.endif + pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index 5262d3a6880b..92d20ae3d004 100644 --- a/multimedia/mplayer/Makefile.options +++ b/multimedia/mplayer/Makefile.options @@ -244,6 +244,8 @@ CONFIGURE_ARGS+= --disable-libgsm .if defined(WITH_V4L) BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS+= v4l2.0:${PORTSDIR}/multimedia/libv4l +CONFIGURE_ARGS+= --enable-tv-v4l1 \ + --enable-tv-v4l2 EXTRA_LIBS+= -lv4l1 -lv4l2 .else CONFIGURE_ARGS+= --disable-tv-v4l1 \ diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared index 722c576a006c..5d9887ddfdb8 100644 --- a/multimedia/mplayer/Makefile.shared +++ b/multimedia/mplayer/Makefile.shared @@ -39,8 +39,7 @@ CONFIGURE_ARGS= --cc="${CC}" \ --disable-bitmap-font \ --disable-liba52 \ --disable-alsa \ - --enable-ass-internal \ - --disable-enca + --enable-ass-internal WANT_GNOME= yes WANT_SDL= yes |