From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 2 20:00:34 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 1174116A4CE for ; Sun, 2 May 2004 20:00:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C551C43D2F for ; Sun, 2 May 2004 20:00:33 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i4330XYf033657 for ; Sun, 2 May 2004 20:00:33 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i4330XOh033649; Sun, 2 May 2004 20:00:33 -0700 (PDT) (envelope-from gnats) Resent-Date: Sun, 2 May 2004 20:00:33 -0700 (PDT) Resent-Message-Id: <200405030300.i4330XOh033649@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 5903316A4CE for ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/66186: [PATCH] multimedia/totem: [Knob for GSTREAMER support|cdrom/dvd 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: Mon, 03 May 2004 03:00:34 -0000 >Number: 66186 >Category: ports >Synopsis: [PATCH] multimedia/totem: [Knob for GSTREAMER support|cdrom/dvd 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: Sun May 02 20:00:33 PDT 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 #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 -.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 --- totem-0.99.11.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: