summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/xine-lib/Makefile.common7
-rw-r--r--multimedia/xine-lib/PLIST.NetBSD6
-rw-r--r--multimedia/xine-lib/PLIST.common4
3 files changed, 9 insertions, 8 deletions
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 273573961c2..bd96b646308 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/06/21 15:55:54 drochner Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/09/09 07:50:53 xtraeme Exp $
#
DISTNAME= xine-lib-1-rc5
@@ -32,9 +32,10 @@ CONFIGURE_ENV+= PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng"
.include "../../mk/bsd.prefs.mk"
.if !exists(${X11BASE}/lib/libXv.so)
-PLIST_SUBST+= XV_WORKAROUND="@comment "
+PLIST_SUBST+= HAVE_XV="@comment "
.else
-PLIST_SUBST+= XV_WORKAROUND=""
+CONFIGURE_ARGS+= --with-xv-path='${X11BASE}/lib'
+PLIST_SUBST+= HAVE_XV=
.endif
pre-configure::
diff --git a/multimedia/xine-lib/PLIST.NetBSD b/multimedia/xine-lib/PLIST.NetBSD
index 115d22229b1..86dfec72b28 100644
--- a/multimedia/xine-lib/PLIST.NetBSD
+++ b/multimedia/xine-lib/PLIST.NetBSD
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2004/05/29 02:14:27 reed Exp $
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2004/09/09 07:50:53 xtraeme Exp $
lib/xine/plugins/1.0.0/xineplug_ao_out_sun.a
lib/xine/plugins/1.0.0/xineplug_ao_out_sun.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_xv.a
-${XV_WORKAROUND}lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so
+${HAVE_XV}lib/xine/plugins/1.0.0/xineplug_vo_out_xv.a
+${HAVE_XV}lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index faa65ae7c7c..34d7d30151f 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2004/06/21 15:55:55 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2004/09/09 07:50:53 xtraeme Exp $
bin/xine-config
include/xine.h
include/xine/attributes.h
@@ -47,7 +47,7 @@ lib/xine/plugins/1.0.0/post/xineplug_post_planar.so
lib/xine/plugins/1.0.0/post/xineplug_post_switch.a
lib/xine/plugins/1.0.0/post/xineplug_post_switch.so
lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.a
-${XV_WORKAROUND}lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.so
+${HAVE_XV}lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.so
lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.a
lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so
lib/xine/plugins/1.0.0/xineplug_ao_out_file.a