1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
Description: integrate amr module with asterisk build routines
Original patch adapted by Jonas Smedegaard to fit Debian packaging,
and to remove original patch file to help detect later upstream changes.
Author: Alexander Traud <pabstraud@compuserve.com>
Author: Jonas Smedegaard <dr@jones.dk>
Source: https://github.com/traud/asterisk-amr/blob/master/build_tools.patch
Forwarded: not-needed
Last-Update: 2023-08-27
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -1,3 +1,6 @@
+AMR_NB=@PBX_AMR_NB@
+AMR_WB_DECODER=@PBX_AMR_WB_DECODER@
+AMR_WB_ENCODER=@PBX_AMR_WB_ENCODER@
BLUETOOTH=@PBX_BLUETOOTH@
BEANSTALK=@PBX_BEANSTALK@
COROSYNC=@PBX_COROSYNC@
--- a/configure.ac
+++ b/configure.ac
@@ -549,6 +549,9 @@
# by the --with option name (the third field),
# to make things easier for the users.
+AST_EXT_LIB_SETUP([AMR_NB], [AMR Audio Codec (Narrowband) Decoder/Encoder], [opencore-amrnb])
+AST_EXT_LIB_SETUP([AMR_WB_DECODER], [AMR-WB Audio Codec (Wideband) Decoder], [opencore-amrwb])
+AST_EXT_LIB_SETUP([AMR_WB_ENCODER], [AMR-WB Audio Codec (Wideband) Encoder], [vo-amrwbenc])
AST_EXT_LIB_SETUP([BFD], [Debug symbol decoding], [bfd])
# BKTR is used for backtrace support on platforms that do not
@@ -1651,6 +1654,10 @@
# do the package library checks now
+AST_EXT_LIB_CHECK([AMR_NB], [opencore-amrnb], [Encoder_Interface_init], [opencore-amrnb/interf_enc.h])
+AST_EXT_LIB_CHECK([AMR_WB_DECODER], [opencore-amrwb], [D_IF_init], [opencore-amrwb/dec_if.h])
+AST_EXT_LIB_CHECK([AMR_WB_ENCODER], [vo-amrwbenc], [E_IF_init], [vo-amrwbenc/enc_if.h])
+
AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h])
# Fedora/RedHat/CentOS require extra libraries
AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h], [-ldl -liberty])
--- a/makeopts.in
+++ b/makeopts.in
@@ -130,6 +130,13 @@
AST_RPATH=@AST_RPATH@
AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@
+AMR_NB_INCLUDE=@AMR_NB_INCLUDE@
+AMR_NB_LIB=@AMR_NB_LIB@
+AMR_WB_DECODER_INCLUDE=@AMR_WB_DECODER_INCLUDE@
+AMR_WB_DECODER_LIB=@AMR_WB_DECODER_LIB@
+AMR_WB_ENCODER_INCLUDE=@AMR_WB_ENCODER_INCLUDE@
+AMR_WB_ENCODER_LIB=@AMR_WB_ENCODER_LIB@
+
BFD_INCLUDE=@BFD_INCLUDE@
BFD_LIB=@BFD_LIB@
--- a/Xamr/build_tools.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- build_tools/menuselect-deps.in (Asterisk 13.5.0)
-+++ build_tools/menuselect-deps.in (working copy)
-@@ -1,2 +1,5 @@
- ALSA=@PBX_ALSA@
-+AMR_NB=@PBX_AMR_NB@
-+AMR_WB_DECODER=@PBX_AMR_WB_DECODER@
-+AMR_WB_ENCODER=@PBX_AMR_WB_ENCODER@
- BLUETOOTH=@PBX_BLUETOOTH@
---- configure.ac (Asterisk 13.4.0)
-+++ configure.ac (working copy)
-@@ -402,2 +402,5 @@
- AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
-+AST_EXT_LIB_SETUP([AMR_NB], [AMR Audio Codec (Narrowband) Decoder/Encoder], [opencore-amrnb])
-+AST_EXT_LIB_SETUP([AMR_WB_DECODER], [AMR-WB Audio Codec (Wideband) Decoder], [opencore-amrwb])
-+AST_EXT_LIB_SETUP([AMR_WB_ENCODER], [AMR-WB Audio Codec (Wideband) Encoder], [vo-amrwbenc])
- AST_EXT_LIB_SETUP([BFD], [Debug symbol decoding], [bfd])
-@@ -1285,2 +1288,6 @@
-
-+AST_EXT_LIB_CHECK([AMR_NB], [opencore-amrnb], [Encoder_Interface_init], [opencore-amrnb/interf_enc.h])
-+AST_EXT_LIB_CHECK([AMR_WB_DECODER], [opencore-amrwb], [D_IF_init], [opencore-amrwb/dec_if.h])
-+AST_EXT_LIB_CHECK([AMR_WB_ENCODER], [vo-amrwbenc], [E_IF_init], [vo-amrwbenc/enc_if.h])
-+
- AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h])
---- makeopts.in (Asterisk 13.4.0)
-+++ makeopts.in (working copy)
-@@ -121,2 +121,9 @@
-
-+AMR_NB_INCLUDE=@AMR_NB_INCLUDE@
-+AMR_NB_LIB=@AMR_NB_LIB@
-+AMR_WB_DECODER_INCLUDE=@AMR_WB_DECODER_INCLUDE@
-+AMR_WB_DECODER_LIB=@AMR_WB_DECODER_LIB@
-+AMR_WB_ENCODER_INCLUDE=@AMR_WB_ENCODER_INCLUDE@
-+AMR_WB_ENCODER_LIB=@AMR_WB_ENCODER_LIB@
-+
- BFD_INCLUDE=@BFD_INCLUDE@
|
