From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 1 21:30:14 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C598A16A4D0 for ; Thu, 1 Apr 2004 21:30:14 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9E8143D41 for ; Thu, 1 Apr 2004 21:30:14 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i325UEbv059332 for ; Thu, 1 Apr 2004 21:30:14 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i325UEnC059331; Thu, 1 Apr 2004 21:30:14 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 1 Apr 2004 21:30:14 -0800 (PST) Resent-Message-Id: <200404020530.i325UEnC059331@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, michael johnson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD51716A4CE for ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: riggs@rrr.de Subject: ports/65059: [PATCH] multimedia/mplayer: [DVD Device Support] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Apr 2004 05:30:15 -0000 >Number: 65059 >Category: ports >Synopsis: [PATCH] multimedia/mplayer: [DVD Device Support] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Apr 01 21:30:14 PST 2004 >Closed-Date: >Last-Modified: >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: >Unformatted: