From 076eb39e201acd0dd45ce0ff9f0efa551000d12e Mon Sep 17 00:00:00 2001
From: manu <manu>
Date: Wed, 18 Apr 2012 01:33:24 +0000
Subject: Link chan_oss.so with libossaudio to avoid startup load failure
 because Undefined PLT symbol "_oss_ioctl" (symnum = 64)

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

(limited to 'comms')

diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 2480ee9af55..6731374f0de 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -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+=	--sysconfdir=${PKG_SYSCONFDIR}
 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 @@ post-install:
 .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 --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 81b78216158..9d48a285058 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -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-bj) = a184452adf2c883695e3819c13c584a3db9608d7
 SHA1 (patch-bk) = 93679dfb04d26c99ac9c2822e0d74d869d16369f
 SHA1 (patch-bl) = 35cede8f5c253baed3d3983f58986c7c662e35e2
 SHA1 (patch-bm) = 284b34e20091b3427cd67b835fc7aa62c9d92a6c
+SHA1 (patch-bn) = bffb5cbefc75b8296ce1967bc7ad4882ddabc9e0
diff --git a/comms/asterisk18/patches/patch-bn b/comms/asterisk18/patches/patch-bn
new file mode 100644
index 00000000000..cb0d901eed3
--- /dev/null
+++ b/comms/asterisk18/patches/patch-bn
@@ -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
-- 
cgit v1.2.3