summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjperkin <jperkin>2013-09-02 11:13:00 +0000
committerjperkin <jperkin>2013-09-02 11:13:00 +0000
commita93aeeb455740a6a84d325fb8cf5c21c87bcf33a (patch)
treee39f4eb9a8a5927eda3d6ed4ebc4ae1318a49525 /multimedia
parent68f5dbb882fc638214b44ec0fdd4c9d76f32c724 (diff)
downloadpkgsrc-a93aeeb455740a6a84d325fb8cf5c21c87bcf33a.tar.gz
faad is no longer non-redistributable, enable it by default.
Bump PKGREVISION.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc2/Makefile3
-rw-r--r--multimedia/vlc2/options.mk6
2 files changed, 4 insertions, 5 deletions
diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index 9a85ad94487..4b2c4a3dcf3 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2013/08/23 12:45:50 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2013/09/02 11:13:00 jperkin Exp $
DISTNAME= vlc-${VLC_VERSION}
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \
http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
diff --git a/multimedia/vlc2/options.mk b/multimedia/vlc2/options.mk
index b0a78f9457d..b7cd572d382 100644
--- a/multimedia/vlc2/options.mk
+++ b/multimedia/vlc2/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.9 2013/07/04 21:27:58 adam Exp $
+# $NetBSD: options.mk,v 1.10 2013/09/02 11:13:00 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vlc
PKG_SUPPORTED_OPTIONS= debug faad skins sdl pulseaudio x11
PKG_SUPPORTED_OPTIONS+= gnome dts rtsp
# XXX broken
#PKG_SUPPORTED_OPTIONS+= dbus
-PKG_SUGGESTED_OPTIONS= x11 rtsp
+PKG_SUGGESTED_OPTIONS= faad x11 rtsp
### Add VAAPI if it is available
.include "../../multimedia/libva/available.mk"
@@ -136,8 +136,6 @@ CONFIGURE_ARGS+= --without-x \
--disable-snapshot
.endif
-## FAAD support (faad is non-redistributable)
-
.if !empty(PKG_OPTIONS:Mfaad)
CONFIGURE_ARGS+= --enable-faad
PLIST.faad= yes