misc/149534: [maintainer-update] multimedia/mplayer and mencoder dependency corrections

[Thomas Zander]

>Number:         149534
>Category:       misc
>Synopsis:       [maintainer-update] multimedia/mplayer and mencoder dependency corrections
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 11 20:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Zander
>Release:        FreeBSD 8.1-STABLE
>Organization:
>Environment:
>Description:
This patch comprises the following changes to the mplayer and mencoder ports:
- correctly picks up dependency on libvpx if selected in options
- removes mencoder dependency on mplayer. the two ports can now be installed independently
- remove dependency on liba52 as this is handled by internal libavcodec
- correctly handles dependency on external libschroedinger

Thanks to Christopher Key <cjk32 at cam.ac.uk> for patch proposals and testing!
>How-To-Repeat:

>Fix:
patch attached

Patch attached with submission follows:

diff -ruN /usr/ports/multimedia/mplayer/Makefile mplayer/Makefile
--- /usr/ports/multimedia/mplayer/Makefile	2010-08-03 14:37:28.000000000 +0200
+++ mplayer/Makefile	2010-08-08 21:45:09.144987619 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-
+PORTREVISION=	1
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
@@ -47,6 +47,7 @@
 OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
 OPTIONS+=	SPEEX "Enable speex audio codec support" on
 OPTIONS+=	THEORA "Enable ogg theora video support" off
+OPTIONS+=	VPX "Enable VP8 video via libvpx" off
 OPTIONS+=	SCHROEDINGER "Dirac codec via libschroedinger" off
 .if !defined(PACKAGE_BUILDING)
 OPTIONS+=	WIN32 "Enable win32 codec set on the IA32 arch" on
diff -ruN /usr/ports/multimedia/mplayer/Makefile.options mplayer/Makefile.options
--- /usr/ports/multimedia/mplayer/Makefile.options	2010-08-03 14:37:28.000000000 +0200
+++ mplayer/Makefile.options	2010-08-08 21:38:28.971975984 +0200
@@ -84,10 +84,16 @@
 CONFIGURE_ARGS+=	--disable-theora
 .endif
 
+.if defined(WITH_VPX)
+LIB_DEPENDS+=		vpx.0:${PORTSDIR}/multimedia/libvpx
+.else
+CONFIGURE_ARGS+=	--disable-libvpx-lavc
+.endif
+
 .if defined(WITH_SCHROEDINGER)
 LIB_DEPENDS+=		schroedinger-1.0.3:${PORTSDIR}/multimedia/schroedinger
 .else
-CONFIGURE_ARGS+=	--disable-libschroedinger
+CONFIGURE_ARGS+=	--disable-libschroedinger-lavc
 .endif
 
 .if defined(WITH_LIBMPCDEC)
diff -ruN /usr/ports/multimedia/mplayer/Makefile.shared mplayer/Makefile.shared
--- /usr/ports/multimedia/mplayer/Makefile.shared	2010-08-03 14:37:28.000000000 +0200
+++ mplayer/Makefile.shared	2010-08-08 22:22:39.035559350 +0200
@@ -24,7 +24,8 @@
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		TMPDIR="${WRKSRC}"
-CONFIGURE_ARGS= --disable-bitmap-font
+CONFIGURE_ARGS= --disable-bitmap-font \
+		--disable-liba52
 
 WANT_GNOME=	yes
 WANT_SDL=	yes
diff -ruN /usr/ports/multimedia/mencoder/Makefile mencoder/Makefile
--- /usr/ports/multimedia/mencoder/Makefile	2010-08-03 14:37:28.000000000 +0200
+++ mencoder/Makefile	2010-08-08 21:58:53.534489773 +0200
@@ -6,6 +6,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
+PORTREVISION=	1
 COMMENT=	Convenient video file and movie encoder
 RESTRICTED=	Port has restricted dependencies
 
@@ -34,6 +35,7 @@
 OPTIONS+=	THEORA "Enable ogg theora video support" off
 OPTIONS+=	XVID "Enable XVID video codec support" on
 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+=	REALPLAYER "Enable real player plugin" off
@@ -45,7 +47,7 @@
 OPTIONS+=	LIBLZO "Enable external liblzo library" off
 OPTIONS+=	V4L "Enable Video4Linux TV support" off
 
-MLINKS=		mplayer.1 mencoder.1
+MAN1=		mencoder.1
 
 PATCHDIR=	${.CURDIR}/../mplayer/files
 DATADIR=	${PREFIX}/share/mplayer
@@ -61,8 +63,6 @@
 .include <bsd.port.pre.mk>
 
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
-BUILD_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 CONFIGURE_ARGS+=	--disable-mplayer \
 			--disable-libdca \
@@ -157,6 +157,7 @@
 	@${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin
 
 post-install:
+	@${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${MAN1PREFIX}/man/man1/mencoder.1
 	@${MKDIR} ${DATADIR}
 	@${CHMOD} 755 ${DATADIR}
 	@${MKDIR} ${DATADIR}/tools


>Release-Note:
>Audit-Trail:
>Unformatted: