lpc10-system.patch

   1 diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/build_tools/menuselect-deps.in asterisk-13.16.0/build_tools/menuselect-deps.in
   2 --- asterisk-13.16.0.orig/build_tools/menuselect-deps.in        2017-05-30 19:44:16.000000000 +0200
   3 +++ asterisk-13.16.0/build_tools/menuselect-deps.in     2017-06-09 14:11:13.000000000 +0200
   4 @@ -12,6 +12,7 @@
   5  GENERIC_ODBC=@PBX_GENERIC_ODBC@
   6  GMIME=@PBX_GMIME@
   7  GNU_LD=@GNU_LD@
   8 +LPC10=@PBX_LPC10@
   9  GSM=@PBX_GSM@
  10  ILBC=@PBX_ILBC@
  11  GTK2=@PBX_GTK2@
  12 diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/codecs/codec_lpc10.c asterisk-13.16.0/codecs/codec_lpc10.c
  13 --- asterisk-13.16.0.orig/codecs/codec_lpc10.c  2017-05-30 19:44:16.000000000 +0200
  14 +++ asterisk-13.16.0/codecs/codec_lpc10.c       2017-06-09 14:11:13.000000000 +0200
  15 @@ -26,6 +26,9 @@
  16   *
  17   * \ingroup codecs
  18   */
  19 +/*** MODULEINFO
  20 +       <depend>lpc10</depend>
  21 + ***/
  22
  23  /*** MODULEINFO
  24         <support_level>core</support_level>
  25 @@ -41,7 +44,7 @@
  26  #include "asterisk/utils.h"
  27  #include "asterisk/linkedlists.h"
  28
  29 -#include "lpc10/lpc10.h"
  30 +#include <lpc10.h>
  31
  32  /* Sample frame data */
  33  #include "asterisk/slin.h"
  34 diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/codecs/Makefile asterisk-13.16.0/codecs/Makefile
  35 --- asterisk-13.16.0.orig/codecs/Makefile       2017-05-30 19:44:16.000000000 +0200
  36 +++ asterisk-13.16.0/codecs/Makefile    2017-06-09 14:14:38.000000000 +0200
  37 @@ -27,8 +27,7 @@
  38
  39  SUB_DIRS := \
  40         $(SUB_GSM) \
  41 -       $(SUB_ILBC) \
  42 -       $(SUB_LPC10) \
  43 +       $(SUB_ILBC)
  44
  45  all: _all
  46
  47 @@ -59,7 +58,9 @@
  48  .PHONY: $(SUB_DIRS)
  49
  50
  51 +ifneq ($(LPC10_INTERNAL),no)
  52  codec_lpc10.so: $(LIBLPC10)
  53 +endif
  54
  55  # Don't run the implicit rules for this target.
  56  $(LIBLPC10): $(SUB_LPC10) ;
  57 diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/configure.ac asterisk-13.16.0/configure.ac
  58 --- asterisk-13.16.0.orig/configure.ac  2017-06-09 14:10:32.000000000 +0200
  59 +++ asterisk-13.16.0/configure.ac       2017-06-09 14:11:14.000000000 +0200
  60 @@ -468,6 +468,7 @@
  61  AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise])
  62  AST_EXT_LIB_SETUP([ILBC], [System iLBC], [ilbc], [, use 'internal' iLBC otherwise])
  63  AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2])
  64 +AST_EXT_LIB_SETUP([LPC10], [External lpc10 library], [lpc10], [, use 'internal' lpc10 otherwise])
  65  AST_EXT_LIB_SETUP([GMIME], [GMime], [gmime])
  66  AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
  67  AST_EXT_LIB_SETUP([HOARD], [Hoard Memory Allocator], [hoard])
  68 @@ -1530,6 +1531,72 @@
  69     fi
  70  fi
  71
  72 +LPC10_INTERNAL="yes"
  73 +AC_SUBST(LPC10_INTERNAL)
  74 +LPC10_SYSTEM="yes"
  75 +if test "${USE_LPC10}" != "no"; then
  76 +   case "$host_cpu" in
  77 +   x86_64|s390x)
  78 +       _lib=lib64
  79 +       ;;
  80 +   *)
  81 +       _lib=lib
  82 +       ;;
  83 +   esac
  84 +
  85 +   if test "${LPC10_DIR}" = "internal"; then
  86 +      LPC10_SYSTEM="no"
  87 +   elif test "${LPC10_DIR}" != ""; then
  88 +      LPC10_INTERNAL="no"
  89 +   fi
  90 +   if test "${LPC10_SYSTEM}" = "yes"; then
  91 +      lpc10libdir=""
  92 +      if test "x${LPC10_DIR}" != "x"; then
  93 +         if test -d ${LPC10_DIR}/${_lib}; then
  94 +            lpc10libdir="-L${LPC10_DIR}/${_lib}"
  95 +         else
  96 +            lpc10libdir="-L${LPC10_DIR}"
  97 +         fi
  98 +      fi
  99 +      AC_CHECK_LIB([lpc10], [lpc10_encode], AC_DEFINE_UNQUOTED([HAVE_LPC10], 1,
 100 +      [Define to indicate the GSM library]), [], ${gsmlibdir})
 101 +      if test "${ac_cv_lib_lpc10_lpc10_encode}" = "yes"; then
 102 +         if test "x${LPC10_DIR}" != "x" ; then
 103 +            AC_CHECK_HEADER([${LPC10_DIR}/include/lpc10.h], [LPC10_HEADER_FOUND=1], [LPC10_HEADER_FOUND=0])
 104 +         else
 105 +            AC_CHECK_HEADER([lpc10.h], [LPC10_HEADER_FOUND=1], [LPC10_HEADER_FOUND=0])
 106 +         fi
 107 +         if test "${LPC10_HEADER_FOUND}" = "0" ; then
 108 +                  if test "x${LPC10_MANDATORY}" = "xyes" ; then
 109 +                         AC_MSG_NOTICE([***])
 110 +                         AC_MSG_NOTICE([*** It appears that you do not have the lpc10 development package installed.])
 111 +                         AC_MSG_NOTICE([*** Please install it to include ${LPC10_DESCRIP} support, or re-run configure])
 112 +                         AC_MSG_NOTICE([*** without explicitly specifying --with-${LPC10_OPTION}])
 113 +                         exit 1
 114 +                  fi
 115 +         fi
 116 +         LPC10_OK=0
 117 +         if test "${LPC10_HEADER_FOUND}" = "1" ; then
 118 +            AC_DEFINE_UNQUOTED([HAVE_LPC10_HEADER], 1, [Define to indicate that lpc10.h has no prefix for its location])
 119 +            LPC10_OK=1
 120 +         fi
 121 +         if test "${LPC10_OK}" = "1" ; then
 122 +            LPC10_LIB="-llpc10"
 123 +            if test "x${LPC10_DIR}" != "x"; then
 124 +               LPC10_LIB="${lpc10libdir} ${LPC10_LIB}"
 125 +               LPC10_INCLUDE="-I${LPC10_DIR}/include"
 126 +            fi
 127 +            PBX_LPC10=1
 128 +            LPC10_INTERNAL="no"
 129 +         fi
 130 +      fi
 131 +   fi
 132 +   if test "${LPC10_INTERNAL}" = "yes"; then
 133 +      PBX_LPC10=1
 134 +      AC_DEFINE_UNQUOTED([HAVE_LPC10_HEADER], 1, [Define to indicate that lpc10.h has no prefix for its location])
 135 +   fi
 136 +fi
 137 +
 138  AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h])
 139  # GNU libiconv #define's iconv_open to libiconv_open, so we need to search for that symbol
 140  AST_EXT_LIB_CHECK([ICONV], [iconv], [libiconv_open], [iconv.h])
 141 diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/makeopts.in asterisk-13.16.0/makeopts.in
 142 --- asterisk-13.16.0.orig/makeopts.in   2017-05-30 19:44:16.000000000 +0200
 143 +++ asterisk-13.16.0/makeopts.in        2017-06-09 14:11:14.000000000 +0200
 144 @@ -160,6 +160,10 @@
 145  ILBC_INCLUDE=@ILBC_INCLUDE@
 146  ILBC_LIB=@ILBC_LIB@
 147
 148 +LPC10_INTERNAL=@LPC10_INTERNAL@
 149 +LPC10_INCLUDE=@LPC10_INCLUDE@
 150 +LPC10_LIB=@LPC10_LIB@
 151 +
 152  GTK2_INCLUDE=@GTK2_INCLUDE@
 153  GTK2_LIB=@GTK2_LIB@
 154