Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Sep 2004 22:26:20 +0200 (CEST)
From:      "Thomas E. Zander" <riggs@rrr.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/71542: [PATCH] Problem resolving in multimedia/mplayer
Message-ID:  <200409092026.i89KQKvT077839@marvin.riggiland.au>
Resent-Message-ID: <200409092030.i89KUQAc034292@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         71542
>Category:       ports
>Synopsis:       [PATCH] Problem resolving in multimedia/mplayer
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 09 20:30:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Thomas E. Zander
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD marvin.riggiland.au 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Mon Aug 2 13:00:46 CEST 2004 root@marvin.riggiland.au:/usr/obj/usr/src/sys/MARVIN i386
>Description:
Three problems turned up with the current mplayer port, of which
at least one is important (imho the last one):
o Deactivate libtremor due to unresolved build problems (pr 71530)
o Consistency of manpage after patching DEFAULT_(DVD|CDROM)_DEVICE
  (reported by Andre Albsmeier <andre.albsmeier@siemens.com>)
o Change PATCH_SITES to fix unfetchable distfile for GTK2 patch
  (thanks to michael johnson <ahze@ahze.net> for reporting this)
>How-To-Repeat:
>Fix:

Patch to multimedia/mplayer:

diff -ruN mplayer-old/Makefile mplayer/Makefile
--- mplayer-old/Makefile	Wed Sep  1 10:16:59 2004
+++ mplayer/Makefile	Thu Sep  9 22:02:47 2004
@@ -165,6 +165,7 @@
 # default: autodetect
 # By setting this option mplayer will use libtremor (integer only vorbis 
 # decoding lib) instead of libvorbis even if libvorbis is installed.
+# Note: This is disabled at the moment due to unresolved build problems
 #
 # WITH_SDL
 # default: autodetect
@@ -244,7 +245,8 @@
 MAINTAINER=	riggs@rrr.de
 COMMENT=	High performance media player/encoder supporting many formats
 
-PATCH_SITES=	http://homepages.ius.edu/CJEZELL/patches/
+PATCH_SITES=	http://www.win.net/~ardneh/patches/ \
+		http://www.rrr.de/~riggs/mplayer/
 PATCH_DIST_STRIP=	-p1
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
@@ -266,7 +268,8 @@
 		--disable-libfame \
 		--disable-external-faad \
 		--disable-tv-v4l \
-		--disable-caca
+		--disable-caca \
+		--disable-tremor
 
 .if defined(WITH_LANG)
 CONFIGURE_ARGS+=--language=${WITH_LANG}
@@ -519,12 +522,12 @@
 LIB_DEPENDS+=	theora.0:${PORTSDIR}/graphics/libtheora
 .endif
 
-.if defined(WITH_TREMOR)
-LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
-CONFIGURE_ARGS+=	--enable-tremor
-.else
-CONFIGURE_ARGS+=	--disable-tremor
-.endif
+#.if defined(WITH_TREMOR)
+#LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
+#CONFIGURE_ARGS+=	--enable-tremor
+#.else
+#CONFIGURE_ARGS+=	--disable-tremor
+#.endif
 
 .if defined(WITH_SDL)
 USE_SDL=	sdl
@@ -695,6 +698,9 @@
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
+		's|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
+		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
 .if defined(WITH_RTC)
 	@${REINPLACE_CMD} -e \
 		's|<linux/rtc.h>|<rtc.h>|' \
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409092026.i89KQKvT077839>