Mon Sep 2 11:10:23 2013 UTC ()
faad is no longer non-redistributable, enable it by default.

Bump PKGREVISION.


(jperkin)
diff -r1.158 -r1.159 pkgsrc/multimedia/vlc/Makefile
diff -r1.28 -r1.29 pkgsrc/multimedia/vlc/options.mk
cvs diff -r1.158 -r1.159 pkgsrc/multimedia/vlc/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/Makefile 2013/08/16 09:20:40 1.158
+++ pkgsrc/multimedia/vlc/Makefile 2013/09/02 11:10:23 1.159
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.158 2013/08/16 09:20:40 obache Exp $ 1# $NetBSD: Makefile,v 1.159 2013/09/02 11:10:23 jperkin Exp $
2# 2#
3 3
4DISTNAME= vlc-${VLC_VERSION} 4DISTNAME= vlc-${VLC_VERSION}
5PKGREVISION= 30 5PKGREVISION= 31
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \ 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \
8 http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ 8 http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11VLC_VERSION= 1.1.13 11VLC_VERSION= 1.1.13
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.videolan.org/ 14HOMEPAGE= http://www.videolan.org/
15COMMENT= VLC media player and streaming server 15COMMENT= VLC media player and streaming server
16LICENSE= gnu-gpl-v2 16LICENSE= gnu-gpl-v2
17 17
18CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* 18CONFLICTS= vlc07-[0-9]* vlc08-[0-9]*
cvs diff -r1.28 -r1.29 pkgsrc/multimedia/vlc/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/options.mk 2013/04/16 22:11:23 1.28
+++ pkgsrc/multimedia/vlc/options.mk 2013/09/02 11:10:23 1.29
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.28 2013/04/16 22:11:23 cheusov Exp $ 1# $NetBSD: options.mk,v 1.29 2013/09/02 11:10:23 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.vlc 3PKG_OPTIONS_VAR= PKG_OPTIONS.vlc
4PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome dts 4PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome dts
5PKG_SUGGESTED_OPTIONS= x11 5PKG_SUGGESTED_OPTIONS= faad x11
6 6
7### Add VAAPI if it is available 7### Add VAAPI if it is available
8.include "../../multimedia/libva/available.mk" 8.include "../../multimedia/libva/available.mk"
9PLIST_VARS+= vaapi 9PLIST_VARS+= vaapi
10.if ${VAAPI_AVAILABLE} == "yes" 10.if ${VAAPI_AVAILABLE} == "yes"
11PKG_SUPPORTED_OPTIONS+= vaapi 11PKG_SUPPORTED_OPTIONS+= vaapi
12PKG_SUGGESTED_OPTIONS+= vaapi 12PKG_SUGGESTED_OPTIONS+= vaapi
13.endif 13.endif
14 14
15### Add LIRC if it is available 15### Add LIRC if it is available
16.include "../../comms/lirc/available.mk" 16.include "../../comms/lirc/available.mk"
17PLIST_VARS+= lirc 17PLIST_VARS+= lirc
18.if ${LIRC_AVAILABLE} == "yes" 18.if ${LIRC_AVAILABLE} == "yes"
@@ -132,28 +132,26 @@ CONFIGURE_ARGS+= --enable-qt4 \ @@ -132,28 +132,26 @@ CONFIGURE_ARGS+= --enable-qt4 \
132 --with-x \ 132 --with-x \
133 --enable-glx \ 133 --enable-glx \
134 --enable-snapshot 134 --enable-snapshot
135PLIST.x11= yes 135PLIST.x11= yes
136.else 136.else
137CONFIGURE_ARGS+= --without-x \ 137CONFIGURE_ARGS+= --without-x \
138 --disable-xcb \ 138 --disable-xcb \
139 --disable-qt4 \ 139 --disable-qt4 \
140 --disable-glx \ 140 --disable-glx \
141 --disable-freetype \ 141 --disable-freetype \
142 --disable-snapshot 142 --disable-snapshot
143.endif 143.endif
144 144
145## FAAD support (faad is non-redistributable) 
146 
147.if !empty(PKG_OPTIONS:Mfaad) 145.if !empty(PKG_OPTIONS:Mfaad)
148CONFIGURE_ARGS+= --enable-faad 146CONFIGURE_ARGS+= --enable-faad
149PLIST.faad= yes 147PLIST.faad= yes
150.include "../../audio/faad2/buildlink3.mk" 148.include "../../audio/faad2/buildlink3.mk"
151.else 149.else
152CONFIGURE_ARGS+= --disable-faad 150CONFIGURE_ARGS+= --disable-faad
153.endif 151.endif
154 152
155## DTS support (libdca is non-redistributable) 153## DTS support (libdca is non-redistributable)
156 154
157.if !empty(PKG_OPTIONS:Mdts) 155.if !empty(PKG_OPTIONS:Mdts)
158CONFIGURE_ARGS+= --enable-dca 156CONFIGURE_ARGS+= --enable-dca
159PLIST.dts= yes 157PLIST.dts= yes