summaryrefslogtreecommitdiff
path: root/multimedia/vlc
diff options
context:
space:
mode:
authorshattered <shattered@pkgsrc.org>2012-02-11 13:31:53 +0000
committershattered <shattered@pkgsrc.org>2012-02-11 13:31:53 +0000
commitc783cb9fa0005fcdc13ef57fd540e8300e7094e2 (patch)
tree2188de5123b4610d432eae9123c3927716c48f86 /multimedia/vlc
parent277d176180ebdc2b8ff04ef7b805bcb8ec744e8d (diff)
downloadpkgsrc-c783cb9fa0005fcdc13ef57fd540e8300e7094e2.tar.gz
Re-enable vcd and cdda plugins, they build fine.
Diffstat (limited to 'multimedia/vlc')
-rw-r--r--multimedia/vlc/Makefile14
-rw-r--r--multimedia/vlc/PLIST6
2 files changed, 6 insertions, 14 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 662a0cbc99f..52a8151cdd4 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -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 @@ GNU_CONFIGURE= yes
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 --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 76c14689f04..9f110ccc20c 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -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_mms_plugin.la
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