fix duplication of v4l2 plugins, should fix DragonFly build (reported

by John Marino)

4 files changed, 11 insertions, 9 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 72b20ddd621..88626289a51 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2012/03/21 16:37:15 drochner Exp $
+# $NetBSD: Makefile,v 1.97 2012/03/24 13:21:43 drochner Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -9,6 +9,7 @@ COMMENT=		Multimedia player library
 CONFLICTS+=		xine-xcb-[0-9]*
 
 CONFIGURE_ARGS+=	--disable-v4l
+CONFIGURE_ARGS+=	--disable-v4l2
 CONFIGURE_ARGS+=	--disable-real-codecs
 CONFIGURE_ARGS+=	--disable-aalib
 
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index d12d99bd020..d7810307bdb 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.34 2012/03/22 17:34:15 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.35 2012/03/24 13:21:43 drochner Exp $
 bin/xine-config
 bin/xine-list-1.2
 include/xine.h
@@ -162,16 +162,12 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_net.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_net.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pnm.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pnm.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pvr.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pvr.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtp.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtp.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtsp.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtsp.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_stdin_fifo.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_v4l2.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_v4l2.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcd.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcd.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_nsf.a
diff --git a/multimedia/xine-v4l2/Makefile b/multimedia/xine-v4l2/Makefile
index 6d940576eb8..9790534accf 100644
--- a/multimedia/xine-v4l2/Makefile
+++ b/multimedia/xine-v4l2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/11/17 18:22:27 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2012/03/24 13:21:43 drochner Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -12,7 +12,8 @@ COMMENT=	The v4l2 input plugin for xine-lib
 DEPENDS+=	xine-lib>=1rc3a:../../multimedia/xine-lib
 
 BUILD_DIRS=	${WRKSRC}/src/input
-CONFIGURE_ARGS+=	--without-x
+CONFIGURE_ARGS+=	--without-x --disable-xinerama
+CONFIGURE_ARGS+=	--disable-vcd
 
 INSTALLATION_DIRS=	lib/xine/plugins/${XINE_MOD_DIR_VER}
 
@@ -20,6 +21,9 @@ do-install:
 	cd ${WRKSRC}/src/input && \
 		${LIBTOOL} --mode=install ${INSTALL_DATA} \
 		xineplug_inp_v4l2.la \
+		${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER}; \
+		${LIBTOOL} --mode=install ${INSTALL_DATA} \
+		xineplug_inp_pvr.la \
 		${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/multimedia/xine-v4l2/PLIST b/multimedia/xine-v4l2/PLIST
index 15196781093..e7488c86d31 100644
--- a/multimedia/xine-v4l2/PLIST
+++ b/multimedia/xine-v4l2/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2011/11/17 18:22:27 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/03/24 13:21:43 drochner Exp $
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pvr.la
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_v4l2.la