summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/amarok/Makefile7
-rw-r--r--audio/chromaprint/Makefile7
-rw-r--r--audio/chromaprint/buildlink3.mk4
-rw-r--r--audio/chromaprint/distinfo3
-rw-r--r--audio/cmus/Makefile4
-rw-r--r--audio/cmus/options.mk4
-rw-r--r--audio/musicpd/Makefile3
-rw-r--r--audio/musicpd/options.mk4
-rw-r--r--audio/picard/Makefile6
9 files changed, 23 insertions, 19 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index e7d6fa33f6d..10712fd6d8b 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.146 2014/05/29 23:35:14 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.147 2014/08/11 23:09:44 wiz Exp $
DISTNAME= amarok-${VERS}
VERS= 2.8.0
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= audio multimedia
MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/
EXTRACT_SUFX= .tar.bz2
@@ -62,7 +61,7 @@ BUILDLINK_API_DEPENDS.taglib+= taglib>=1.6nb1
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../misc/nepomuk-core/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg1/buildlink3.mk"
.include "../../multimedia/libkcompactdisc/buildlink3.mk"
.include "../../security/qca2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile
index daa76d7c934..26da9a5378d 100644
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/04/27 16:29:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/08/11 23:09:44 wiz Exp $
DISTNAME= chromaprint-1.1
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= https://bitbucket.org/acoustid/chromaprint/downloads/
@@ -13,8 +14,10 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
# build and install "fpcalc"
CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=on
+# tell it where to find ffmpeg
+CMAKE_ARGS+= -DFFMPEG_ROOT:PATH=${BUILDLINK_PREFIX.ffmpeg1}
PKGCONFIG_OVERRIDE= libchromaprint.pc.cmake
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg1/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/chromaprint/buildlink3.mk b/audio/chromaprint/buildlink3.mk
index 4f4569dc5d2..1835902eadd 100644
--- a/audio/chromaprint/buildlink3.mk
+++ b/audio/chromaprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/04/30 14:09:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2014/08/11 23:09:44 wiz Exp $
BUILDLINK_TREE+= chromaprint
@@ -8,7 +8,7 @@ CHROMAPRINT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.chromaprint+= chromaprint>=1.1
BUILDLINK_PKGSRCDIR.chromaprint?= ../../audio/chromaprint
-#.include "../../multimedia/ffmpeg/buildlink3.mk"
+#.include "../../multimedia/ffmpeg1/buildlink3.mk"
.endif # CHROMAPRINT_BUILDLINK3_MK
BUILDLINK_TREE+= -chromaprint
diff --git a/audio/chromaprint/distinfo b/audio/chromaprint/distinfo
index ecb50ca87e6..044dbada29e 100644
--- a/audio/chromaprint/distinfo
+++ b/audio/chromaprint/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2014/04/27 16:27:09 wiz Exp $
+$NetBSD: distinfo,v 1.4 2014/08/11 23:09:44 wiz Exp $
SHA1 (chromaprint-1.1.tar.gz) = 5a250f761761d2ce08e2591b9daa909393552939
RMD160 (chromaprint-1.1.tar.gz) = f6b886b989b3de0d274c699696212c0350c1ad7a
Size (chromaprint-1.1.tar.gz) = 542360 bytes
+SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 0c751824ef25fa393f7e74f432d97d26a44354f0
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 403b6b259d0..81b96734c63 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2014/06/09 14:18:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2014/08/11 23:09:44 wiz Exp $
DISTNAME= cmus-v2.5.0
PKGNAME= ${DISTNAME:S/-v/-/}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmus/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/cmus/options.mk b/audio/cmus/options.mk
index e74a71b5072..36570409404 100644
--- a/audio/cmus/options.mk
+++ b/audio/cmus/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2014/04/21 09:49:49 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2014/08/11 23:09:44 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.cmus
PKG_SUPPORTED_OPTIONS= flac mad vorbis arts libao musepack faad wavpack pulseaudio
@@ -112,7 +112,7 @@ CONFIGURE_ARGS+= CONFIG_WAVPACK=n
# FFMPEG support
#
.if !empty(PKG_OPTIONS:Mffmpeg)
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg1/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_FFMPEG=y
PLIST.ffmpeg= yes
.else
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index a71bc91fbb0..2a8308d71e8 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2014/08/05 19:25:20 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2014/08/11 23:09:44 wiz Exp $
DISTNAME= mpd-0.18.12
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
+PKGREVISION= 1
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 c6c8aca9572..2a0822e8cfa 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2014/04/18 12:47:19 wiz Exp $
+# $NetBSD: options.mk,v 1.23 2014/08/11 23:09:44 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/ffmpeg/buildlink3.mk"
+. include "../../multimedia/ffmpeg1/buildlink3.mk"
CONFIGURE_ARGS+= --enable-ffmpeg
.else
CONFIGURE_ARGS+= --disable-ffmpeg
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 74326ea5259..6482abe6b8d 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2014/05/09 07:36:53 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/08/11 23:09:44 wiz Exp $
DISTNAME= picard-1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= config
.include "../../lang/python/application.mk"
.include "../../lang/python/distutils.mk"
.include "../../audio/libofa/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg1/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 22:29:05 +0000