From ahze@gentoo.ahze.net  Thu Apr  1 21:21:19 2004
Return-Path: <ahze@gentoo.ahze.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BD51716A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Apr 2004 21:21:19 -0800 (PST)
Received: from gentoo.ahze.net (adsl-068-209-163-003.sip.clt.bellsouth.net [68.209.163.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3326F43D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Apr 2004 21:21:19 -0800 (PST)
	(envelope-from ahze@gentoo.ahze.net)
Received: from gentoo.ahze.net (localhost [127.0.0.1])
	by gentoo.ahze.net (8.12.11/8.12.11) with ESMTP id i325Lc3u014974;
	Fri, 2 Apr 2004 00:21:38 -0500 (EST)
	(envelope-from ahze@gentoo.ahze.net)
Received: (from root@localhost)
	by gentoo.ahze.net (8.12.11/8.12.11/Submit) id i325LaOJ014973;
	Fri, 2 Apr 2004 00:21:36 -0500 (EST)
	(envelope-from ahze)
Message-Id: <200404020521.i325LaOJ014973@gentoo.ahze.net>
Date: Fri, 2 Apr 2004 00:21:36 -0500 (EST)
From: michael johnson <ahze@ahze.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: riggs@rrr.de
Subject: [PATCH] multimedia/mplayer: [DVD Device Support]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         65059
>Category:       ports
>Synopsis:       [PATCH] multimedia/mplayer: [DVD Device Support]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 01 21:30:14 PST 2004
>Closed-Date:    Sat Apr 03 07:11:29 PST 2004
>Last-Modified:  Sat Apr 03 07:11:29 PST 2004
>Originator:     michael johnson
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #37: Sat Mar 27 18:30:44 EST 2004
>Description:
- DVD device support

this allows `mplayer dvd://` to work out of the box with out having to supply -dvd-device /dev/DEVICE
 
Port maintainer (riggs@rrr.de) is cc'd.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- mplayer-gtk-esound-0.92.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/mplayer/Makefile,v
retrieving revision 1.89
diff -u -r1.89 Makefile
--- Makefile	31 Mar 2004 08:11:39 -0000	1.89
+++ Makefile	2 Apr 2004 05:14:34 -0000
@@ -91,6 +91,11 @@
 # WITH_DVD
 # default: autodetect
 #
+# WITH_DVD_DEVICE
+# default 5.x: /dev/acd0 
+# default 4.x: /dev/acd0c
+# change the default dvd device
+#
 # WITH_LIBDVDREAD
 # default: disabled
 # define this if you prefer the use of libdvdread instead of the
@@ -518,6 +523,16 @@
 CONFIGURE_ARGS+=--disable-xanim
 .endif
 
+.if defined(WITH_DVD_DEVICE)
+DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
+.else
+.if ${OSVERSION} < 500000
+DEFAULT_DVD_DEVICE=/dev/acd0c
+.else
+DEFAULT_DVD_DEVICE=/dev/acd0
+.endif
+.endif
+
 # "enable" build for other archs
 .if ${ARCH} == "i386"
 .if !defined(WITHOUT_RUNTIME_CPUDETECTION)
@@ -582,6 +597,8 @@
 		's|libxmms.so.1|libxmms.so|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
 		${WRKSRC}/configure
 .if defined(WITH_RTC)
 	@${REINPLACE_CMD} -e \
--- mplayer-gtk-esound-0.92.1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Thu Apr 1 21:33:56 PST 2004 
State-Changed-Why:  
Asked maintainer for approval. 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Thu Apr 1 21:33:56 PST 2004 
Responsible-Changed-Why:  
Handle 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65059 

From: Pav Lucistnik <pav@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, ahze@ahze.net, riggs@rrr.de
Cc:  
Subject: Re: ports/65059: [PATCH] multimedia/mplayer: [DVD Device Support]
Date: Fri, 02 Apr 2004 07:33:53 +0200

 Dear maintainer of FreeBSD port multimedia/mplayer, please take a look
 at
 
 http://www.freebsd.org/cgi/query-pr.cgi?q=65059
 
 Do you approve or reject that patch?
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 Autumn changed into Winter ... Winter changed into Spring ...  Spring
 changed back into Autumn and Autumn gave Winter and Spring a miss and went
 straight on into Summer

From: michael johnson <ahze@ahze.net>
To: freebsd-gnats-submit@FreeBSD.org
Cc: riggs@rrr.de, Pav Lucistnik <pav@FreeBSD.org>
Subject: Re: ports/65059: [PATCH] multimedia/mplayer: [DVD Device Support]
Date: Fri, 2 Apr 2004 01:03:21 -0500

 Actually,  VCD support defaults to /dev/cdrom
 if Riggs approves this patch we should add
 
 s|/dev/cdrom|${DEFAULT_DVD_DEVICE}|
 
 or maybe even DEFAULT_CDROM_DEVICE for people who have a cdrom and dvd 
 drive?
 
 michael
 

From: michael johnson <ahze@ahze.net>
To: freebsd-gnats-submit@FreeBSD.org
Cc: riggs@rrr.de, Pav Lucistnik <pav@FreeBSD.org>,
	mike johnson <ahze@ahze.net>
Subject: Re: ports/65059: [PATCH] multimedia/mplayer: [DVD Device Support]
Date: Fri, 2 Apr 2004 01:17:14 -0500

 this adds DEFAULT_CDROM_SUPPORT
 
 diff -ruN multimedia/mplayer.orig/Makefile multimedia/mplayer/Makefile
 --- multimedia/mplayer.orig/Makefile	Fri Apr  2 00:59:08 2004
 +++ multimedia/mplayer/Makefile	Fri Apr  2 01:14:53 2004
 @@ -96,6 +96,12 @@
   # default 4.x: /dev/acd0c
   # change the default dvd device
   #
 +# WITH_CDROM_DEVICE
 +# default 5.x: /dev/acd0
 +# default 4.x: /dev/acd0c
 +# change the default cdrom device
 +# useful for VCD's
 +#
   # WITH_LIBDVDREAD
   # default: disabled
   # define this if you prefer the use of libdvdread instead of the
 @@ -533,6 +539,16 @@
   .endif
   .endif
 
 +.if defined(WITH_CDROM_DEVICE)
 +DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
 +.else
 +.if ${OSVERSION} < 500000
 +DEFAULT_CDROM_DEVICE=/dev/acd0c
 +.else
 +DEFAULT_CDROM_DEVICE=/dev/acd0
 +.endif
 +.endif
 +
   # "enable" build for other archs
   .if ${ARCH} == "i386"
   .if !defined(WITHOUT_RUNTIME_CPUDETECTION)
 @@ -598,7 +614,8 @@
   		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
   	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
   		${WRKSRC}/configure
 -	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
 +	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 +		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
   		${WRKSRC}/configure
   .if defined(WITH_RTC)
   	@${REINPLACE_CMD} -e \
 

From: "Thomas E. Zander" <riggs@rrr.de>
To: freebsd-gnats-submit@FreeBSD.org, ahze@ahze.net
Cc: pav@FreeBSD.org
Subject: Re: ports/65059: [PATCH] multimedia/mplayer: [DVD Device Support]
Date: Fri, 2 Apr 2004 10:38:19 +0200

 --u3/rZRmxL6MmkK24
 Content-Type: text/plain; charset=iso-8859-15
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Good morning gentlemen,
 
 well, first, I don't use -dvd-device /dev/DEVICE, because we have
 devfs.conf :-)
 
 Nevertheless, the idea is quite usable.
 I think we should commit the solution with both DEFAULT_DVD_DEVICE and
 DEFAULT_CDROM_DEVICE.
 
 Regards,
 Riggs
 
 --=20
 - Die Welt schl=E4ft tief schon lange Zeit | Sent with RiggiSmooth [tm] -
 -- Mich nur flieht die Dunkelheit        | ------------------------- --
 --- Denn per Infrarot seh ich            | just to fit your         ---
 ---- Die Nacht ist wirklich widerlich.   | primitive screen.       ----
 
 --u3/rZRmxL6MmkK24
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 
 iD8DBQFAbSZ7jdSJKchZls0RApgKAJ0YaJbkjD9MdvRt9Gg/VLsIXf8MVQCdEsc0
 2w6zqsEuvMSlXHjVPTqFP8M=
 =Yw67
 -----END PGP SIGNATURE-----
 
 --u3/rZRmxL6MmkK24--

From: Adam Weinberger <adamw@FreeBSD.org>
To: michael johnson <ahze@ahze.net>
Cc: FreeBSD-gnats-submit@FreeBSD.org, riggs@rrr.de, pav@freebsd.org
Subject: Re: ports/65059: [PATCH] multimedia/mplayer: [DVD Device Support]
Date: 2 Apr 2004 10:51:04 -0500

 >> (04.02.2004 @ 0021 PST): michael johnson said, in 2.4K: <<
 > +# WITH_DVD_DEVICE
 > +# default 5.x: /dev/acd0 
 > +# default 4.x: /dev/acd0c
 > +# change the default dvd device
 >> end of "ports/65059: [PATCH] multimedia/mplayer: [DVD Device Support]" from michael johnson <<
 
 Many other programs assume the existence of /dev/dvd. I personally am
 not sure I see anything wrong with expecting that device to be created.
 
 I wonder if maybe leaving it to /dev/dvd will work out-of-the-box, as it
 were, for more people than hardcoding it to /dev/acd0? On the one hand,
 it assumes ATA, but on the other hand, you generally won't be watching
 DVDs on a server with a SCSI chain.....
 
 # Adam
 
 
 --
 Adam Weinberger
 adamw@magnesium.net || adamw@FreeBSD.org
 adamw@vectors.cx    ||   adamw@gnome.org
 http://www.vectors.cx

From: "Thomas E. Zander" <riggs@rrr.de>
To: Adam Weinberger <adamw@FreeBSD.org>
Cc: michael johnson <ahze@ahze.net>,
	FreeBSD-gnats-submit@FreeBSD.org, pav@FreeBSD.org
Subject: Re: ports/65059: [PATCH] multimedia/mplayer: [DVD Device Support]
Date: Fri, 2 Apr 2004 22:24:47 +0200

 --9amGYk9869ThD9tj
 Content-Type: text/plain; charset=iso-8859-15
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Am Fri, dem 02. Apr 2004, um 10:51 -0500 Uhr schrubte Adam Weinberger
 zum Thema [Re: ports/65059: [PATCH] multimedia/mplayer: [DVD Device Support=
 ]]:
 
 > Many other programs assume the existence of /dev/dvd. I personally am
 > not sure I see anything wrong with expecting that device to be created.
 >=20
 > I wonder if maybe leaving it to /dev/dvd will work out-of-the-box, as it
 > were, for more people than hardcoding it to /dev/acd0? On the one hand,
 > it assumes ATA, but on the other hand, you generally won't be watching
 > DVDs on a server with a SCSI chain.....
 
 Well, you can define WITH_DVD_DEVICE=3Dsomething in Michael's patch.
 What's wrong with it?
 
 Riggs
 
 --=20
 - Die Welt schl=E4ft tief schon lange Zeit | Sent with RiggiSmooth [tm] -
 -- Mich nur flieht die Dunkelheit        | ------------------------- --
 --- Denn per Infrarot seh ich            | just to fit your         ---
 ---- Die Nacht ist wirklich widerlich.   | primitive screen.       ----
 
 --9amGYk9869ThD9tj
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 
 iD8DBQFAbcwPjdSJKchZls0RAuDHAJ0cyPhvdZpjH4B8I8GwMXi0Bvo8YACfYxES
 s8p+FvAi02Lk8MiTV68hun0=
 =+m0A
 -----END PGP SIGNATURE-----
 
 --9amGYk9869ThD9tj--
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Sat Apr 3 07:11:22 PST 2004 
State-Changed-Why:  
Committed, thanks! 

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