Disable bcg729 in bundled pjproject

Asterisk doesn't use pjproject codecs anyway.

diff --git a/asterisk.spec b/asterisk.spec
index 91c8344083b7899478885ea61ccc4d64e23883b0..2fea7de6b530ffdaf78f18946eff75da6bc4dde8 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -78,7 +78,6 @@ Patch4:               lpc10-system.patch
 Patch5:                %{name}-histedit.patch
 Patch6:                x32.patch
 Patch7:                %{name}-ilbc.patch
-Patch8:                bundled_pjproject_libs.patch
 URL:           http://www.asterisk.org/
 BuildRequires: OSPToolkit-devel >= 4.0.0
 %{?with_oss:BuildRequires:     SDL-devel}
@@ -86,9 +85,6 @@ BuildRequires:        OSPToolkit-devel >= 4.0.0
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
-%if %{without system_pjproject} && %{with pjsip}
-BuildRequires: bcg729-devel >= 1.0.2
-%endif
 # libbfd (used only for debug builds?)
 #BuildRequires:        binutils-devel
 BuildRequires: bison >= 2
@@ -796,7 +792,6 @@ Dokumentacja API Asteriska.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %if %{with opus_vp8}
 
@@ -830,6 +825,7 @@ export WGET="/bin/true"
 
 %if %{without system_pjproject} && %{with pjsip}
 export EXTERNALS_CACHE_DIR="$PWD/externals"
+export PJPROJECT_CONFIGURE_OPTS="--disable-bcg729"
 %endif
 
 # be sure to invoke ./configure with our flags

diff --git a/bundled_pjproject_libs.patch b/bundled_pjproject_libs.patch
deleted file mode 100644 (file)
index f2867fb..0000000
--- a/bundled_pjproject_libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur asterisk-15.2.2.orig/main/Makefile asterisk-15.2.2/main/Makefile
---- asterisk-15.2.2.orig/main/Makefile 2018-03-12 10:54:07.000000000 +0100
-+++ asterisk-15.2.2/main/Makefile      2018-03-12 11:20:07.000000000 +0100
-@@ -273,7 +273,7 @@
- 
- $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB).$(ASTPJ_SO_VERSION) $(PJ_LDFLAGS)
- $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" -DAST_NOT_MODULE $(PJ_CFLAGS)
--$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
-+$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lbcg729 $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
- ifeq ($(GNU_LD),1)
-     $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common
- endif