Switch default-off ffmpeg option from ffmpeg1 to ffmpeg2.

Bump PKGREVISION anyway.
This commit is contained in:
wiz 2014-08-21 14:29:12 +00:00
parent 7337e2f2e3
commit 6af5d69b6c
2 changed files with 4 additions and 4 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.86 2014/08/11 23:09:44 wiz Exp $
# $NetBSD: Makefile,v 1.87 2014/08/21 14:29:12 wiz Exp $
DISTNAME= mpd-0.18.12
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.musicpd.org/download/mpd/0.18/
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/}

View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.23 2014/08/11 23:09:44 wiz Exp $
# $NetBSD: options.mk,v 1.24 2014/08/21 14:29:12 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
PKG_SUPPORTED_OPTIONS= adplug audiofile avahi bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libmpdclient libwildmidi mikmod modplug mpg123 musepack musicpd-soundcloud openal opus pulseaudio shout sqlite3 tremor twolame vorbis wavpack zziplib
@ -61,7 +61,7 @@ CONFIGURE_ARGS+= --disable-aac
.endif
.if !empty(PKG_OPTIONS:Mffmpeg)
. include "../../multimedia/ffmpeg1/buildlink3.mk"
. include "../../multimedia/ffmpeg2/buildlink3.mk"
CONFIGURE_ARGS+= --enable-ffmpeg
.else
CONFIGURE_ARGS+= --disable-ffmpeg