diff options
| author | John Crispin <blogic@openwrt.org> | 2012-02-14 15:05:55 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2012-02-14 15:05:55 +0000 |
| commit | f8ec8899ada5ce241e0cc4ad0e22040fe2b927f4 (patch) | |
| tree | ae8cbed97e819959becc7370bcbcc727d142c167 /package/pjsip/patches/000-aconf.patch | |
| parent | 27bf1c6b9e7590c1a0c658ab04b47e4e5a884ab9 (diff) | |
| download | upstream-f8ec8899ada5ce241e0cc4ad0e22040fe2b927f4.tar.gz upstream-f8ec8899ada5ce241e0cc4ad0e22040fe2b927f4.tar.bz2 upstream-f8ec8899ada5ce241e0cc4ad0e22040fe2b927f4.zip | |
[pjsip] bump to 1.12, merge improved lantiq aud_dev driver
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30520 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/pjsip/patches/000-aconf.patch')
| -rw-r--r-- | package/pjsip/patches/000-aconf.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/package/pjsip/patches/000-aconf.patch b/package/pjsip/patches/000-aconf.patch deleted file mode 100644 index 46e4aad4ac..0000000000 --- a/package/pjsip/patches/000-aconf.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/aconfigure.ac -+++ b/aconfigure.ac -@@ -48,9 +48,9 @@ if test -z "$CROSS_COMPILE"; then - CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'` - fi - --if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi -+AR="${CROSS_COMPILE}ar rv" - AC_SUBST(AR) --if test "$LD" = ""; then LD="$CC"; fi -+LD="${CROSS_COMPILE}gcc" - AC_SUBST(LD) - if test "$LDOUT" = ""; then LDOUT="-o"; fi - AC_SUBST(LDOUT) -@@ -597,6 +597,15 @@ AC_ARG_ENABLE(ext_sound, - AC_MSG_RESULT([Checking if external sound is set... yes]) - fi] - ) -+ -+AC_ARG_ENABLE(ltq_tapi, -+ AC_HELP_STRING([--enable-ltq-tapi], -+ [PJMEDIA will use ltq tapi backend]), -+ [if test "$enable_ltq_tapi" = "yes"; then -+ [ac_pjmedia_snd=ltqtapi] -+ AC_MSG_RESULT([Checking if external sound is set... yes]) -+ fi] -+ ) - - dnl # Include resampling small filter - AC_SUBST(ac_no_small_filter) ---- a/pjmedia/build/os-auto.mak.in -+++ b/pjmedia/build/os-auto.mak.in -@@ -118,4 +118,11 @@ ifeq ($(AC_PJMEDIA_SND),external) - export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 - endif - -- -+# -+# Lantiq tapi backend -+# -+ifeq ($(AC_PJMEDIA_SND),ltqtapi) -+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -+export PJMEDIA_AUDIODEV_OBJS += tapi_dev.o -+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_TAPI_DEVICE=1 -+endif |