Mon Mar 26 11:17:34 2012 UTC ()
sync w/ xine-v4l2 (explicitely disable xinerama and vcd) to make
this build with the present dependencies


(drochner)
diff -r1.3 -r1.4 pkgsrc/audio/xine-alsa/Makefile
diff -r1.41 -r1.42 pkgsrc/audio/xine-arts/Makefile
diff -r1.31 -r1.32 pkgsrc/audio/xine-esound/Makefile
diff -r1.10 -r1.11 pkgsrc/audio/xine-pulse/Makefile
diff -r1.6 -r1.7 pkgsrc/multimedia/xine-v4l/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/audio/xine-alsa/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/xine-alsa/Makefile 2011/11/17 13:31:36 1.3
+++ pkgsrc/audio/xine-alsa/Makefile 2012/03/26 11:17:34 1.4
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.3 2011/11/17 13:31:36 obache Exp $ 1# $NetBSD: Makefile,v 1.4 2012/03/26 11:17:34 drochner Exp $
2# 2#
3 3
4PKG_DESTDIR_SUPPORT= user-destdir 4PKG_DESTDIR_SUPPORT= user-destdir
5 5
6.include "../../multimedia/xine-lib/Makefile.common" 6.include "../../multimedia/xine-lib/Makefile.common"
7 7
8PKGNAME= ${XINE_PKGNAME:S/lib/alsa/} 8PKGNAME= ${XINE_PKGNAME:S/lib/alsa/}
9CATEGORIES= audio 9CATEGORIES= audio
10COMMENT= The ALSA output plugin for xine-lib 10COMMENT= The ALSA output plugin for xine-lib
11 11
12DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib 12DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib
13 13
14BUILD_DIRS= ${WRKSRC}/src/audio_out 14BUILD_DIRS= ${WRKSRC}/src/audio_out
15CONFIGURE_ARGS+= --without-x 15CONFIGURE_ARGS+= --without-x --disable-xinerama
 16CONFIGURE_ARGS+= --disable-vcd
16 17
17INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER} 18INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER}
18 19
19do-install: 20do-install:
20 cd ${WRKSRC}/src/audio_out && \ 21 cd ${WRKSRC}/src/audio_out && \
21 ${LIBTOOL} --mode=install ${INSTALL_DATA} \ 22 ${LIBTOOL} --mode=install ${INSTALL_DATA} \
22 xineplug_ao_out_alsa.la \ 23 xineplug_ao_out_alsa.la \
23 ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER} 24 ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER}
24 25
25.include "../../audio/alsa-lib/buildlink3.mk" 26.include "../../audio/alsa-lib/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.41 -r1.42 pkgsrc/audio/xine-arts/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/xine-arts/Attic/Makefile 2012/03/21 17:45:33 1.41
+++ pkgsrc/audio/xine-arts/Attic/Makefile 2012/03/26 11:17:34 1.42
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.41 2012/03/21 17:45:33 drochner Exp $ 1# $NetBSD: Makefile,v 1.42 2012/03/26 11:17:34 drochner Exp $
2# 2#
3 3
4PKG_DESTDIR_SUPPORT= user-destdir 4PKG_DESTDIR_SUPPORT= user-destdir
5 5
6.include "../../multimedia/xine-lib/Makefile.common" 6.include "../../multimedia/xine-lib/Makefile.common"
7 7
8PKGNAME= ${XINE_PKGNAME:S/lib/arts/} 8PKGNAME= ${XINE_PKGNAME:S/lib/arts/}
9CATEGORIES= audio 9CATEGORIES= audio
10COMMENT= The aRts audio output plugin for xine-lib 10COMMENT= The aRts audio output plugin for xine-lib
11 11
12DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib 12DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib
13 13
14BUILD_DIRS= ${WRKSRC}/src/audio_out 14BUILD_DIRS= ${WRKSRC}/src/audio_out
15CONFIGURE_ARGS+= --with-arts 15CONFIGURE_ARGS+= --with-arts
16CONFIGURE_ARGS+= --without-x 16CONFIGURE_ARGS+= --without-x --disable-xinerama
 17CONFIGURE_ARGS+= --disable-vcd
17 18
18INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER} 19INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER}
19 20
20do-install: 21do-install:
21 cd ${WRKSRC}/src/audio_out && \ 22 cd ${WRKSRC}/src/audio_out && \
22 ${LIBTOOL} --mode=install ${INSTALL_DATA} \ 23 ${LIBTOOL} --mode=install ${INSTALL_DATA} \
23 xineplug_ao_out_arts.la \ 24 xineplug_ao_out_arts.la \
24 ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER} 25 ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER}
25 26
26.include "../../audio/arts/buildlink3.mk" 27.include "../../audio/arts/buildlink3.mk"
27.include "../../devel/zlib/buildlink3.mk" 28.include "../../devel/zlib/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.31 -r1.32 pkgsrc/audio/xine-esound/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/xine-esound/Attic/Makefile 2012/03/21 17:45:33 1.31
+++ pkgsrc/audio/xine-esound/Attic/Makefile 2012/03/26 11:17:34 1.32
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.31 2012/03/21 17:45:33 drochner Exp $ 1# $NetBSD: Makefile,v 1.32 2012/03/26 11:17:34 drochner Exp $
2# 2#
3 3
4PKG_DESTDIR_SUPPORT= user-destdir 4PKG_DESTDIR_SUPPORT= user-destdir
5 5
6.include "../../multimedia/xine-lib/Makefile.common" 6.include "../../multimedia/xine-lib/Makefile.common"
7 7
8PKGNAME= ${XINE_PKGNAME:S/lib/esound/} 8PKGNAME= ${XINE_PKGNAME:S/lib/esound/}
9CATEGORIES= audio 9CATEGORIES= audio
10COMMENT= The esound audio output plugin for xine-lib 10COMMENT= The esound audio output plugin for xine-lib
11 11
12DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib 12DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib
13 13
14BUILD_DIRS= ${WRKSRC}/src/audio_out 14BUILD_DIRS= ${WRKSRC}/src/audio_out
15CONFIGURE_ARGS+= --without-x 15CONFIGURE_ARGS+= --without-x --disable-xinerama
 16CONFIGURE_ARGS+= --disable-vcd
16 17
17INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER} 18INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER}
18 19
19do-install: 20do-install:
20 cd ${WRKSRC}/src/audio_out && \ 21 cd ${WRKSRC}/src/audio_out && \
21 ${LIBTOOL} --mode=install ${INSTALL_DATA} \ 22 ${LIBTOOL} --mode=install ${INSTALL_DATA} \
22 xineplug_ao_out_esd.la \ 23 xineplug_ao_out_esd.la \
23 ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER} 24 ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER}
24 25
25.include "../../audio/esound/buildlink3.mk" 26.include "../../audio/esound/buildlink3.mk"
26.include "../../devel/gettext-lib/buildlink3.mk" 27.include "../../devel/gettext-lib/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/audio/xine-pulse/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/xine-pulse/Makefile 2012/03/21 17:45:33 1.10
+++ pkgsrc/audio/xine-pulse/Makefile 2012/03/26 11:17:34 1.11
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.10 2012/03/21 17:45:33 drochner Exp $ 1# $NetBSD: Makefile,v 1.11 2012/03/26 11:17:34 drochner Exp $
2# 2#
3 3
4PKG_DESTDIR_SUPPORT= user-destdir 4PKG_DESTDIR_SUPPORT= user-destdir
5 5
6.include "../../multimedia/xine-lib/Makefile.common" 6.include "../../multimedia/xine-lib/Makefile.common"
7 7
8PKGNAME= ${XINE_PKGNAME:S/lib/pulse/} 8PKGNAME= ${XINE_PKGNAME:S/lib/pulse/}
9CATEGORIES= audio 9CATEGORIES= audio
10COMMENT= The PulseAudio output plugin for xine-lib 10COMMENT= The PulseAudio output plugin for xine-lib
11 11
12DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib 12DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib
13 13
14BUILD_DIRS= ${WRKSRC}/src/audio_out 14BUILD_DIRS= ${WRKSRC}/src/audio_out
15CONFIGURE_ARGS+= --without-x 15CONFIGURE_ARGS+= --without-x --disable-xinerama
 16CONFIGURE_ARGS+= --disable-vcd
16 17
17INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER} 18INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER}
18 19
19do-install: 20do-install:
20 cd ${WRKSRC}/src/audio_out && \ 21 cd ${WRKSRC}/src/audio_out && \
21 ${LIBTOOL} --mode=install ${INSTALL_DATA} \ 22 ${LIBTOOL} --mode=install ${INSTALL_DATA} \
22 xineplug_ao_out_pulseaudio.la \ 23 xineplug_ao_out_pulseaudio.la \
23 ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER} 24 ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER}
24 25
25.include "../../audio/pulseaudio/buildlink3.mk" 26.include "../../audio/pulseaudio/buildlink3.mk"
26.include "../../devel/gettext-lib/buildlink3.mk" 27.include "../../devel/gettext-lib/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/multimedia/xine-v4l/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-v4l/Makefile 2011/11/17 18:22:27 1.6
+++ pkgsrc/multimedia/xine-v4l/Makefile 2012/03/26 11:17:34 1.7
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1# $NetBSD: Makefile,v 1.6 2011/11/17 18:22:27 drochner Exp $ 1# $NetBSD: Makefile,v 1.7 2012/03/26 11:17:34 drochner Exp $
2# 2#
3 3
4PKG_DESTDIR_SUPPORT= user-destdir 4PKG_DESTDIR_SUPPORT= user-destdir
5 5
6.include "../../multimedia/xine-lib/Makefile.common" 6.include "../../multimedia/xine-lib/Makefile.common"
7 7
8PKGNAME= ${XINE_PKGNAME:S/lib/v4l/} 8PKGNAME= ${XINE_PKGNAME:S/lib/v4l/}
9CATEGORIES= multimedia 9CATEGORIES= multimedia
10COMMENT= The v4l input plugin for xine-lib 10COMMENT= The v4l input plugin for xine-lib
11 11
12# NetBSD supports only v4l2, whose plugin is in ../xine-v4l2. 12# NetBSD supports only v4l2, whose plugin is in ../xine-v4l2.
13NOT_FOR_PLATFORM= NetBSD-*-* 13NOT_FOR_PLATFORM= NetBSD-*-*
14 14
15DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib 15DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib
16 16
17BUILD_DIRS= ${WRKSRC}/src/input 17BUILD_DIRS= ${WRKSRC}/src/input
18CONFIGURE_ARGS+= --without-x 18CONFIGURE_ARGS+= --without-x --disable-xinerama
 19CONFIGURE_ARGS+= --disable-vcd
19 20
20INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER} 21INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER}
21 22
22do-install: 23do-install:
23 cd ${WRKSRC}/src/input && \ 24 cd ${WRKSRC}/src/input && \
24 ${LIBTOOL} --mode=install ${INSTALL_DATA} \ 25 ${LIBTOOL} --mode=install ${INSTALL_DATA} \
25 xineplug_inp_v4l.la \ 26 xineplug_inp_v4l.la \
26 ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER} 27 ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER}
27 28
28.include "../../devel/gettext-lib/buildlink3.mk" 29.include "../../devel/gettext-lib/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"