diff options
| author | tonio <tonio@pkgsrc.org> | 2006-01-24 15:18:38 +0000 |
|---|---|---|
| committer | tonio <tonio@pkgsrc.org> | 2006-01-24 15:18:38 +0000 |
| commit | fcec47e1de1fe040e5bdc9446adae94fbe56fd76 (patch) | |
| tree | 823cbaddb2cf8fe4b4449c83b0e52352c6a85b29 | |
| parent | 1133d6bb2b4a15eaf01f1e19710534be94774a1e (diff) | |
| download | pkgsrc-fcec47e1de1fe040e5bdc9446adae94fbe56fd76.tar.gz | |
Re-add faad option, to enable mpeg4ip support (to share AAC files)
| -rw-r--r-- | audio/daapd/Makefile | 15 | ||||
| -rw-r--r-- | audio/daapd/distinfo | 4 | ||||
| -rw-r--r-- | audio/daapd/patches/patch-aa | 11 |
3 files changed, 21 insertions, 9 deletions
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile index 4d1d15b173b..f84600c0760 100644 --- a/audio/daapd/Makefile +++ b/audio/daapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/01/01 18:32:01 tron Exp $ +# $NetBSD: Makefile,v 1.15 2006/01/24 15:18:38 tonio Exp $ DISTNAME= daapd-0.2.4a CATEGORIES= audio @@ -18,12 +18,23 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES= ${EGDIR}/daapd.conf ${PKG_SYSCONFDIR}/daapd.conf +PKG_OPTIONS_VAR=PKG_OPTIONS.daapd +PKG_SUPPORTED_OPTIONS=faad +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mfaad) +.include "../../audio/faad2/buildlink3.mk" +MAKE_ENV+= WITH_FAAD=1 +.else +MAKE_ENV+= WITH_FAAD=0 +.endif + MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} SUBST_CLASSES+= paths -SUBST_MESSAGE.paths= "Fixing hardcoded paths." +SUBST_MESSAGE.paths= Fixing hardcoded paths. SUBST_STAGE.paths= post-patch SUBST_FILES.paths= daapd.8 daapd.cc SUBST_SED.paths= -e 's,/etc/,${PKG_SYSCONFDIR}/,g' diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo index c800fe15bce..ab56880bcb8 100644 --- a/audio/daapd/distinfo +++ b/audio/daapd/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.11 2006/01/12 16:45:37 joerg Exp $ +$NetBSD: distinfo,v 1.12 2006/01/24 15:18:38 tonio Exp $ SHA1 (daapd-0.2.4a.tgz) = 175130c8b709fcac124857fe5a9eacdfbe00153c RMD160 (daapd-0.2.4a.tgz) = ca3bf641693779af359cfe1c1b91c7b06cfaaa10 Size (daapd-0.2.4a.tgz) = 205231 bytes -SHA1 (patch-aa) = 805ec9d503e78e810f90135535d7a36c351629a9 +SHA1 (patch-aa) = c099f78bfa4658d311ae804b2e2aa0a182b9f5b9 diff --git a/audio/daapd/patches/patch-aa b/audio/daapd/patches/patch-aa index 2432fc43435..65082cacadb 100644 --- a/audio/daapd/patches/patch-aa +++ b/audio/daapd/patches/patch-aa @@ -1,16 +1,17 @@ -$NetBSD: patch-aa,v 1.10 2006/01/12 16:45:37 joerg Exp $ +$NetBSD: patch-aa,v 1.11 2006/01/24 15:18:38 tonio Exp $ ---- makefile.orig 2005-01-04 23:18:48.000000000 +0000 +--- makefile.orig 2005-01-05 00:18:48.000000000 +0100 +++ makefile -@@ -1,6 +1,6 @@ +@@ -1,29 +1,29 @@ # configure daapd here -HOWL_ENABLE = 0 +HOWL_ENABLE = 1 ZLIB_ENABLE = 1 - MPEG4_ENABLE = 0 +-MPEG4_ENABLE = 0 ++MPEG4_ENABLE = $(WITH_FAAD) + -@@ -8,22 +8,22 @@ MPEG4_ENABLE = 0 # no need to touch anything below this line # ----------------------------------------- |