summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>2006-06-12 16:36:50 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-12 16:36:50 +0000
commit677297a21ee1aef58c302dfcba97416cbaae16c7 (patch)
tree94ac2df7f0d22d76ec4e2dff3c669c163253ebb6
parentdffddd7000a55a3420bbc1025c6acd63a8817d6f (diff)
asterisk-1.2.9.1: added dependency on libogg and libvorbis
added LDFLAGS in formats/Makefile, bumped PR
-rw-r--r--packages/asterisk/asterisk-1.2.9.1/asterisk.patch9
-rw-r--r--packages/asterisk/asterisk_1.2.9.1.bb4
2 files changed, 11 insertions, 2 deletions
diff --git a/packages/asterisk/asterisk-1.2.9.1/asterisk.patch b/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
index 5a5882d2ce..4f65938a11 100644
--- a/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
+++ b/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
@@ -185,6 +185,15 @@
FORMAT_LIBS+=format_ogg_vorbis.so
endif
+@@ -57,7 +57,7 @@
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm
+
+ format_ogg_vorbis.so : format_ogg_vorbis.o
+- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm
++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm $(LDFLAGS)
+
+ install: all
+ for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
--- asterisk-1.2.9.1/utils/Makefile~asterisk
+++ asterisk-1.2.9.1/utils/Makefile
@@ -22,11 +22,11 @@
diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb
index 042807b055..4a57b8e71f 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 Asterisk open source software PBX"
HOMEPAGE="www.asterisk.org"
LICENSE="GPL"
-DEPENDS="ncurses zlib openssl curl alsa-lib"
-PR = "r2"
+DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis"
+PR = "r3"
SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
file://asterisk.patch;patch=1"