From root@ahze.net  Sun May  2 19:58:53 2004
Return-Path: <root@ahze.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5903316A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  2 May 2004 19:58:53 -0700 (PDT)
Received: from ahze.ahze.net (adsl-068-209-163-003.sip.clt.bellsouth.net [68.209.163.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 94A8143D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  2 May 2004 19:58:52 -0700 (PDT)
	(envelope-from root@ahze.net)
Received: by ahze.ahze.net (Postfix, from userid 0)
	id 7D1796712; Sun,  2 May 2004 22:59:51 -0400 (EDT)
Message-Id: <20040503025951.7D1796712@ahze.ahze.net>
Date: Sun,  2 May 2004 22:59:51 -0400 (EDT)
From: michael johnson <ahze@ahze.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: hendrik@scholz.net
Subject: [PATCH] multimedia/totem: [Knob for GSTREAMER support|cdrom/dvd support ]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         66186
>Category:       ports
>Synopsis:       [PATCH] multimedia/totem: [Knob for GSTREAMER support|cdrom/dvd 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:   Sun May 02 20:00:33 PDT 2004
>Closed-Date:    Mon May 17 13:44:06 PDT 2004
>Last-Modified:  Mon May 17 13:44:06 PDT 2004
>Originator:     michael johnson
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #43: Thu Apr 22 05:38:22 EDT 2004
>Description:
- OPTION to use gstreamer instead of xine for the backend
- support for default /dev/acd0[c] instead of /dev/cdrom|dvd (/dev/dvd is gstreamer ONLY) 

vcd support with gstreamer will not work until pr-65451 is commited (I have never tested vcd support with xine+totem)

Port maintainer (hendrik@scholz.net) is cc'd.

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

--- totem-0.99.11.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/totem/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile	1 May 2004 22:28:07 -0000	1.36
+++ Makefile	3 May 2004 02:54:16 -0000
@@ -15,8 +15,7 @@
 MAINTAINER=	hendrik@scholz.net
 COMMENT=	A Xine-based video player for the Gnome 2 Desktop
 
-LIB_DEPENDS=	xine.9:${PORTSDIR}/multimedia/libxine
-
+USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop
@@ -25,22 +24,66 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 	       	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr"
 
+OPTIONS=	GSTREAMER_OVERRIDE "Use GStreamer instead of xine" off \
+		DVDNAV "Enable DVD support" on
+
 MAN1=	totem.1
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libdvdnav.so)
-WITH_DVDNAV=	yes
+.if defined(WITH_GSTREAMER_OVERRIDE)
+CONFIGURE_ARGS+=--enable-gstreamer
+USE_GNOME+=	gstreamerplugins
+WITHOUT_DVDNAV=	yes
+.else
+LIB_DEPENDS+=	xine.9:${PORTSDIR}/multimedia/libxine
 .endif
 
-.if defined(WITH_DVDNAV)
+.if defined(WITH_DVDNAV) && !defined(WITHOUT_DVDNAV)
 LIB_DEPENDS+=	dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
 .endif
 
-.if !defined(WITH_DVDNAV)
+.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
+
+.if defined(WITH_GSTREAMER_OVERRIDE)
+.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
+.endif
+
 pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You can enable DVD support by defining WITH_DVDNAV"
+	@${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}"
+	@${ECHO_MSG} "===> Define WITH_CDROM_DEVICE if you want to change the default"
+	@${ECHO_MSG} "===> For example, 'make WITH_CDROM_DEVICE=\"/dev/somedevice\"'"
+	@${ECHO_MSG} "===>"
+.if defined(WITH_GSTREAMER_OVERRIDE)
+	@${ECHO_MSG} "===> The default DVD device is ${DEFAULT_DVD_DEVICE}"
+	@${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default"
+	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
+		${WRKSRC}/src/cd-drive.c \
+		${WRKSRC}/src/totem-preferences.c \
+		${WRKSRC}/src/bacon-cd-selection.c
+.if defined(WITH_GSTREAMER_OVERRIDE)
+	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
+		${WRKSRC}/src/bacon-video-widget-gst.c
 .endif
 
 .include <bsd.port.post.mk>
--- totem-0.99.11.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Mon May 3 12:53:43 PDT 2004 
State-Changed-Why:  
Asked maintainer for approval. 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Mon May 3 12:53:43 PDT 2004 
Responsible-Changed-Why:  
Handle. 

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

From: Pav Lucistnik <pav@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, ahze@ahze.net,
	hendrik@scholz.net
Cc:  
Subject: Re: ports/66186: [PATCH] multimedia/totem: [Knob for GSTREAMER
	support|cdrom/dvd support ]
Date: Mon, 03 May 2004 21:53:41 +0200

 Dear maintainer of FreeBSD port multimedia/totem, please take a look at
 
 http://www.freebsd.org/cgi/query-pr.cgi?q=66186
 
 Do you approve this patch?
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 It's time for the penguin on top of your television set to explode.
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Mon May 17 13:44:00 PDT 2004 
State-Changed-Why:  
Committed, thanks! 

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