ports/84743: Allow user to disable some features in ports/multimedia/libxine

[Carlos A M dos Santos]

>Number:         84743
>Category:       ports
>Synopsis:       Allow user to disable some features in ports/multimedia/libxine
>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:   Wed Aug 10 11:50:29 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Carlos A M dos Santos
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
Universidade Regional Integrada
>Environment:
System: FreeBSD sophia.inf.urisan 5.4-RELEASE FreeBSD 5.4-RELEASE #1: Mon May 16 01:34:41 BRT 2005 root at avatar.casantos.org:/share/FreeBSD/5.4-RELEASE/src/sys/i386/compile/A7N266-VM i386
>Description:
	The Makefile contained in ports/multimedia/libxine tests for the
	presence of several libraries in the system and enables support for
	the corresponding features if such libraries are found. The attached
	patch allows the uses to disable one or more of those features by
	means of some "WITHOUT_<NAME>" variables.
>How-To-Repeat:
	N.A.
>Fix:

	Apply the attached patch.

--- multimedia::libxine.patch begins here ---
diff -durP ports/multimedia/libxine/Makefile ports/multimedia/libxine/Makefile
--- ports.orig/multimedia/libxine/Makefile	Sat Apr 30 22:14:49 2005
+++ ports/multimedia/libxine/Makefile	Thu Jun  2 21:31:33 2005
@@ -63,28 +69,28 @@
 PLIST_SUB+=	WITH_LIBXV="@comment "
 .endif
 
-.if exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS)
+.if !defined(WITHOUT_ARTS) && (exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS))
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 PLIST_SUB+=	WITH_ARTS=""
 .else
 PLIST_SUB+=	WITH_ARTS="@comment "
 .endif
 
-.if exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_LIBCACA)
+.if !defined(WITHOUT_LIBCACA) && (exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_LIBCACA))
 BUILD_DEPENDS+=	caca-config:${PORTSDIR}/graphics/libcaca
 PLIST_SUB+=	WITH_LIBCACA=""
 .else
 PLIST_SUB+=	WITH_LIBCACA="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND)
+.if !defined(WITHOUT_GNOME) && !defined(WITHOUT_ESOUND) && (${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND))
 USE_GNOME+=	esound
 PLIST_SUB+=	WITH_ESOUND=""
 .else
 PLIST_SUB+=	WITH_ESOUND="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mgnomevfs2} != ""
+.if !defined(WITHOUT_GNOME) && !defined(WITHOUT_GNOMEVFS2) && ${HAVE_GNOME:Mgnomevfs2} != ""
 USE_GNOME+=	gnomevfs2
 PLIST_SUB+=	WITH_GNOMEVFS2=""
 .else
@@ -97,7 +103,7 @@
 PLIST_SUB+=	WITH_VIDIX="@comment "
 .endif
 
-.if exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) || defined(WITH_XVMC)
+.if !defined(WITHOUT_XVMC) && (exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) || defined(WITH_XVMC))
 CONFIGURE_ARGS+=--with-xvmc-lib=XvMCNVIDIA
 LIB_DEPENDS+=	XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver
 PLIST_SUB+=	WITH_XVMC=""
@@ -105,14 +111,14 @@
 PLIST_SUB+=	WITH_XVMC="@comment "
 .endif
 
-.if exists(${LOCALBASE}/lib/libtheora.so.1) || defined (WITH_LIBTHEORA)
+.if !defined (WITHOUT_LIBTHEORA) && (exists(${LOCALBASE}/lib/libtheora.so.1) || defined (WITH_LIBTHEORA))
 LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
 PLIST_SUB+=	WITH_LIBTHEORA=""
 .else
 PLIST_SUB+=	WITH_LIBTHEORA="@comment "
 .endif
 
-.if exists(${LOCALBASE}/lib/libsmbclient.so.0) || defined (WITH_SMB)
+.if !defined (WITHOUT_SMB) && (exists(${LOCALBASE}/lib/libsmbclient.so.0) || defined (WITH_SMB))
 LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	WITH_SMB=""
 .else
@@ -123,22 +129,27 @@
 	@${ECHO_MSG} "===>"
 	@${ECHO_MSG} "===> You can enable some features by defining following variables."
 	@${ECHO_MSG} "===>"
-.if !exists(${LOCALBASE}/bin/artsc-config) && !defined(WITH_ARTS)
+.if defined (WITHOUT_ARTS) || (!exists(${LOCALBASE}/bin/artsc-config) && !defined(WITH_ARTS))
 	@${ECHO_MSG} "===> WITH_ARTS   (arts support)"
 .else
 	@${ECHO_MSG} "===> WITH_ARTS   (arts support, enabled)"
 .endif
-.if !exists(${LOCALBASE}/lib/libcaca.a) && !defined(WITH_LIBCACA)
+.if defined (WITHOUT_LIBCACA) || (!exists(${LOCALBASE}/lib/libcaca.a) && !defined(WITH_LIBCACA))
 	@${ECHO_MSG} "===> WITH_LIBCACA (libcaca support)"
 .else
 	@${ECHO_MSG} "===> WITH_LIBCACA (libcaca support, enabled)"
 .endif
-.if !(${HAVE_GNOME:Mesound} != "") && !defined(WITH_ESOUND)
+.if defined (WITHOUT_GNOME) || defined (WITHOUT_ESOUND) || (!(${HAVE_GNOME:Mesound} != "") && !defined(WITH_ESOUND))
 	@${ECHO_MSG} "===> WITH_ESOUND (esound support)"
 .else
 	@${ECHO_MSG} "===> WITH_ESOUND (esound support, enabled)"
 .endif
-.if !exists(${LOCALBASE}/lib/libtheora.so.1) && !defined(WITH_LIBTHEORA)
+.if defined (WITHOUT_XVMC) || (!exists(${LOCALBASE}/lib/libtheora.so.1) && !defined(WITH_XVMC))
+	@${ECHO_MSG} "===> WITH_XVMC (nVidia's hardware accelerated mpeg2 support)"
+.else
+	@${ECHO_MSG} "===> WITH_XVMC (nVidia's hardware accelerated mpeg2 support, enabled)"
+.endif
+.if defined (WITHOUT_LIBTHEORA) || (!exists(${LOCALBASE}/lib/libtheora.so.1) && !defined(WITH_LIBTHEORA))
 	@${ECHO_MSG} "===> WITH_LIBTHEORA (libtheora support)"
 .else
 	@${ECHO_MSG} "===> WITH_LIBTHEORA (libtheora support, enabled)"
--- multimedia::libxine.patch ends here ---


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