summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authordrochner <drochner>2011-01-11 11:43:19 +0000
committerdrochner <drochner>2011-01-11 11:43:19 +0000
commitc7d5314341b4e65e35fe466006030ce734905766 (patch)
tree07eb16957d393ee66364f7a0e59e92e767d8da34 /audio
parent08653dd64cd19375c24be61ec34171381b5a6715 (diff)
downloadpkgsrc-c7d5314341b4e65e35fe466006030ce734905766.tar.gz
-add ffmpeg option, patch posted to pkgsrc-users by Pouya D. Tafti
-update to 0.15.15 changes: bugfixes
Diffstat (limited to 'audio')
-rw-r--r--audio/musicpd/Makefile5
-rw-r--r--audio/musicpd/distinfo8
-rw-r--r--audio/musicpd/options.mk11
3 files changed, 15 insertions, 9 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index b0dc2590ccb..3cc7b40e913 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2010/05/19 18:25:19 drochner Exp $
+# $NetBSD: Makefile,v 1.46 2011/01/11 11:43:19 drochner Exp $
-DISTNAME= mpd-0.15.9
-PKGREVISION= 1
+DISTNAME= mpd-0.15.15
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
CATEGORIES= audio
#MASTER_SITES= http://musicpd.org/uploads/files/
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index 5afbd6503ea..db8b0c75875 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2010/05/19 18:25:19 drochner Exp $
+$NetBSD: distinfo,v 1.29 2011/01/11 11:43:19 drochner Exp $
-SHA1 (mpd-0.15.9.tar.bz2) = 9dbef302ef44372f2232c1df1af2f3a958ff601d
-RMD160 (mpd-0.15.9.tar.bz2) = 566440dbc16ac46f20d8d11bfe09ffe43423eb34
-Size (mpd-0.15.9.tar.bz2) = 390141 bytes
+SHA1 (mpd-0.15.15.tar.bz2) = 2ec37cc32469255ea603d15617f100d1f12e766c
+RMD160 (mpd-0.15.15.tar.bz2) = 16b6196f698f0442ad6d76b7a03f06f0dcc5a245
+Size (mpd-0.15.15.tar.bz2) = 391688 bytes
SHA1 (patch-aa) = 14c63f15f09d6d22770b90a30cc49951c8d1d38a
SHA1 (patch-ab) = 080c2b068fd30cd9ea9c67fb1dcb5ca7c1336a04
SHA1 (patch-ac) = 1fa9333d4e54ccabe02ed94c4bddd1d3a1e6d914
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index 1805cd4e0f4..5097f209384 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.13 2009/07/30 16:51:04 drochner Exp $
+# $NetBSD: options.mk,v 1.14 2011/01/11 11:43:19 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS= aac audiofile curl flac id3 libao jack libmikmod musepack ogg inet6 shout
+PKG_SUPPORTED_OPTIONS= aac audiofile curl flac id3 libao jack libmikmod musepack ogg inet6 shout ffmpeg
PKG_SUGGESTED_OPTIONS= aac audiofile curl flac id3 libao musepack ogg
.include "../../mk/bsd.options.mk"
@@ -93,3 +93,10 @@ CONFIGURE_ARGS+= --enable-shout
.else
CONFIGURE_ARGS+= --disable-shout
.endif
+
+.if !empty(PKG_OPTIONS:Mffmpeg)
+. include "../../multimedia/ffmpeg/buildlink3.mk"
+CONFIGURE_ARGS+= --with-ffmpeg=${BUILDLINK_PREFIX.ffmpeg}
+.else
+CONFIGURE_ARGS+= --disable-ffmpeg
+.endif