- 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)

multimedia/mencoder/Makefile

@@ -86,6 +86,7 @@ CONFIGURE_ARGS+=	--disable-mplayer \
 			--disable-joystick \
 			--disable-directfb \
 			--disable-mpg123 \
+			--disable-enca \
 			--disable-musepack
 
 ALL_TARGET=	mencoder

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} ""

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 \

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