mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-18 09:42:47 +02:00
059d9f49a5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30520 3c298f89-4303-0410-b956-a3cf2f4a3e73
63 lines
1.8 KiB
Diff
63 lines
1.8 KiB
Diff
From 01108f66fd20dcdbb9fde0dd00924ee4e8c28a7c Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Sat, 28 Jan 2012 21:41:18 +0100
|
|
Subject: [PATCH 1/3] configure fixup
|
|
|
|
---
|
|
pjproject-1.12/aconfigure.ac | 13 +++++++++++--
|
|
pjproject-1.12/pjmedia/build/os-auto.mak.in | 9 ++++++++-
|
|
2 files changed, 19 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/aconfigure.ac b/aconfigure.ac
|
|
index 84295b5..e34fd32 100644
|
|
--- 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)
|
|
@@ -604,6 +604,15 @@ AC_ARG_ENABLE(ext_sound,
|
|
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)
|
|
AC_ARG_ENABLE(small-filter,
|
|
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
|
|
index 145f1d5..be38aeb 100644
|
|
--- a/pjmedia/build/os-auto.mak.in
|
|
+++ b/pjmedia/build/os-auto.mak.in
|
|
@@ -125,4 +125,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
|
|
--
|
|
1.7.7.1
|
|
|