ports/134152: Allow x11/gnome2 and x11/gnome2-lite to use totem-xine

[Joseph S. Atkinson]

>Number:         134152
>Category:       ports
>Synopsis:       Allow x11/gnome2 and x11/gnome2-lite to use totem-xine
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 02 07:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Joseph S. Atkinson
>Release:        FreeBSD 7.2-RC2 i386
>Organization:
>Environment:


System: FreeBSD 7.2-RC2 #0: Sat Apr 25 14:38:07 EDT 2009
    jsa at mephisto.wickedmachine.net:/usr/obj/usr/src/sys/MEPHISTO



>Description:


This adds the OPTION/KNOB hooks to the gnome2 and gnome2-lite meta ports to allow users to select the totem-xine instead of the default gstreamer totem. This makes it convient for users who want to use totem-xine but don't want to have to uninstall the metaports which can facilitate updates and help determine which ports are leaves.

The larger benefit of this option is that libxine enables dvd playback within totem, while gsteamer does not.


>How-To-Repeat:





>Fix:


--- gnome2-totem-xine.diff begins here ---
--- gnome2/Makefile.orig	2009-05-02 01:39:00.000000000 -0400
+++ gnome2/Makefile	2009-05-02 02:29:00.000000000 -0400
@@ -47,7 +47,6 @@
 		exchange-connector-setup-2.26:${PORTSDIR}/mail/evolution-exchange \
 		${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
 		${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
-		totem:${PORTSDIR}/multimedia/totem \
 		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
 		${LOCALBASE}/share/gnome-background-properties/gnome-nature.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
 		evince:${PORTSDIR}/graphics/evince \
@@ -68,7 +67,8 @@
 .endif
 
 .if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite"
-OPTIONS=	XSCREENSAVER "Use xscreensaver as screen saver app" off
+OPTIONS=	XSCREENSAVER "Use xscreensaver as screen saver app" off \
+		XINE "Build totem with libxine instead of gstreamer" off
 .endif
 
 do-install:	# empty
@@ -110,4 +110,10 @@
 .endif
 .endif
 
+.if !defined(WITH_XINE)
+RUN_DEPENDS+=	totem:${PORTSDIR}/multimedia/totem
+.else
+RUN_DEPENDS+=	totem:${PORTSDIR}/multimedia/totem-xine
+.endif
+
 .include <bsd.port.post.mk>
--- gnome2-lite/Makefile.orig	2009-05-02 02:21:47.000000000 -0400
+++ gnome2-lite/Makefile	2009-05-02 02:22:21.000000000 -0400
@@ -31,8 +31,7 @@
 		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
 		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
-    		gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
-		totem:${PORTSDIR}/multimedia/totem
+    		gnome-mount:${PORTSDIR}/sysutils/gnome-mount
 
 MASTERDIR=	${.CURDIR}/../gnome2
 CONFLICTS=	gnome2-[0-9]*
--- gnome2-totem-xine.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: