diff options
Diffstat (limited to 'net-voip/yate/files/yate-4.3.0-ilbc-alsa-oss.patch')
| -rw-r--r-- | net-voip/yate/files/yate-4.3.0-ilbc-alsa-oss.patch | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/net-voip/yate/files/yate-4.3.0-ilbc-alsa-oss.patch b/net-voip/yate/files/yate-4.3.0-ilbc-alsa-oss.patch new file mode 100644 index 000000000000..8a90ee55df72 --- /dev/null +++ b/net-voip/yate/files/yate-4.3.0-ilbc-alsa-oss.patch @@ -0,0 +1,96 @@ +diff -ur a/configure.in b/configure.in +--- a/configure.in 2012-12-21 15:26:49.000000000 +0100 ++++ b/configure.in 2013-06-18 17:38:10.292436508 +0200 +@@ -779,6 +779,8 @@ + AC_SUBST(WANPIPE_FLAGS) + + HAVE_SOUNDCARD=no ++AC_ARG_ENABLE(oss,AC_HELP_STRING([--enable-oss],[Enable OSS (default: yes)]),enable_oss=$enableval,enable_oss=yes) ++if [[ "x$enable_oss" = "xyes" ]]; then + AC_MSG_CHECKING([for sound card headers]) + AC_TRY_COMPILE([ + #include <sys/stat.h> +@@ -797,9 +799,12 @@ + HAVE_SOUNDCARD="yes" + ) + AC_MSG_RESULT([$HAVE_SOUNDCARD]) ++fi + AC_SUBST(HAVE_SOUNDCARD) + + HAVE_ALSA=no ++AC_ARG_ENABLE(alsa,AC_HELP_STRING([--enable-alsa],[Enable ALSA (default: yes)]),enable_alsa=$enableval,enable_alsa=yes) ++if [[ "x$enable_alsa" = "xyes" ]]; then + AC_MSG_CHECKING([for ALSA headers]) + AC_TRY_COMPILE([ + #if defined(__linux__) +@@ -816,6 +821,7 @@ + HAVE_ALSA="yes" + ) + AC_MSG_RESULT([$HAVE_ALSA]) ++fi + AC_SUBST(HAVE_ALSA) + + # check for Mac OS X audio headers +@@ -878,20 +884,36 @@ + + HAVE_ILBC=no + ILBC_INC="" +-AC_ARG_ENABLE(ilbc,AC_HELP_STRING([--enable-ilbc],[Enable iLBC codec (default: yes)]),want_ilbc=$enableval,want_ilbc=yes) +-if [[ "x$want_ilbc" = "xyes" ]]; then +-AC_MSG_CHECKING([for iLBC reference in libs]) +- basedir=`cd "$srcdir" && pwd` +- incilbc="libs/ilbc" +- if [[ -f "$basedir/$incilbc/iLBC_encode.h" ]]; then ++SYSTEM_ILBC=no ++AC_ARG_ENABLE(ilbc,AC_HELP_STRING([--enable-ilbc],[Enable iLBC codec (default: yes)]),ac_cv_use_ilbc=$enableval,ac_cv_use_ilbc=yes) ++if [[ "x$ac_cv_use_ilbc" = "xyes" ]]; then ++ for i in /usr/include /usr/include/ilbc /usr/local/include /usr/local/include/ilbc; do ++ ac_cv_use_ilbc="$i" ++ test -f "$ac_cv_use_ilbc/iLBC_encode.h" && break ++ done ++fi ++if [[ "x$ac_cv_use_ilbc" != "xno" ]]; then ++ AC_MSG_CHECKING([for iLBC_encode.h in $ac_cv_use_ilbc]) ++ if [[ -f "$ac_cv_use_ilbc/iLBC_encode.h" ]]; then ++ HAVE_ILBC=yes ++ ILBC_INC="-I$ac_cv_use_ilbc" ++ SYSTEM_ILBC=yes ++ else ++ AC_MSG_CHECKING([for iLBC in libs]) ++ basedir=`cd "$srcdir" && pwd` ++ incilbc="libs/ilbc" ++ if [[ -f "$basedir/$incilbc/iLBC_encode.h" ]]; then + HAVE_ILBC=yes + basedir=`echo "$basedir" | sed 's/\([[^\]]\)\([[[:space:]\$\"'\'']]\)/\1\\\2/g'` + ILBC_INC="-I$basedir/$incilbc" ++ SYSTEM_ILBC=no + fi ++fi + AC_MSG_RESULT([$HAVE_ILBC]) + fi + AC_SUBST(HAVE_ILBC) + AC_SUBST(ILBC_INC) ++AC_SUBST(SYSTEM_ILBC) + + HAVE_ILBCWR=no + ILBCWR_INC="" +Nur in b: configure.in.orig. +diff -ur a/modules/Makefile.in b/modules/Makefile.in +--- a/modules/Makefile.in 2012-12-21 15:26:49.000000000 +0100 ++++ b/modules/Makefile.in 2013-06-18 17:38:10.292436508 +0200 +@@ -344,9 +344,13 @@ + server/lksctp.yate: EXTERNFLAGS = @SCTP_FLAGS@ + server/lksctp.yate: EXTERNLIBS = -lsctp + ++ifeq (@SYSTEM_ILBC@,yes) ++ilbccodec.yate: LOCALLIBS = -lilbc ++else + ilbccodec.yate: ../libs/ilbc/libilbc.a +-ilbccodec.yate: LOCALFLAGS = @ILBC_INC@ + ilbccodec.yate: LOCALLIBS = -L../libs/ilbc -lilbc ++endif ++ilbccodec.yate: LOCALFLAGS = @ILBC_INC@ + + ilbcwebrtc.yate: ../libs/miniwebrtc/libminiwebrtc.a + ilbcwebrtc.yate: LOCALFLAGS = @ILBCWR_INC@ -I@top_srcdir@/libs/miniwebrtc/audio/common/processing -I@top_srcdir@/libs/miniwebrtc +Nur in b/modules: Makefile.in.orig. |