[pkgsrc/trunk]: pkgsrc/comms/asterisk18 Link chan_oss.so with libossaudio to ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e00c7d139352
branches:  trunk
changeset: 602696:e00c7d139352
user:      manu <manu%pkgsrc.org@localhost>
date:      Wed Apr 18 01:33:24 2012 +0000

description:
Link chan_oss.so with libossaudio to avoid startup load failure because
Undefined PLT symbol "_oss_ioctl" (symnum = 64)

diffstat:

 comms/asterisk18/Makefile         |   5 ++++-
 comms/asterisk18/distinfo         |   3 ++-
 comms/asterisk18/patches/patch-bn |  17 +++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r f21f02d2d9e7 -r e00c7d139352 comms/asterisk18/Makefile
--- a/comms/asterisk18/Makefile Wed Apr 18 00:09:43 2012 +0000
+++ b/comms/asterisk18/Makefile Wed Apr 18 01:33:24 2012 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2012/04/07 20:10:45 jnemeth Exp $
+# $NetBSD: Makefile,v 1.30 2012/04/18 01:33:24 manu Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
 DISTNAME=      asterisk-1.8.11.0
+PKGREVISION=   1
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 DISTFILES=     ${DEFAULT_DISTFILES}
 EXTRACT_ONLY=  ${DISTNAME}.tar.gz
@@ -35,6 +36,7 @@
 CONFIGURE_ARGS+=       --without-gtk2
 # XXX remove when lang/lua gets builtin.mk
 CONFIGURE_ARGS+=       --without-lua
+CONFIGURE_ARGS+=       --with-oss=yes
 
 INSTALL_TARGET=                install samples
 INSTALLATION_DIRS+=    lib/pkgconfig share/doc/${PKGBASE}
@@ -216,6 +218,7 @@
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f21f02d2d9e7 -r e00c7d139352 comms/asterisk18/distinfo
--- a/comms/asterisk18/distinfo Wed Apr 18 00:09:43 2012 +0000
+++ b/comms/asterisk18/distinfo Wed Apr 18 01:33:24 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2012/04/07 20:10:45 jnemeth Exp $
+$NetBSD: distinfo,v 1.25 2012/04/18 01:33:24 manu Exp $
 
 SHA1 (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = cacabf8a3f8d710a26d53ae3fa041892354ac98d
 RMD160 (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = 51b5a9dced4642011b475d8718f404ae5be26018
@@ -38,3 +38,4 @@
 SHA1 (patch-bk) = 93679dfb04d26c99ac9c2822e0d74d869d16369f
 SHA1 (patch-bl) = 35cede8f5c253baed3d3983f58986c7c662e35e2
 SHA1 (patch-bm) = 284b34e20091b3427cd67b835fc7aa62c9d92a6c
+SHA1 (patch-bn) = bffb5cbefc75b8296ce1967bc7ad4882ddabc9e0
diff -r f21f02d2d9e7 -r e00c7d139352 comms/asterisk18/patches/patch-bn
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/asterisk18/patches/patch-bn Wed Apr 18 01:33:24 2012 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-bn,v 1.1 2012/04/18 01:33:25 manu Exp $
+
+Link chan_oss.so with libossaudio to avoid startup load failure because
+Undefined PLT symbol "_oss_ioctl" (symnum = 64)
+
+--- channels/Makefile.orig     2012-04-17 11:04:33.000000000 +0200
++++ channels/Makefile  2012-04-17 11:06:44.000000000 +0200
+@@ -98,8 +98,9 @@
+ 
+ $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o
+ misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_misdn)
+ 
++$(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): LIBS+=-lossaudio
+ $(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_video.o vgrabbers.o console_board.o
+ console_video.o vgrabbers.o console_board.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_oss)
+ 
+ chan_usbradio.o: ./xpmr/xpmr.c ./xpmr/xpmr.h ./xpmr/xpmr_coef.h