mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-30 22:49:43 +02:00
9d4910209d
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33162 3c298f89-4303-0410-b956-a3cf2f4a3e73
79 lines
2.5 KiB
Diff
79 lines
2.5 KiB
Diff
Index: pjproject-1.14.2/aconfigure.ac
|
|
===================================================================
|
|
--- pjproject-1.14.2.orig/aconfigure.ac 2012-04-27 03:22:15.000000000 +0200
|
|
+++ pjproject-1.14.2/aconfigure.ac 2012-08-13 14:42:33.204641678 +0200
|
|
@@ -48,9 +48,8 @@
|
|
CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
|
|
fi
|
|
|
|
-if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
|
|
+AR="${AR} rv"
|
|
AC_SUBST(AR)
|
|
-if test "$LD" = ""; then LD="$CC"; fi
|
|
AC_SUBST(LD)
|
|
if test "$LDOUT" = ""; then LDOUT="-o "; fi
|
|
AC_SUBST(LDOUT)
|
|
@@ -584,13 +583,7 @@
|
|
;;
|
|
*)
|
|
dnl # Check if ALSA is available
|
|
- ac_pjmedia_snd=pa_unix
|
|
- AC_CHECK_HEADER(alsa/version.h,
|
|
- [AC_SUBST(ac_pa_use_alsa,1)
|
|
- LIBS="$LIBS -lasound"
|
|
- ],
|
|
- [AC_SUBST(ac_pa_use_alsa,0)])
|
|
- AC_MSG_RESULT([Checking sound device backend... unix])
|
|
+ AC_SUBST(ac_pa_use_alsa,0)
|
|
|
|
dnl # Check if OSS is disabled
|
|
AC_SUBST(ac_pa_use_oss,1)
|
|
@@ -617,6 +610,15 @@
|
|
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,
|
|
@@ -737,14 +739,6 @@
|
|
AC_MSG_RESULT([Checking if iLBC codec is disabled...no]))
|
|
|
|
dnl # Include libsamplerate
|
|
-AC_ARG_ENABLE(libsamplerate,
|
|
- AC_HELP_STRING([--enable-libsamplerate],
|
|
- [Link with libsamplerate when available. Note that PJMEDIA_RESAMPLE_IMP must also be configured]),
|
|
- [ AC_CHECK_LIB(samplerate,src_new) ],
|
|
- AC_MSG_RESULT([Skipping libsamplerate detection])
|
|
- )
|
|
-
|
|
-dnl # Include libsamplerate
|
|
AC_SUBST(ac_resample_dll)
|
|
AC_ARG_ENABLE(resample_dll,
|
|
AC_HELP_STRING([--enable-resample-dll],
|
|
Index: pjproject-1.14.2/pjmedia/build/os-auto.mak.in
|
|
===================================================================
|
|
--- pjproject-1.14.2.orig/pjmedia/build/os-auto.mak.in 2011-10-14 06:15:15.000000000 +0200
|
|
+++ pjproject-1.14.2/pjmedia/build/os-auto.mak.in 2012-08-13 14:40:47.680637171 +0200
|
|
@@ -125,4 +125,11 @@
|
|
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
|