Skip to contentSkip to conversation

package/freeswitch: new package

PATCH Superseded Bernd Kuhls 2 participants 4 messages Sep 7, 2015 – Sep 16, 2015

v2 of 15 Superseded Latest is v15 →

lore
Share & tools
lore
#0 lore raw

v2 cover package/freeswitch: new package

Hi,

this is v2 of the freeswitch patch. It should address all comments by Thomas (http://patchwork.ozlabs.org/patch/506197/).

Please note that compiling freeswitch is still broken with uClibc-NG:

make[7]: Entering directory '/home/br/br2_next/output/build/freeswitch-7cf1238137d8876a1a34d28a54d60d328c44d895/libs/spandsp/src' [...]
awgn.c: In function 'awgn_init_dbov':
awgn.c:110:5: error: void value not ignored as it ought to be

     s->rms = pow(10.0, level/20.0)*32768.0;

using this defconfig:

BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_FREESWITCH=y

A related gcc bug report can be found here:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55695

The problem was discussed on the musl mailing list:
thread.gmane.org/gmane.linux.lib.musl.general/2468/

Compilation works with uClibc however...

To enable vlc with an uClibc-toolchain for use with BR2_PACKAGE_FREESWITCH_VIDEO I have a local patch to fix vlc with uClibc, this patch is not finished yet.

Regards, Bernd

Bernd Kuhls (1):
package/freeswitch: new package

 package/Config.in                          |   1 +
 package/freeswitch/0001-cross_git.patch    |  17 ++
 package/freeswitch/0002-jpeg.patch         |  24 +++
 package/freeswitch/0003-aarch64_zrtp.patch |  22 ++
 package/freeswitch/Config.in               | 311 ++++++++++++++++++++++++++++
 package/freeswitch/freeswitch.mk           | 322 +++++++++++++++++++++++++++++
 6 files changed, 697 insertions(+)
 create mode 100644 package/freeswitch/0001-cross_git.patch
 create mode 100644 package/freeswitch/0002-jpeg.patch
 create mode 100644 package/freeswitch/0003-aarch64_zrtp.patch
 create mode 100644 package/freeswitch/Config.in
 create mode 100644 package/freeswitch/freeswitch.mk
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/1 package/freeswitch: new package

---
v2: Addressed various comments (Thomas)

 package/Config.in                          |   1 +
 package/freeswitch/0001-cross_git.patch    |  17 ++
 package/freeswitch/0002-jpeg.patch         |  24 +++
 package/freeswitch/0003-aarch64_zrtp.patch |  22 ++
 package/freeswitch/Config.in               | 311 ++++++++++++++++++++++++++++
 package/freeswitch/freeswitch.mk           | 322 +++++++++++++++++++++++++++++
 6 files changed, 697 insertions(+)
 create mode 100644 package/freeswitch/0001-cross_git.patch
 create mode 100644 package/freeswitch/0002-jpeg.patch
 create mode 100644 package/freeswitch/0003-aarch64_zrtp.patch
 create mode 100644 package/freeswitch/Config.in
 create mode 100644 package/freeswitch/freeswitch.mk
package/Config.in +1 -0
index 9bd4190..a8716b4 100644
@@ -1235,6 +1235,7 @@ endif
 	source "package/fmc/Config.in"
 	source "package/foomatic-filters/Config.in"
 	source "package/fping/Config.in"
+	source "package/freeswitch/Config.in"
 	source "package/gesftpserver/Config.in"
 	source "package/gutenprint/Config.in"
 	source "package/hans/Config.in"
package/freeswitch/0001-cross_git.patch new file +17 -0
new file mode 100644
index 0000000..f977bb8
@@ -0,0 +1,17 @@
+Fix cross-compilation
+
+build breaks with -Werror enabled
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+--- freeswitch.git/configure.ac.orig	2015-02-24 18:15:49.000000000 +0100
++++ freeswitch.git/configure.ac	2015-02-24 19:17:15.857077515 +0100
+@@ -379,7 +379,7 @@
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+-    if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
++    if test "$ac_cv_gcc_supports_w_no_unused_result" = xyes; then
+       APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+     fi
+     if test "${enable_64}" = "yes"; then
package/freeswitch/0002-jpeg.patch new file +24 -0
new file mode 100644
index 0000000..26094a0
@@ -0,0 +1,24 @@
+Fix jpeg detection
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr freeswitch_video2-b8b6acf33efe64aebbd939dd7281d6b6cd8fc2f4.org/configure.ac freeswitch_video2-b8b6acf33efe64aebbd939dd7281d6b6cd8fc2f4/configure.ac
+--- freeswitch_video2-b8b6acf33efe64aebbd939dd7281d6b6cd8fc2f4.org/configure.ac	2015-05-23 05:18:56.000000000 +0200
++++ freeswitch_video2-b8b6acf33efe64aebbd939dd7281d6b6cd8fc2f4/configure.ac	2015-05-25 14:15:20.360156247 +0200
+@@ -783,6 +783,8 @@
+ APR_ADDTO([PLATFORM_CORE_LIBS], [-lz])
+ fi
+ 
++AC_CHECK_LIB(jpeg, jpeg_std_error,, AC_MSG_ERROR([no usable libjpeg; please install libjpeg devel package or equivalent]))
++
+ PKG_CHECK_MODULES([YUV], [libyuv >= 0.0.1280],
+	     [AC_MSG_RESULT([yes]);AM_CONDITIONAL([HAVE_YUV],[true])],
+	     [AC_MSG_RESULT([no]);AM_CONDITIONAL([HAVE_YUV],[false])])
+@@ -797,7 +799,6 @@
+ 
+ save_LIBS="$LIBS"
+ LIBS=
+-AC_CHECK_LIB(jpeg, jpeg_std_error,, AC_MSG_ERROR([no usable libjpeg; please install libjpeg devel package or equivalent]))
+ 
+ AC_CHECK_LIB(jbig, jbg_enc_out, have_libjbig=yes, have_libjbig=no)
+ if test "x$have_libjbig" = "xyes"  ; then
package/freeswitch/0003-aarch64_zrtp.patch new file +22 -0
new file mode 100644
index 0000000..5d78d81
@@ -0,0 +1,22 @@
+Add aarch64 support in zrtp.
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr freeswitch-16d600c0350a79c2532c739dd1432f7ed318ea09.org/libs/libzrtp/include/zrtp_config.h freeswitch-16d600c0350a79c2532c739dd1432f7ed318ea09/libs/libzrtp/include/zrtp_config.h
+--- freeswitch-16d600c0350a79c2532c739dd1432f7ed318ea09.org/libs/libzrtp/include/zrtp_config.h	2015-09-04 23:46:10.000000000 +0200
++++ freeswitch-16d600c0350a79c2532c739dd1432f7ed318ea09/libs/libzrtp/include/zrtp_config.h	2015-09-06 15:29:38.642038763 +0200
+@@ -88,7 +88,13 @@
+  */
+ #define ZRTP_BYTE_ORDER ZBO_BIG_ENDIAN
+ 
+-#elif defined(ARM) || defined(_ARM_) || defined(ARMV4) || defined(__arm__)
++#elif defined(__AARCH64EB__)
++/*
++ * aarch64, big endian
++ */
++#define ZRTP_BYTE_ORDER ZBO_BIG_ENDIAN
++
++#elif defined(ARM) || defined(_ARM_) || defined(ARMV4) || defined(__arm__) || defined(__AARCH64EL__)
+ /*
+  * ARM, default to little endian
+  */
package/freeswitch/Config.in new file +311 -0

311 lines not on this page · raw message

package/freeswitch/freeswitch.mk new file +322 -0

322 lines not on this page · raw message

Signature · 1 line
2.1.4
#2 lore raw

v2 cover package/freeswitch: new package

In reply to Bernd Kuhls

Hi Bernd,
Bernd Kuhls wrote,

Quoted 5 lines

Hi,

this is v2 of the freeswitch patch. It should address all comments by Thomas (http://patchwork.ozlabs.org/patch/506197/).

Quoted 8 lines

Please note that compiling freeswitch is still broken with uClibc-NG:

make[7]: Entering directory '/home/br/br2_next/output/build/freeswitch-7cf1238137d8876a1a34d28a54d60d328c44d895/libs/spandsp/src' [...]
awgn.c: In function 'awgn_init_dbov':
awgn.c:110:5: error: void value not ignored as it ought to be

     s->rms = pow(10.0, level/20.0)*32768.0;

Could you try with this patch:
http://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?h=1.0

It allows to compile the code in awgn.c for me.
I don't know the reason why the change was made. Reverting the commit makes the tgmath.h file matching GNU libc code.

best regards
Waldemar

#3 lore raw

v2 cover package/freeswitch: new package

Am Fri, 11 Sep 2015 13:40:16 +0200 schrieb Waldemar Brodkorb:

Quoted 6 lines

Could you try with this patch:
http://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?h=1.0

It allows to compile the code in awgn.c for me.
I don't know the reason why the change was made. Reverting the commit makes the tgmath.h file matching GNU libc code.

Hi Waldemar,

thanks, this patch fixes the compile problem:
http://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?
h=1.0&id=5a167e319ca2bee566d330d1c901d76dc53deea7

Regards, Bernd