summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorwiz <wiz>2014-08-21 14:29:12 +0000
committerwiz <wiz>2014-08-21 14:29:12 +0000
commitca7f49f5d9c42627d362b9ec59bb017858a2d319 (patch)
treef5b25ad8a7babea88e6cc727f56461f25499e8d4 /audio
parentf4c16a3add76629fefeefb712e082d41e3d49b5b (diff)
downloadpkgsrc-ca7f49f5d9c42627d362b9ec59bb017858a2d319.tar.gz
Switch default-off ffmpeg option from ffmpeg1 to ffmpeg2.
Bump PKGREVISION anyway.
Diffstat (limited to 'audio')
-rw-r--r--audio/musicpd/Makefile4
-rw-r--r--audio/musicpd/options.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 2a8308d71e8..42e7fb07514 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -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/}
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index 2a0822e8cfa..3009843a944 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -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