[pkgsrc/trunk]: pkgsrc/multimedia/vlc Re-enable vcd and cdda plugins, they bu...

[shattered <shattered%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52788d647d3f
branches:  trunk
changeset: 599320:52788d647d3f
user:      shattered <shattered%pkgsrc.org@localhost>
date:      Sat Feb 11 13:31:53 2012 +0000

description:
Re-enable vcd and cdda plugins, they build fine.

diffstat:

 multimedia/vlc/Makefile |  14 +++-----------
 multimedia/vlc/PLIST    |   6 +++---
 2 files changed, 6 insertions(+), 14 deletions(-)

diffs (59 lines):

diff -r 72a848778d27 -r 52788d647d3f multimedia/vlc/Makefile
--- a/multimedia/vlc/Makefile   Sat Feb 11 12:44:09 2012 +0000
+++ b/multimedia/vlc/Makefile   Sat Feb 11 13:31:53 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.128 2012/02/06 12:41:08 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2012/02/11 13:31:53 shattered Exp $
 #
 
 DISTNAME=              vlc-${VLC_VERSION}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            multimedia
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vlc/} \
                        http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
@@ -26,19 +26,11 @@
 CONFIGURE_ARGS+=       --with-kde-solid=${PREFIX}/share/kde/apps/solid/actions
 PTHREAD_OPTS+=         require
 USE_LANGUAGES=         c99 c++
-PLIST_VARS+=           x86simd altivec v4l2 vcd cdda
+PLIST_VARS+=           x86simd altivec v4l2
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=       --disable-vcd
-.else
-PLIST.vcd=             yes
-# This may need a closer look.
-PLIST.cdda=            yes
-.endif
-
 BUILDLINK_API_DEPENDS.zlib+=           zlib>=1.2.0
 BUILDLINK_API_DEPENDS.vcdimager+=      vcdimager>=0.7.20nb1
 
diff -r 72a848778d27 -r 52788d647d3f multimedia/vlc/PLIST
--- a/multimedia/vlc/PLIST      Sat Feb 11 12:44:09 2012 +0000
+++ b/multimedia/vlc/PLIST      Sat Feb 11 13:31:53 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2012/01/12 15:54:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.51 2012/02/11 13:31:53 shattered Exp $
 bin/cvlc
 ${PLIST.x11}bin/qvlc
 bin/rvlc
@@ -101,12 +101,12 @@
 lib/vlc/plugins/access/libaccess_oss_plugin.la
 lib/vlc/plugins/access/libaccess_tcp_plugin.la
 lib/vlc/plugins/access/libaccess_udp_plugin.la
-${PLIST.cdda}lib/vlc/plugins/access/libcdda_plugin.la
+lib/vlc/plugins/access/libcdda_plugin.la
 lib/vlc/plugins/access/libdvdnav_plugin.la
 lib/vlc/plugins/access/libdvdread_plugin.la
 lib/vlc/plugins/access/libfilesystem_plugin.la
 lib/vlc/plugins/access/librtp_plugin.la
-${PLIST.vcd}lib/vlc/plugins/access/libvcd_plugin.la
+lib/vlc/plugins/access/libvcd_plugin.la
 ${PLIST.x11}lib/vlc/plugins/access/libxcb_screen_plugin.la
 lib/vlc/plugins/access/libzip_plugin.la
 lib/vlc/plugins/access_output/libaccess_output_dummy_plugin.la