main/freeswitch: force build with system lame

mod_shout failed to build on 32 bit x86. Make it use system lame instead.

2 files changed, 35 insertions, 4 deletions

diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 47e2868d3..33b80edd2 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Cameron Banta <cbanta@gmail.com>
 pkgname=freeswitch
 pkgver=1.4.18
-pkgrel=0
+pkgrel=1
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
 arch="all"
@@ -18,6 +18,7 @@ makedepends="bash
 	flac-dev
 	gnutls-dev
 	ldns-dev
+	lame-dev
 	libedit-dev
 	libiconv-dev
 	libjpeg-turbo-dev
@@ -68,6 +69,7 @@ source="http://files.freeswitch.org/$pkgname-$pkgver.tar.xz
 	freeswitch.initd
 	libshout-disable-examples.patch
 	freeswitch-mod_shout-textrels.patch
+	system-lame.patch
 	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -228,7 +230,8 @@ e409b006b5dad6d8668c3e429bf20159  freeswitch-libshout-2.2.2.tar.gz
 c608cca8ad773acebf201f581438c7e7  freeswitch.confd
 b48a5dbaa455bbe0bba4880cc06e6ff8  freeswitch.initd
 90b133b14a42c86d53d5e54dcbfbaf58  libshout-disable-examples.patch
-4cd4923463c89bed053e6295b5a4ec40  freeswitch-mod_shout-textrels.patch"
+4cd4923463c89bed053e6295b5a4ec40  freeswitch-mod_shout-textrels.patch
+6a6c4aba80e99c236ef712b17f3cdd01  system-lame.patch"
 sha256sums="54b3560d3c9b228a329677099beba40345af7592d19922212ee1a6c599ecbe4b  freeswitch-1.4.18.tar.xz
 816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f  freeswitch-json-c-0.9.tar.gz
 678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411  freeswitch-flite-2.0.0-release.tar.bz2
@@ -240,7 +243,8 @@ f83f9680d243eb254bf045571f971a6c5cf716367444cd48ed26d4c3367f4c41  modules.conf
 846a29a361ef6eecd77876963b5c0133699c40fa8b34c68df42d5f8a1a1915b1  freeswitch.confd
 4c3d4db15afe51c6a29f13fded2821e3390dc21953fa7f9bcb238626a40d8037  freeswitch.initd
 db0d3c252b5664ecb071bcf6868eff77c85dd7943a63fcfcac7e19db6a0ff61f  libshout-disable-examples.patch
-be1009327de615f04956ba0b0f44183f31c263e380af8027f94b976a84bcb09a  freeswitch-mod_shout-textrels.patch"
+be1009327de615f04956ba0b0f44183f31c263e380af8027f94b976a84bcb09a  freeswitch-mod_shout-textrels.patch
+11b107ca8632bb9c8fcb2aedfcfb421af24929aace4f56c34d4e701eb410e190  system-lame.patch"
 sha512sums="9de4d86c9adfde9f30e84ab6900ec115c2441126904c7f4f705767bced25ec166fb386cd2fde7f9a1eeadfea61aede0f02f9e0fcb508c92974c75b887633b5a4  freeswitch-1.4.18.tar.xz
 38b8729275bbfebaee783e703d19481f3d32b50cfdeb338644b8db2742573ea025702c789b5ce8d5067dcde23c5a16b46231eaadf0b9c5dbff392d410912c772  freeswitch-json-c-0.9.tar.gz
 e2b353721d0316fbd7948f90f9c9561d080eebd50e8dd0449a9c803ffbdb060a469385fadd63f535ade8d627cba37928d8e72ac61d5bcf98f73ca5ebb66549f8  freeswitch-flite-2.0.0-release.tar.bz2
@@ -252,4 +256,5 @@ d517d1d6a79dfd4819c42603faafc051c69270831f4894c01f6bd38e877eb008f8458534857641fd
 a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd328436c8e0242cbd664170b80754ea2846021689baf1f1595  freeswitch.confd
 7792217db47a8f0d3d89a9c27090b9feefa8fd6e6b6651fa960be733fba9a22ac0e46f65fd6c24e489791bc0e4f42f1c5b89271541d024f1bbd593bb3b89666f  freeswitch.initd
 91a6d7c8456de65855930b371f568f0230c28422e667453aa48fababd185b47677c06ff0c79f94c2a02182439b012d48cb54548cbde3d12b8d0e1ffbb9b229cc  libshout-disable-examples.patch
-5f085254ca9f5dc196afd39fc55e083b1998e776d9de2428e5657d99077526c33c1fc13f12432598184ce63138447fed7c318c384b743681703f5682dc8e1e50  freeswitch-mod_shout-textrels.patch"
+5f085254ca9f5dc196afd39fc55e083b1998e776d9de2428e5657d99077526c33c1fc13f12432598184ce63138447fed7c318c384b743681703f5682dc8e1e50  freeswitch-mod_shout-textrels.patch
+398dd0f2665415ff40348dc94d26ec7008fb59ec033f9d2c64dc1aa01071021f83f47954e95efc58c4033f22bb6da159e83e3b0d36b99189d5e7535ed6ae70bd  system-lame.patch"
diff --git a/main/freeswitch/system-lame.patch b/main/freeswitch/system-lame.patch
new file mode 100644
index 000000000..5c710c392
--- /dev/null
+++ b/main/freeswitch/system-lame.patch
@@ -0,0 +1,26 @@
+--- ./src/mod/formats/mod_shout/Makefile.in.orig
++++ ./src/mod/formats/mod_shout/Makefile.in
+@@ -111,7 +111,7 @@
+ am__installdirs = "$(DESTDIR)$(moddir)"
+ LTLIBRARIES = $(mod_LTLIBRARIES)
+ mod_shout_la_DEPENDENCIES = $(switch_builddir)/libfreeswitch.la \
+-	$(LAMELA) $(SHOUTLA) $(MPG123LA)
++	$(SHOUTLA) $(MPG123LA)
+ am_mod_shout_la_OBJECTS = mod_shout_la-mod_shout.lo
+ mod_shout_la_OBJECTS = $(am_mod_shout_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -434,10 +434,10 @@
+ mod_LTLIBRARIES = mod_shout.la
+ mod_shout_la_SOURCES = mod_shout.c
+ mod_shout_la_CFLAGS = $(AM_CFLAGS)
+-mod_shout_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) -I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src  -I$(MPG123_BUILDDIR)/src -I$(SHOUT_BUILDDIR)/include
+-mod_shout_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LAMELA) $(SHOUTLA) $(MPG123LA)
+-mod_shout_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared `cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'`  `cat $(SHOUTLA) | grep dependency_libs  | sed -e 's|^dependency_libs=||' | sed -e "s|'||g"`
+-BUILT_SOURCES = $(LAMELA) $(SHOUTLA) $(MPG123LA)
++mod_shout_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) -I$(SHOUT_DIR)/include -I/usr/include/lame -I$(MPG123_DIR)/src  -I$(MPG123_BUILDDIR)/src -I$(SHOUT_BUILDDIR)/include
++mod_shout_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SHOUTLA) $(MPG123LA)
++mod_shout_la_LDFLAGS = $(CURL_LIBS) -lmp3lame -avoid-version -module -no-undefined -shared `cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'`  `cat $(SHOUTLA) | grep dependency_libs  | sed -e 's|^dependency_libs=||' | sed -e "s|'||g"`
++BUILT_SOURCES = $(SHOUTLA) $(MPG123LA)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+