[pkgsrc/trunk]: pkgsrc/audio/daapd Re-add faad option, to enable mpeg4ip supp...

[tonio <tonio%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9e002e31cec
branches:  trunk
changeset: 506967:f9e002e31cec
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Tue Jan 24 15:18:38 2006 +0000

description:
Re-add faad option, to enable mpeg4ip support (to share AAC files)

diffstat:

 audio/daapd/Makefile         |  15 +++++++++++++--
 audio/daapd/distinfo         |   4 ++--
 audio/daapd/patches/patch-aa |  11 ++++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)

diffs (72 lines):

diff -r 3bb9298bb210 -r f9e002e31cec audio/daapd/Makefile
--- a/audio/daapd/Makefile      Tue Jan 24 15:10:26 2006 +0000
+++ b/audio/daapd/Makefile      Tue Jan 24 15:18:38 2006 +0000
@@ -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 @@
 
 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 -r 3bb9298bb210 -r f9e002e31cec audio/daapd/distinfo
--- a/audio/daapd/distinfo      Tue Jan 24 15:10:26 2006 +0000
+++ b/audio/daapd/distinfo      Tue Jan 24 15:18:38 2006 +0000
@@ -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 -r 3bb9298bb210 -r f9e002e31cec audio/daapd/patches/patch-aa
--- a/audio/daapd/patches/patch-aa      Tue Jan 24 15:10:26 2006 +0000
+++ b/audio/daapd/patches/patch-aa      Tue Jan 24 15:18:38 2006 +0000
@@ -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
  # -----------------------------------------