summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2010-09-15 12:36:49 +0000
committerwiz <wiz@pkgsrc.org>2010-09-15 12:36:49 +0000
commit272e2c951f3f3f858669c1a15589b0a87c76c4bc (patch)
treeeb24e548459f28fdb535e3ecea9e88d22bc8d6b5 /multimedia
parent3556672799c1bdf2f702e71b263eb0e007ce48f5 (diff)
downloadpkgsrc-272e2c951f3f3f858669c1a15589b0a87c76c4bc.tar.gz
Fix PLIST with x11 option (default on) by always depending on libxcb,
since it's pulled in by libX11 anyway, nowadays. Bump PKGREVISION.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc/Makefile5
-rw-r--r--multimedia/vlc/PLIST3
-rw-r--r--multimedia/vlc/options.mk3
3 files changed, 7 insertions, 4 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index a51bc22e997..e083c018e54 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.93 2010/09/14 11:13:14 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2010/09/15 12:36:49 wiz Exp $
#
DISTNAME= vlc-${VLC_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
EXTRACT_SUFX= .tar.bz2
@@ -12,6 +12,7 @@ VLC_VERSION= 1.0.6
MAINTAINER= ahoka@NetBSD.org
HOMEPAGE= http://videolan.org/
COMMENT= VLC media player and streaming server
+LICENSE= gnu-gpl-v2
CONFLICTS= vlc07-[0-9]* vlc08-[0-9]*
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 24b171c8d9c..ab7ed207dd1 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2010/05/04 18:30:10 drochner Exp $
+@comment $NetBSD: PLIST,v 1.36 2010/09/15 12:36:49 wiz Exp $
${PLIST.altivec}lib/vlc/misc/libmemcpyaltivec_plugin.la
${PLIST.altivec}lib/vlc/video_chroma/libi420_yuy2_altivec_plugin.la
${PLIST.cdda}lib/vlc/access/libcdda_plugin.la
@@ -26,6 +26,7 @@ ${PLIST.vcd}lib/vlc/access/libvcd_plugin.la
${PLIST.x11}bin/qvlc
${PLIST.x11}lib/vlc/access/libx11_screen_plugin.la
${PLIST.x11}lib/vlc/codec/libpng_plugin.la
+${PLIST.x11}lib/vlc/control/libglobalhotkeys_plugin.la
${PLIST.x11}lib/vlc/gui/libqt4_plugin.la
${PLIST.x11}lib/vlc/misc/libfreetype_plugin.la
${PLIST.x11}lib/vlc/misc/libosd_parser_plugin.la
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
index 1e9e404b91f..29b5793e215 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2009/07/07 19:23:48 ahoka Exp $
+# $NetBSD: options.mk,v 1.16 2010/09/15 12:36:49 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vlc
PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome
@@ -102,6 +102,7 @@ DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf
.include "../../x11/libXdamage/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"