Date: Sun, 2 May 2004 22:59:51 -0400 (EDT) From: michael johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/66186: [PATCH] multimedia/totem: [Knob for GSTREAMER support|cdrom/dvd support ] Message-ID: <20040503025951.7D1796712@ahze.ahze.net> Resent-Message-ID: <200405030300.i4330XOh033649@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040503025951.7D1796712>