Subject: pkg/26743: [PATCH] multimedia/xine-lib XV plugin handling error with xorg
To: None <gnats-bugs@gnats.NetBSD.org>
From: None <fun@naobsd.org>
List: pkgsrc-bugs
Date: 08/24/2004 03:46:41
>Number: 26743
>Category: pkg
>Synopsis: [PATCH] multimedia/xine-lib XV plugin handling error with xorg
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Mon Aug 23 18:48:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator: FUKAUMI Naoki
>Release: NetBSD 2.0G
>Organization:
FUKAUMI Naoki
>Environment:
System: NetBSD ea65.naobsd.org 2.0G NetBSD 2.0G (EA65) #0: Sun Aug 22 04:29:13 JST 2004 root@ea65.naobsd.org:/usr/obj/i386/sys/arch/i386/compile/EA65 i386
Architecture: i386
Machine: i386
>Description:
Xorg has ${X11BASE}/lib/libXv.so.
xine-lib/configure checks only under /usr/X11R6.
Therefore xineplug_vo_out_xv.{a,so} will not be built.
>How-To-Repeat:
make pkgsrc/multimedia/xine-lib && make install
>Fix:
This patch explicitly set XV path to ${X11BASE}/lib.
# should fix configure?
Index: Makefile.common
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/multimedia/xine-lib/Makefile.common,v
retrieving revision 1.10
diff -u -r1.10 Makefile.common
--- Makefile.common 21 Jun 2004 15:55:54 -0000 1.10
+++ Makefile.common 23 Aug 2004 17:38:10 -0000
@@ -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::
Index: PLIST.NetBSD
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/multimedia/xine-lib/PLIST.NetBSD,v
retrieving revision 1.1
diff -u -r1.1 PLIST.NetBSD
--- PLIST.NetBSD 29 May 2004 02:14:27 -0000 1.1
+++ PLIST.NetBSD 23 Aug 2004 17:39:21 -0000
@@ -1,5 +1,5 @@
@comment $NetBSD: PLIST.NetBSD,v 1.1 2004/05/29 02:14:27 reed 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
Index: PLIST.common
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/multimedia/xine-lib/PLIST.common,v
retrieving revision 1.2
diff -u -r1.2 PLIST.common
--- PLIST.common 21 Jun 2004 15:55:55 -0000 1.2
+++ PLIST.common 23 Aug 2004 00:27:17 -0000
@@ -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
+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
>Release-Note:
>Audit-Trail:
>Unformatted: