aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>2006-06-12 05:23:51 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-12 05:23:51 +0000
commitdffddd7000a55a3420bbc1025c6acd63a8817d6f (patch)
tree21b8c1c79432a91f7f1b9c8c357e9fc389627bb9
parent8286c83cd5d7714c7432fd867ac72c59eed12ebf (diff)
downloadopenembedded-dffddd7000a55a3420bbc1025c6acd63a8817d6f.tar.gz
asterisk: added patch for 1.2.9.1 to compile if alsa is present
-rw-r--r--packages/asterisk/asterisk-1.2.9.1/asterisk.patch9
-rw-r--r--packages/asterisk/asterisk_1.2.9.1.bb6
2 files changed, 12 insertions, 3 deletions
diff --git a/packages/asterisk/asterisk-1.2.9.1/asterisk.patch b/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
index 627738727e..5a5882d2ce 100644
--- a/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
+++ b/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
@@ -154,6 +154,15 @@
ifneq ($(wildcard .depend),)
include .depend
+@@ -215,7 +215,7 @@
+ chan_alsa.o: $(ALSA_SRC)
+
+ chan_alsa.so: chan_alsa.o
+- $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl
++ $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl $(LDFLAGS)
+
+ chan_nbs.so: chan_nbs.o
+ $(CC) $(SOLINK) -o $@ $< -lnbs
--- asterisk-1.2.9.1/pbx/Makefile~asterisk
+++ asterisk-1.2.9.1/pbx/Makefile
@@ -59,7 +59,7 @@
diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb
index 7e7448d0e5..042807b055 100644
--- a/packages/asterisk/asterisk_1.2.9.1.bb
+++ b/packages/asterisk/asterisk_1.2.9.1.bb
@@ -1,8 +1,8 @@
-DESCRIPTION="The Astersisk open source software PBX"
+DESCRIPTION="The Asterisk open source software PBX"
HOMEPAGE="www.asterisk.org"
LICENSE="GPL"
-DEPENDS="ncurses zlib openssl curl"
-PR = "r1"
+DEPENDS="ncurses zlib openssl curl alsa-lib"
+PR = "r2"
SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
file://asterisk.patch;patch=1"