From riggs@rrr.de  Thu Sep  9 20:27:15 2004
Return-Path: <riggs@rrr.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AC3BC16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Sep 2004 20:27:15 +0000 (GMT)
Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3278E43D54
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Sep 2004 20:27:15 +0000 (GMT)
	(envelope-from riggs@rrr.de)
Received: from mail.m-online.net (svr14.m-online.net [192.168.3.144])
	by svr8.m-online.net (Postfix) with ESMTP id 3008167E5B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Sep 2004 22:26:40 +0200 (CEST)
Received: from marvin.riggiland.au (ppp-62-245-162-183.mnet-online.de [62.245.162.183])
	by mail.m-online.net (Postfix) with ESMTP id B90CC121A8A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Sep 2004 22:26:34 +0200 (CEST)
Received: from marvin.riggiland.au (localhost [127.0.0.1])
	by marvin.riggiland.au (8.13.1/8.13.1) with ESMTP id i89KQKWO077840
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Sep 2004 22:26:20 +0200 (CEST)
	(envelope-from riggs@marvin.riggiland.au)
Received: (from riggs@localhost)
	by marvin.riggiland.au (8.13.1/8.13.1/Submit) id i89KQKvT077839;
	Thu, 9 Sep 2004 22:26:20 +0200 (CEST)
	(envelope-from riggs)
Message-Id: <200409092026.i89KQKvT077839@marvin.riggiland.au>
Date: Thu, 9 Sep 2004 22:26:20 +0200 (CEST)
From: "Thomas E. Zander" <riggs@rrr.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Problem resolving in multimedia/mplayer
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71542
>Category:       ports
>Synopsis:       [PATCH] Problem resolving in multimedia/mplayer
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 09 20:30:26 GMT 2004
>Closed-Date:    Wed Sep 22 19:54:57 GMT 2004
>Last-Modified:  Wed Sep 22 19:54:57 GMT 2004
>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:
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Wed Sep 22 19:54:45 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71542 
>Unformatted:
