pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib Check for libXv.so on ${X11BASE}/l...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8fe875a20408
branches: trunk
changeset: 480433:8fe875a20408
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Thu Sep 09 07:50:53 2004 +0000
description:
Check for libXv.so on ${X11BASE}/lib not /usr/X11R6, which breaks
installation using XFree86/xorg packages from pkgsrc.
Apply patch from FUKAUMI Naoki in PR pkg/26743, no bump PKGREVISION
because there aren't functional changes if XFree86/xorg from pkgsrc
is not used.
diffstat:
multimedia/xine-lib/Makefile.common | 7 ++++---
multimedia/xine-lib/PLIST.NetBSD | 6 +++---
multimedia/xine-lib/PLIST.common | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diffs (52 lines):
diff -r 40713bacec5c -r 8fe875a20408 multimedia/xine-lib/Makefile.common
--- a/multimedia/xine-lib/Makefile.common Thu Sep 09 07:14:16 2004 +0000
+++ b/multimedia/xine-lib/Makefile.common Thu Sep 09 07:50:53 2004 +0000
@@ -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 @@
.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 -r 40713bacec5c -r 8fe875a20408 multimedia/xine-lib/PLIST.NetBSD
--- a/multimedia/xine-lib/PLIST.NetBSD Thu Sep 09 07:14:16 2004 +0000
+++ b/multimedia/xine-lib/PLIST.NetBSD Thu Sep 09 07:50:53 2004 +0000
@@ -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 -r 40713bacec5c -r 8fe875a20408 multimedia/xine-lib/PLIST.common
--- a/multimedia/xine-lib/PLIST.common Thu Sep 09 07:14:16 2004 +0000
+++ b/multimedia/xine-lib/PLIST.common Thu Sep 09 07:50:53 2004 +0000
@@ -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_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
Home |
Main Index |
Thread Index |
Old Index