* [Buildroot] [PATCH/next 01/10] package/libldns: new package
2015-08-11 18:16 [Buildroot] [PATCH/next 00/10] package/freeswitch: new package Bernd Kuhls
@ 2015-08-11 18:16 ` Bernd Kuhls
2015-08-28 18:36 ` Thomas Petazzoni
2015-08-11 18:16 ` [Buildroot] [PATCH/next 02/10] package/libyuv: " Bernd Kuhls
` (8 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-11 18:16 UTC (permalink / raw)
To: buildroot
Needed by freeswitch.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
...-double-free-for-answers-bigger-than-4096.patch | 25 ++++++++++++
...0002-fix-whitespace-bug-in-ldns-read-zone.patch | 45 ++++++++++++++++++++++
package/libldns/Config.in | 9 +++++
package/libldns/libldns.hash | 2 +
package/libldns/libldns.mk | 26 +++++++++++++
6 files changed, 108 insertions(+)
create mode 100644 package/libldns/0001-fix-double-free-for-answers-bigger-than-4096.patch
create mode 100644 package/libldns/0002-fix-whitespace-bug-in-ldns-read-zone.patch
create mode 100644 package/libldns/Config.in
create mode 100644 package/libldns/libldns.hash
create mode 100644 package/libldns/libldns.mk
diff --git a/package/Config.in b/package/Config.in
index 47d14d7..5b48710 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -979,6 +979,7 @@ menu "Networking"
source "package/libgsasl/Config.in"
source "package/libidn/Config.in"
source "package/libiscsi/Config.in"
+ source "package/libldns/Config.in"
source "package/libmbus/Config.in"
source "package/libmemcached/Config.in"
source "package/libmicrohttpd/Config.in"
diff --git a/package/libldns/0001-fix-double-free-for-answers-bigger-than-4096.patch b/package/libldns/0001-fix-double-free-for-answers-bigger-than-4096.patch
new file mode 100644
index 0000000..36bc875
--- /dev/null
+++ b/package/libldns/0001-fix-double-free-for-answers-bigger-than-4096.patch
@@ -0,0 +1,25 @@
+Downloaded from
+http://anonscm.debian.org/cgit/pkg-nlnetlabs/ldns.git/plain/debian/patches/fix-double-free-for-answers-bigger-than-4096.patch
+
+which is a backport from upstream
+http://git.nlnetlabs.nl/ldns/commit/?h=develop&id=2853eb352b4461e98f2926ace4ea3810cedf4167
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+From 2853eb352b4461e98f2926ace4ea3810cedf4167 Mon Sep 17 00:00:00 2001
+From: Willem Toorop <willem@nlnetlabs.nl>
+Date: Tue, 28 Jan 2014 11:06:38 +0100
+Subject: bugfix #548: Double free for answers > 4096
+
+in ldns_resolver_send_pkt. Thank you sunthought at gmail.com
+---
+--- ldns.orig/resolver.c
++++ ldns/resolver.c
+@@ -1117,6 +1117,7 @@ ldns_resolver_send_pkt(ldns_pkt **answer
+ ldns_pkt_set_edns_udp_size(query_pkt
+ , 4096);
+ ldns_pkt_free(answer_pkt);
++ answer_pkt = NULL;
+ /* Nameservers should not become
+ * unreachable because fragments are
+ * dropped (network error). We might
diff --git a/package/libldns/0002-fix-whitespace-bug-in-ldns-read-zone.patch b/package/libldns/0002-fix-whitespace-bug-in-ldns-read-zone.patch
new file mode 100644
index 0000000..4d8908e
--- /dev/null
+++ b/package/libldns/0002-fix-whitespace-bug-in-ldns-read-zone.patch
@@ -0,0 +1,45 @@
+Dwonloaded from
+http://anonscm.debian.org/cgit/pkg-nlnetlabs/ldns.git/tree/debian/patches/fix-whitespace-bug-in-ldns-read-zone.patch
+
+which is a backport from
+http://git.nlnetlabs.nl/ldns/commit/?h=develop&id=d6037a22fbedb8ef3a22de4107e4eaa36840865b
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+From d6037a22fbedb8ef3a22de4107e4eaa36840865b Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@nlnetlabs.nl>
+Date: Wed, 18 Jun 2014 09:55:17 +0200
+Subject: whitespace bug in ldns-read-zone
+
+---
+--- ldns.orig/rr.c
++++ ldns/rr.c
+@@ -670,6 +670,18 @@ ldns_rr_new_question_frm_str(ldns_rr **n
+ true);
+ }
+
++static int
++ldns_rr_is_whitespace_line(char* line, int line_len)
++{
++ int i;
++ for (i = 0; i < line_len; i++) {
++ if (!isspace((int)line[i])) {
++ return 0;
++ }
++ }
++ return 1;
++}
++
+ ldns_status
+ ldns_rr_new_frm_fp(ldns_rr **newrr, FILE *fp, uint32_t *ttl, ldns_rdf **origin, ldns_rdf **prev)
+ {
+@@ -745,6 +757,9 @@ ldns_rr_new_frm_fp_l(ldns_rr **newrr, FI
+ s = LDNS_STATUS_SYNTAX_TTL;
+ } else if (strncmp(line, "$INCLUDE", 8) == 0) {
+ s = LDNS_STATUS_SYNTAX_INCLUDE;
++ } else if (ldns_rr_is_whitespace_line(line, size)) {
++ LDNS_FREE(line);
++ return LDNS_STATUS_SYNTAX_EMPTY;
+ } else {
+ if (origin && *origin) {
+ s = ldns_rr_new_frm_str(&rr, (const char*) line, ttl, *origin, prev);
diff --git a/package/libldns/Config.in b/package/libldns/Config.in
new file mode 100644
index 0000000..12065ae
--- /dev/null
+++ b/package/libldns/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBLDNS
+ bool "libldns"
+ help
+ The goal of ldns is to simplify DNS programming, it supports
+ recent RFCs like the DNSSEC documents, and allows developers
+ to easily create software conforming to current RFCs, and
+ experimental software for current Internet Drafts.
+
+ http://www.nlnetlabs.nl/projects/ldns
diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash
new file mode 100644
index 0000000..7cc3d43
--- /dev/null
+++ b/package/libldns/libldns.hash
@@ -0,0 +1,2 @@
+# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz.sha1
+sha1 4218897b3c002aadfc7280b3f40cda829e05c9a4 ldns-1.6.17.tar.gz
diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk
new file mode 100644
index 0000000..e087207
--- /dev/null
+++ b/package/libldns/libldns.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# libldns
+#
+################################################################################
+
+LIBLDNS_VERSION = 1.6.17
+LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz
+LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns
+LIBLDNS_LICENSE = BSD-2c
+LIBLDNS_LICENSE_FILES = LICENSE
+LIBLDNS_INSTALL_STAGING = YES
+LIBLDNS_CONF_OPTS = \
+ --without-examples \
+ --without-p5-dns-ldns \
+ --without-pyldns \
+ --without-pyldnsx
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBLDNS_DEPENDENCIES += host-pkgconf openssl
+LIBLDNS_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
+else
+LIBLDNS_CONF_OPTS += --without-ssl
+endif
+
+$(eval $(autotools-package))
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 01/10] package/libldns: new package
2015-08-11 18:16 ` [Buildroot] [PATCH/next 01/10] package/libldns: " Bernd Kuhls
@ 2015-08-28 18:36 ` Thomas Petazzoni
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2015-08-28 18:36 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 11 Aug 2015 20:16:46 +0200, Bernd Kuhls wrote:
> diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash
> new file mode 100644
> index 0000000..7cc3d43
> --- /dev/null
> +++ b/package/libldns/libldns.hash
> @@ -0,0 +1,2 @@
> +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz.sha1
> +sha1 4218897b3c002aadfc7280b3f40cda829e05c9a4 ldns-1.6.17.tar.gz
Could you add a locally calculated sha256 ?
> diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk
> new file mode 100644
> index 0000000..e087207
> --- /dev/null
> +++ b/package/libldns/libldns.mk
> @@ -0,0 +1,26 @@
> +################################################################################
> +#
> +# libldns
> +#
> +################################################################################
> +
> +LIBLDNS_VERSION = 1.6.17
> +LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz
> +LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns
> +LIBLDNS_LICENSE = BSD-2c
The license is actually BSD-3c.
However, it doesn't build here:
checking for EVP_sha256... no
configure: error: SHA2 enabled, but no SSL support
package/pkg-generic.mk:146: recipe for target '/home/thomas/projets/buildroot/output/build/libldns-1.6.17/.stamp_configured' failed
make[1]: *** [/home/thomas/projets/buildroot/output/build/libldns-1.6.17/.stamp_configured] Error 1
With the following configuration:
BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2015.08-rc1-38-gad0f85e.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_GCC_4_7=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_LIBLDNS=y
# BR2_TARGET_ROOTFS_TAR is not set
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH/next 02/10] package/libyuv: new package
2015-08-11 18:16 [Buildroot] [PATCH/next 00/10] package/freeswitch: new package Bernd Kuhls
2015-08-11 18:16 ` [Buildroot] [PATCH/next 01/10] package/libldns: " Bernd Kuhls
@ 2015-08-11 18:16 ` Bernd Kuhls
2015-08-28 19:18 ` Thomas Petazzoni
2015-08-11 18:16 ` [Buildroot] [PATCH/next 03/10] package/libsilk: " Bernd Kuhls
` (7 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-11 18:16 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libyuv/0001-i386-sse2.patch | 16 ++++++++++++++++
package/libyuv/Config.in | 12 ++++++++++++
package/libyuv/libyuv.mk | 18 ++++++++++++++++++
4 files changed, 47 insertions(+)
create mode 100644 package/libyuv/0001-i386-sse2.patch
create mode 100644 package/libyuv/Config.in
create mode 100644 package/libyuv/libyuv.mk
diff --git a/package/Config.in b/package/Config.in
index 5b48710..bf4810f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -953,6 +953,7 @@ menu "Multimedia"
source "package/libplayer/Config.in"
source "package/libtheora/Config.in"
source "package/live555/Config.in"
+ source "package/libyuv/Config.in"
source "package/mediastreamer/Config.in"
source "package/x264/Config.in"
endmenu
diff --git a/package/libyuv/0001-i386-sse2.patch b/package/libyuv/0001-i386-sse2.patch
new file mode 100644
index 0000000..b8ecb34
--- /dev/null
+++ b/package/libyuv/0001-i386-sse2.patch
@@ -0,0 +1,16 @@
+Fix compilation on non-sse2 platforms
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -uNr libyuv-1411.org/include/libyuv/scale_row.h libyuv-1411/include/libyuv/scale_row.h
+--- libyuv-1411.org/include/libyuv/scale_row.h 2015-05-22 23:39:21.000000000 +0200
++++ libyuv-1411/include/libyuv/scale_row.h 2015-05-25 12:35:17.000000000 +0200
+@@ -33,7 +33,7 @@
+
+ // The following are available on all x86 platforms:
+ #if !defined(LIBYUV_DISABLE_X86) && \
+- (defined(_M_IX86) || defined(__x86_64__) || defined(__i386__))
++ (defined(_M_IX86) || defined(__x86_64__) || (defined(__i386__) && defined(__SSE2__)))
+ #define HAS_FIXEDDIV1_X86
+ #define HAS_FIXEDDIV_X86
+ #define HAS_SCALEADDROWS_SSE2
diff --git a/package/libyuv/Config.in b/package/libyuv/Config.in
new file mode 100644
index 0000000..29dcaa4
--- /dev/null
+++ b/package/libyuv/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBYUV
+ bool "libyuv"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_STATIC_LIBS
+ help
+ libyuv is an open source project that includes YUV scaling
+ and conversion functionality.
+
+ https://code.google.com/p/libyuv
+
+comment "libyuv needs a toolchain w/ C++, dynamic library"
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
diff --git a/package/libyuv/libyuv.mk b/package/libyuv/libyuv.mk
new file mode 100644
index 0000000..770b2dc
--- /dev/null
+++ b/package/libyuv/libyuv.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# libyuv
+#
+################################################################################
+
+LIBYUV_VERSION = 1ebf86795cb213a37f06eb1ef3713cff080568ea
+# we use the FreeSwitch fork because there is currently no alternative
+# for https://chromium.googlesource.com/libyuv/libyuv which will be
+# deactivated in 2015.
+LIBYUV_SITE = https://freeswitch.org/stash/scm/sd/libyuv.git
+LIBYUV_SITE_METHOD = git
+LIBYUV_LICENSE = BSD-4c
+LIBYUV_LICENSE_FILES = LICENSE
+LIBYUV_INSTALL_STAGING = YES
+LIBYUV_DEPENDENCIES = $(if $(BR2_PACKAGE_JPEG),jpeg)
+
+$(eval $(cmake-package))
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 03/10] package/libsilk: new package
2015-08-11 18:16 [Buildroot] [PATCH/next 00/10] package/freeswitch: new package Bernd Kuhls
2015-08-11 18:16 ` [Buildroot] [PATCH/next 01/10] package/libldns: " Bernd Kuhls
2015-08-11 18:16 ` [Buildroot] [PATCH/next 02/10] package/libyuv: " Bernd Kuhls
@ 2015-08-11 18:16 ` Bernd Kuhls
2015-08-29 8:34 ` Thomas Petazzoni
2015-08-11 18:16 ` [Buildroot] [PATCH/next 04/10] package/libbroadvoice: " Bernd Kuhls
` (6 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-11 18:16 UTC (permalink / raw)
To: buildroot
sq silk
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libsilk/Config.in | 6 ++++++
package/libsilk/libsilk.mk | 16 ++++++++++++++++
3 files changed, 23 insertions(+)
create mode 100644 package/libsilk/Config.in
create mode 100644 package/libsilk/libsilk.mk
diff --git a/package/Config.in b/package/Config.in
index bf4810f..7a45a6c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -706,6 +706,7 @@ menu "Audio/Sound"
source "package/libreplaygain/Config.in"
source "package/libsamplerate/Config.in"
source "package/libsidplay2/Config.in"
+ source "package/libsilk/Config.in"
source "package/libsndfile/Config.in"
source "package/libsoxr/Config.in"
source "package/libvorbis/Config.in"
diff --git a/package/libsilk/Config.in b/package/libsilk/Config.in
new file mode 100644
index 0000000..10fe03a
--- /dev/null
+++ b/package/libsilk/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBSILK
+ bool "libsilk"
+ help
+ SILK is an audio compression format and audio codec.
+
+ http://tools.ietf.org/html/draft-vos-silk-01
diff --git a/package/libsilk/libsilk.mk b/package/libsilk/libsilk.mk
new file mode 100644
index 0000000..12cbcf1
--- /dev/null
+++ b/package/libsilk/libsilk.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libsilk
+#
+################################################################################
+
+LIBSILK_VERSION = 4268a02240c35c6055b0f237c46b09b2dcf79e45
+# we use the FreeSwitch fork because it contains pkgconf support
+LIBSILK_SITE = https://freeswitch.org/stash/scm/sd/libsilk.git
+LIBSILK_SITE_METHOD = git
+LIBSILK_LICENSE = Skype
+LIBSILK_LICENSE_FILES = COPYING
+LIBSILK_AUTORECONF = YES
+LIBSILK_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 04/10] package/libbroadvoice: new package
2015-08-11 18:16 [Buildroot] [PATCH/next 00/10] package/freeswitch: new package Bernd Kuhls
` (2 preceding siblings ...)
2015-08-11 18:16 ` [Buildroot] [PATCH/next 03/10] package/libsilk: " Bernd Kuhls
@ 2015-08-11 18:16 ` Bernd Kuhls
2015-08-29 9:49 ` Thomas Petazzoni
2015-08-11 18:16 ` [Buildroot] [PATCH/next 05/10] package/libcodec2: " Bernd Kuhls
` (5 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-11 18:16 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libbroadvoice/Config.in | 6 ++++++
package/libbroadvoice/libbroadvoice.mk | 19 +++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 100644 package/libbroadvoice/Config.in
create mode 100644 package/libbroadvoice/libbroadvoice.mk
diff --git a/package/Config.in b/package/Config.in
index 7a45a6c..261cbf2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -693,6 +693,7 @@ menu "Audio/Sound"
source "package/celt051/Config.in"
source "package/fdk-aac/Config.in"
source "package/libao/Config.in"
+ source "package/libbroadvoice/Config.in"
source "package/libcdaudio/Config.in"
source "package/libcdio/Config.in"
source "package/libcue/Config.in"
diff --git a/package/libbroadvoice/Config.in b/package/libbroadvoice/Config.in
new file mode 100644
index 0000000..f4e59f9
--- /dev/null
+++ b/package/libbroadvoice/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBBROADVOICE
+ bool "libbroadvoice"
+ help
+ broadvoice - a library for the BroadVoice 16 and 32 speech codecs
+
+ https://www.broadcom.com/support/broadvoice
diff --git a/package/libbroadvoice/libbroadvoice.mk b/package/libbroadvoice/libbroadvoice.mk
new file mode 100644
index 0000000..c18d3d2
--- /dev/null
+++ b/package/libbroadvoice/libbroadvoice.mk
@@ -0,0 +1,19 @@
+################################################################################
+#
+# libbroadvoice
+#
+################################################################################
+
+LIBBROADVOICE_VERSION = f65b0f50c8c767229fbf1758370880abc0d78564
+# we use the FreeSwitch fork because (quoting README):
+# "This library is based on the Broadcom reference code, but has been
+# heavily modified so that it builds into a proper library, with a clean
+# usable interface, on a range of platforms."
+LIBBROADVOICE_SITE = https://freeswitch.org/stash/scm/sd/libbroadvoice.git
+LIBBROADVOICE_SITE_METHOD = git
+LIBBROADVOICE_LICENSE = LGPLv2.1
+LIBBROADVOICE_LICENSE_FILES = COPYING
+LIBBROADVOICE_AUTORECONF = YES
+LIBBROADVOICE_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 05/10] package/libcodec2: new package
2015-08-11 18:16 [Buildroot] [PATCH/next 00/10] package/freeswitch: new package Bernd Kuhls
` (3 preceding siblings ...)
2015-08-11 18:16 ` [Buildroot] [PATCH/next 04/10] package/libbroadvoice: " Bernd Kuhls
@ 2015-08-11 18:16 ` Bernd Kuhls
2015-08-29 10:42 ` Thomas Petazzoni
2015-08-11 18:16 ` [Buildroot] [PATCH/next 06/10] package/libg7221: " Bernd Kuhls
` (4 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-11 18:16 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libcodec2/0001-cross.patch | 44 +++++++++++++++++++++++++++
package/libcodec2/0002-disable-unittest.patch | 13 ++++++++
package/libcodec2/Config.in | 7 +++++
package/libcodec2/libcodec2.mk | 23 ++++++++++++++
5 files changed, 88 insertions(+)
create mode 100644 package/libcodec2/0001-cross.patch
create mode 100644 package/libcodec2/0002-disable-unittest.patch
create mode 100644 package/libcodec2/Config.in
create mode 100644 package/libcodec2/libcodec2.mk
diff --git a/package/Config.in b/package/Config.in
index 261cbf2..69c148f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -696,6 +696,7 @@ menu "Audio/Sound"
source "package/libbroadvoice/Config.in"
source "package/libcdaudio/Config.in"
source "package/libcdio/Config.in"
+ source "package/libcodec2/Config.in"
source "package/libcue/Config.in"
source "package/libcuefile/Config.in"
source "package/libid3tag/Config.in"
diff --git a/package/libcodec2/0001-cross.patch b/package/libcodec2/0001-cross.patch
new file mode 100644
index 0000000..78c72f5
--- /dev/null
+++ b/package/libcodec2/0001-cross.patch
@@ -0,0 +1,44 @@
+Use generate_codebook.host host binary
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -uNr libcodec2-ea79085a983487f9ef4dd317639d5b8a1ada90b2.org/src/Makefile.am libcodec2-ea79085a983487f9ef4dd317639d5b8a1ada90b2/src/Makefile.am
+--- libcodec2-ea79085a983487f9ef4dd317639d5b8a1ada90b2.org/src/Makefile.am 2015-05-22 01:18:22.000000000 +0200
++++ libcodec2-ea79085a983487f9ef4dd317639d5b8a1ada90b2/src/Makefile.am 2015-05-25 15:51:44.480029187 +0200
+@@ -89,28 +89,28 @@
+ codebook.lo: codebook.c
+
+ codebook.c: generate_codebook $(CODEBOOKS)
+- ./generate_codebook lsp_cb $(CODEBOOKS) > codebook.c
++ ./generate_codebook.host lsp_cb $(CODEBOOKS) > codebook.c
+
+ codebookd.c: generate_codebook $(CODEBOOKSD)
+- ./generate_codebook lsp_cbd $(CODEBOOKSD) > codebookd.c
++ ./generate_codebook.host lsp_cbd $(CODEBOOKSD) > codebookd.c
+
+ codebookdt.c: generate_codebook $(CODEBOOKSDT)
+- ./generate_codebook lsp_cbdt $(CODEBOOKSDT) > codebookdt.c
++ ./generate_codebook.host lsp_cbdt $(CODEBOOKSDT) > codebookdt.c
+
+ codebookvq.c: generate_codebook $(CODEBOOKSVQ)
+- ./generate_codebook lsp_cbvq $(CODEBOOKSVQ) > codebookvq.c
++ ./generate_codebook.host lsp_cbvq $(CODEBOOKSVQ) > codebookvq.c
+
+ codebookjnd.c: generate_codebook $(CODEBOOKSJND)
+- ./generate_codebook lsp_cbjnd $(CODEBOOKSJND) > codebookjnd.c
++ ./generate_codebook.host lsp_cbjnd $(CODEBOOKSJND) > codebookjnd.c
+
+ codebookjvm.c: generate_codebook $(CODEBOOKSJVM)
+- ./generate_codebook lsp_cbjvm $(CODEBOOKSJVM) > codebookjvm.c
++ ./generate_codebook.host lsp_cbjvm $(CODEBOOKSJVM) > codebookjvm.c
+
+ codebookvqanssi.c: generate_codebook $(CODEBOOKSVQANSSI)
+- ./generate_codebook lsp_cbvqanssi $(CODEBOOKSVQANSSI) > codebookvqanssi.c
++ ./generate_codebook.host lsp_cbvqanssi $(CODEBOOKSVQANSSI) > codebookvqanssi.c
+
+ codebookge.c: generate_codebook $(CODEBOOKSGE)
+- ./generate_codebook ge_cb $(CODEBOOKSGE) > codebookge.c
++ ./generate_codebook.host ge_cb $(CODEBOOKSGE) > codebookge.c
+
+ clean-local:
+ -rm -f codebook.c codebookd.c codebookdvq.c codebookjnd.c codebookdt.c codebookjvm.c codebookge.c codebookvqanssi.c
diff --git a/package/libcodec2/0002-disable-unittest.patch b/package/libcodec2/0002-disable-unittest.patch
new file mode 100644
index 0000000..f31f6df
--- /dev/null
+++ b/package/libcodec2/0002-disable-unittest.patch
@@ -0,0 +1,13 @@
+Disable unittest to avoid depending on C++
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -uNr libcodec2-ea79085a983487f9ef4dd317639d5b8a1ada90b2.org/Makefile.am libcodec2-ea79085a983487f9ef4dd317639d5b8a1ada90b2/Makefile.am
+--- libcodec2-ea79085a983487f9ef4dd317639d5b8a1ada90b2.org/Makefile.am 2015-05-22 01:18:22.000000000 +0200
++++ libcodec2-ea79085a983487f9ef4dd317639d5b8a1ada90b2/Makefile.am 2015-05-25 20:59:29.951589843 +0200
+@@ -94,4 +94,4 @@
+ src/codebook/lsp9.txt \
+ src/codebook/lsp10.txt
+
+-SUBDIRS = src unittest
++SUBDIRS = src
diff --git a/package/libcodec2/Config.in b/package/libcodec2/Config.in
new file mode 100644
index 0000000..b27aab1
--- /dev/null
+++ b/package/libcodec2/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBCODEC2
+ bool "libcodec2"
+ help
+ Codec2 is an open source low bit rate speech codec designed
+ for communications quality speech between 1200 and 3200 bit/s.
+
+ http://rowetel.com/codec2.html
diff --git a/package/libcodec2/libcodec2.mk b/package/libcodec2/libcodec2.mk
new file mode 100644
index 0000000..b20d8a2
--- /dev/null
+++ b/package/libcodec2/libcodec2.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# libcodec2
+#
+################################################################################
+
+LIBCODEC2_VERSION = 392a55b4f3f8ad30d845ac6ae35e8b27343bb944
+LIBCODEC2_SITE = https://freeswitch.org/stash/scm/sd/libcodec2.git
+LIBCODEC2_SITE_METHOD = git
+LIBCODEC2_LICENSE = LGPLv2.1
+LIBCODEC2_LICENSE_FILES = COPYING
+LIBCODEC2_AUTORECONF = YES
+LIBCODEC2_INSTALL_STAGING = YES
+
+define LIBCODEC2_GENERATE_HOST_TOOLS
+ cd $(@D)/src; \
+ $(HOSTCC) $(HOST_CFLAGS) -o generate_codebook.host \
+ generate_codebook.c -lm
+endef
+
+LIBCODEC2_POST_CONFIGURE_HOOKS = LIBCODEC2_GENERATE_HOST_TOOLS
+
+$(eval $(autotools-package))
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 05/10] package/libcodec2: new package
2015-08-11 18:16 ` [Buildroot] [PATCH/next 05/10] package/libcodec2: " Bernd Kuhls
@ 2015-08-29 10:42 ` Thomas Petazzoni
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2015-08-29 10:42 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 11 Aug 2015 20:16:50 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/Config.in | 1 +
> package/libcodec2/0001-cross.patch | 44 +++++++++++++++++++++++++++
> package/libcodec2/0002-disable-unittest.patch | 13 ++++++++
> package/libcodec2/Config.in | 7 +++++
> package/libcodec2/libcodec2.mk | 23 ++++++++++++++
> 5 files changed, 88 insertions(+)
> create mode 100644 package/libcodec2/0001-cross.patch
> create mode 100644 package/libcodec2/0002-disable-unittest.patch
> create mode 100644 package/libcodec2/Config.in
> create mode 100644 package/libcodec2/libcodec2.mk
The two patches you added were not written in a way that makes them
upstreamable. Since upstream seems to be active, this is a little bit
sad.
So, I've replaced them by patches that can actually be upstream:
* For generate_cookbook, I've added a patch that integrates the
AX_CC_FOR_BUILD Autoconf macro from the GNU Autoconf Archive, and
use that to build generate_cookbook.
* For the unit tests, I've simply added a --enable/--disable option.
Could you take care of pushing the patches upstream? Another patch that
would be useful to push upstream is a patch to pass the subdir-objects
automake option, which would avoid a huge amount of warning when
autoreconfiguring the package.
I've applied your patch with those changes, to the next branch. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH/next 06/10] package/libg7221: new package
2015-08-11 18:16 [Buildroot] [PATCH/next 00/10] package/freeswitch: new package Bernd Kuhls
` (4 preceding siblings ...)
2015-08-11 18:16 ` [Buildroot] [PATCH/next 05/10] package/libcodec2: " Bernd Kuhls
@ 2015-08-11 18:16 ` Bernd Kuhls
2015-08-29 10:45 ` Thomas Petazzoni
2015-08-11 18:16 ` [Buildroot] [PATCH/next 07/10] package/libilbc: " Bernd Kuhls
` (3 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-11 18:16 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libg7221/Config.in | 7 +++++++
package/libg7221/libg7221.mk | 16 ++++++++++++++++
3 files changed, 24 insertions(+)
create mode 100644 package/libg7221/Config.in
create mode 100644 package/libg7221/libg7221.mk
diff --git a/package/Config.in b/package/Config.in
index 69c148f..4cc2ce2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -699,6 +699,7 @@ menu "Audio/Sound"
source "package/libcodec2/Config.in"
source "package/libcue/Config.in"
source "package/libcuefile/Config.in"
+ source "package/libg7221/Config.in"
source "package/libid3tag/Config.in"
source "package/liblo/Config.in"
source "package/libmad/Config.in"
diff --git a/package/libg7221/Config.in b/package/libg7221/Config.in
new file mode 100644
index 0000000..e057d28
--- /dev/null
+++ b/package/libg7221/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBG7221
+ bool "libg7221"
+ help
+ libg722_1 is a library for the ITU G.722.1 and Annex C
+ wideband speech codecs.
+
+ http://www.soft-switch.org
diff --git a/package/libg7221/libg7221.mk b/package/libg7221/libg7221.mk
new file mode 100644
index 0000000..813af11
--- /dev/null
+++ b/package/libg7221/libg7221.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libg7221
+#
+################################################################################
+
+LIBG7221_VERSION = dbfc29d4806ecdace50379a2f4d68a992a6fec34
+# we use the FreeSwitch fork because it contains pkgconf support
+LIBG7221_SITE = https://freeswitch.org/stash/scm/sd/libg7221.git
+LIBG7221_SITE_METHOD = git
+LIBG7221_LICENSE = Polycom
+LIBG7221_LICENSE_FILES = COPYING
+LIBG7221_AUTORECONF = YES
+LIBG7221_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 07/10] package/libilbc: new package
2015-08-11 18:16 [Buildroot] [PATCH/next 00/10] package/freeswitch: new package Bernd Kuhls
` (5 preceding siblings ...)
2015-08-11 18:16 ` [Buildroot] [PATCH/next 06/10] package/libg7221: " Bernd Kuhls
@ 2015-08-11 18:16 ` Bernd Kuhls
2015-08-29 10:54 ` Thomas Petazzoni
2015-08-11 18:16 ` [Buildroot] [PATCH/next 08/10] package/libopenh264: " Bernd Kuhls
` (2 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-11 18:16 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libilbc/Config.in | 7 +++++++
package/libilbc/libilbc.mk | 15 +++++++++++++++
3 files changed, 23 insertions(+)
create mode 100644 package/libilbc/Config.in
create mode 100644 package/libilbc/libilbc.mk
diff --git a/package/Config.in b/package/Config.in
index 4cc2ce2..8a7960c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -701,6 +701,7 @@ menu "Audio/Sound"
source "package/libcuefile/Config.in"
source "package/libg7221/Config.in"
source "package/libid3tag/Config.in"
+ source "package/libilbc/Config.in"
source "package/liblo/Config.in"
source "package/libmad/Config.in"
source "package/libmodplug/Config.in"
diff --git a/package/libilbc/Config.in b/package/libilbc/Config.in
new file mode 100644
index 0000000..89d5db2
--- /dev/null
+++ b/package/libilbc/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBILBC
+ bool "libilbc"
+ help
+ iLBC (internet Low Bitrate Codec) is a FREE speech codec
+ suitable for robust voice communication over IP.
+
+ http://www.webrtc.org/license-rights/ilbc-freeware
diff --git a/package/libilbc/libilbc.mk b/package/libilbc/libilbc.mk
new file mode 100644
index 0000000..8bbfc1f
--- /dev/null
+++ b/package/libilbc/libilbc.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libilbc
+#
+################################################################################
+
+LIBILBC_VERSION = 829b08c7902ceb87a261279fabb36b6d523c6e07
+LIBILBC_SITE = https://freeswitch.org/stash/scm/sd/libilbc.git
+LIBILBC_SITE_METHOD = git
+LIBILBC_LICENSE = Global IP Sound iLBC Public License, v2.0
+LIBILBC_LICENSE_FILES = gips_iLBClicense.pdf
+LIBILBC_AUTORECONF = YES
+LIBILBC_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 07/10] package/libilbc: new package
2015-08-11 18:16 ` [Buildroot] [PATCH/next 07/10] package/libilbc: " Bernd Kuhls
@ 2015-08-29 10:54 ` Thomas Petazzoni
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2015-08-29 10:54 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 11 Aug 2015 20:16:52 +0200, Bernd Kuhls wrote:
> +LIBILBC_VERSION = 829b08c7902ceb87a261279fabb36b6d523c6e07
> +LIBILBC_SITE = https://freeswitch.org/stash/scm/sd/libilbc.git
> +LIBILBC_SITE_METHOD = git
> +LIBILBC_LICENSE = Global IP Sound iLBC Public License, v2.0
"," is the separator between different licenses applying to the same
package. So I've removed this "," and applied your patch to the next
branch.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH/next 08/10] package/libopenh264: new package
2015-08-11 18:16 [Buildroot] [PATCH/next 00/10] package/freeswitch: new package Bernd Kuhls
` (6 preceding siblings ...)
2015-08-11 18:16 ` [Buildroot] [PATCH/next 07/10] package/libilbc: " Bernd Kuhls
@ 2015-08-11 18:16 ` Bernd Kuhls
2015-08-29 12:49 ` Thomas Petazzoni
2015-08-11 18:16 ` [Buildroot] [PATCH/next 09/10] package/libsoundtouch: " Bernd Kuhls
2015-08-11 18:16 ` [Buildroot] [PATCH/next 10/10] package/freeswitch: " Bernd Kuhls
9 siblings, 1 reply; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-11 18:16 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libopenh264/Config.in | 22 ++++++++++++++++++++
package/libopenh264/libopenh264.mk | 42 ++++++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+)
create mode 100644 package/libopenh264/Config.in
create mode 100644 package/libopenh264/libopenh264.mk
diff --git a/package/Config.in b/package/Config.in
index 8a7960c..8fa4414 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -955,6 +955,7 @@ menu "Multimedia"
source "package/libmms/Config.in"
source "package/libmpeg2/Config.in"
source "package/libogg/Config.in"
+ source "package/libopenh264/Config.in"
source "package/libplayer/Config.in"
source "package/libtheora/Config.in"
source "package/live555/Config.in"
diff --git a/package/libopenh264/Config.in b/package/libopenh264/Config.in
new file mode 100644
index 0000000..2b77578
--- /dev/null
+++ b/package/libopenh264/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS
+ bool
+ default y if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \
+ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
+ BR2_x86_64
+
+config BR2_PACKAGE_LIBOPENH264
+ bool "libopenh264"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_STATIC_LIBS
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS
+ help
+ OpenH264 is a codec library which supports H.264 encoding and
+ decoding.
+
+ http://www.openh264.org
+
+comment "libopenh264 needs a toolchain w/ C++, dynamic library, threads"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+ BR2_STATIC_LIBS
+ depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS
diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk
new file mode 100644
index 0000000..2ce0a14
--- /dev/null
+++ b/package/libopenh264/libopenh264.mk
@@ -0,0 +1,42 @@
+################################################################################
+#
+# libopenh264
+#
+################################################################################
+
+LIBOPENH264_VERSION = v1.4.0
+LIBOPENH264_SITE = $(call github,cisco,openh264,$(LIBOPENH264_VERSION))
+LIBOPENH264_LICENSE = BSD
+LIBOPENH264_LICENSE_FILES = LICENSE
+LIBOPENH264_INSTALL_STAGING = YES
+LIBOPENH264_DEPENDENCIES = host-nasm
+
+ifeq ($(BR2_aarch64),y)
+LIBOPENH264_ARCH = aarch64
+endif
+ifeq ($(BR2_mips)$(BR2_mipsel),y)
+LIBOPENH264_ARCH = mips
+endif
+ifeq ($(BR2_mips64)$(BR2_mips64el),y)
+LIBOPENH264_ARCH = mips64
+endif
+ifeq ($(BR2_i386),y)
+LIBOPENH264_ARCH = x86
+endif
+ifeq ($(BR2_x86_64),y)
+LIBOPENH264_ARCH = x86_64
+endif
+
+define LIBOPENH264_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) ARCH=$(LIBOPENH264_ARCH) ENABLE64BIT=$(if $(BR2_x86_64),Yes,No)
+endef
+
+define LIBOPENH264_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr
+endef
+
+define LIBOPENH264_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr
+endef
+
+$(eval $(generic-package))
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 08/10] package/libopenh264: new package
2015-08-11 18:16 ` [Buildroot] [PATCH/next 08/10] package/libopenh264: " Bernd Kuhls
@ 2015-08-29 12:49 ` Thomas Petazzoni
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2015-08-29 12:49 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 11 Aug 2015 20:16:53 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/Config.in | 1 +
> package/libopenh264/Config.in | 22 ++++++++++++++++++++
> package/libopenh264/libopenh264.mk | 42 ++++++++++++++++++++++++++++++++++++++
> 3 files changed, 65 insertions(+)
> create mode 100644 package/libopenh264/Config.in
> create mode 100644 package/libopenh264/libopenh264.mk
Applied to next, after doing a number of changes:
[Thomas:
- make the license info more specific: it's BSD-2c, not just BSD.
- use a single conditional block to test the architecture, instead
of multiple separate conditions.
- add missing arm/armeb handling in the architecture condition.
- make the host-nasm dependency only used on x86/x86-64, since it's
not used for other architectures
- group the ARCH= and ENABLE64BIT= make variable definitions in a
LIBOPENH264_MAKE_OPTS variable, and use them at install time (in
addition to build time) to avoid build issues.
- wrap too long lines in the .mk file.]
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH/next 09/10] package/libsoundtouch: new package
2015-08-11 18:16 [Buildroot] [PATCH/next 00/10] package/freeswitch: new package Bernd Kuhls
` (7 preceding siblings ...)
2015-08-11 18:16 ` [Buildroot] [PATCH/next 08/10] package/libopenh264: " Bernd Kuhls
@ 2015-08-11 18:16 ` Bernd Kuhls
2015-08-29 12:56 ` Thomas Petazzoni
2015-08-11 18:16 ` [Buildroot] [PATCH/next 10/10] package/freeswitch: " Bernd Kuhls
9 siblings, 1 reply; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-11 18:16 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libsoundtouch/Config.in | 8 ++++++++
package/libsoundtouch/libsoundtouch.mk | 20 ++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 100644 package/libsoundtouch/Config.in
create mode 100644 package/libsoundtouch/libsoundtouch.mk
diff --git a/package/Config.in b/package/Config.in
index 8fa4414..627c5b1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -712,6 +712,7 @@ menu "Audio/Sound"
source "package/libsidplay2/Config.in"
source "package/libsilk/Config.in"
source "package/libsndfile/Config.in"
+ source "package/libsoundtouch/Config.in"
source "package/libsoxr/Config.in"
source "package/libvorbis/Config.in"
source "package/mp4v2/Config.in"
diff --git a/package/libsoundtouch/Config.in b/package/libsoundtouch/Config.in
new file mode 100644
index 0000000..396036f
--- /dev/null
+++ b/package/libsoundtouch/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBSOUNDTOUCH
+ bool "libsoundtouch"
+ help
+ SoundTouch is an open-source audio processing library for
+ changing the Tempo, Pitch and Playback Rates of audio streams
+ or audio files.
+
+ http://www.surina.net/soundtouch
diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk
new file mode 100644
index 0000000..cdfec20
--- /dev/null
+++ b/package/libsoundtouch/libsoundtouch.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# libsoundtouch
+#
+################################################################################
+
+LIBSOUNDTOUCH_VERSION = 010a91a59071c7fefd316fca62c0d980ec85b4b1
+LIBSOUNDTOUCH_SITE = https://freeswitch.org/stash/scm/sd/libsoundtouch.git
+LIBSOUNDTOUCH_SITE_METHOD = git
+LIBSOUNDTOUCH_LICENSE = LGPLv2.1+
+LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT
+LIBSOUNDTOUCH_AUTORECONF = YES
+LIBSOUNDTOUCH_INSTALL_STAGING = YES
+
+define LIBSOUNDTOUCH_CREATE_CONFIG_M4
+ mkdir -p $(@D)/config/m4
+endef
+LIBSOUNDTOUCH_POST_PATCH_HOOKS += LIBSOUNDTOUCH_CREATE_CONFIG_M4
+
+$(eval $(autotools-package))
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 10/10] package/freeswitch: new package
2015-08-11 18:16 [Buildroot] [PATCH/next 00/10] package/freeswitch: new package Bernd Kuhls
` (8 preceding siblings ...)
2015-08-11 18:16 ` [Buildroot] [PATCH/next 09/10] package/libsoundtouch: " Bernd Kuhls
@ 2015-08-11 18:16 ` Bernd Kuhls
2015-08-29 13:41 ` Thomas Petazzoni
9 siblings, 1 reply; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-11 18:16 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/freeswitch/0001-cross_git.patch | 11 +++
package/freeswitch/0002-jpeg.patch | 24 ++++++
package/freeswitch/Config.in | 58 ++++++++++++++
package/freeswitch/freeswitch.mk | 133 ++++++++++++++++++++++++++++++++
5 files changed, 227 insertions(+)
create mode 100644 package/freeswitch/0001-cross_git.patch
create mode 100644 package/freeswitch/0002-jpeg.patch
create mode 100644 package/freeswitch/Config.in
create mode 100644 package/freeswitch/freeswitch.mk
diff --git a/package/Config.in b/package/Config.in
index 627c5b1..ac10e84 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1223,6 +1223,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"
diff --git a/package/freeswitch/0001-cross_git.patch b/package/freeswitch/0001-cross_git.patch
new file mode 100644
index 0000000..3ef1be7
--- /dev/null
+++ b/package/freeswitch/0001-cross_git.patch
@@ -0,0 +1,11 @@
+--- 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
diff --git a/package/freeswitch/0002-jpeg.patch b/package/freeswitch/0002-jpeg.patch
new file mode 100644
index 0000000..26094a0
--- /dev/null
+++ b/package/freeswitch/0002-jpeg.patch
@@ -0,0 +1,24 @@
+Fix jpeg detection
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+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
diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in
new file mode 100644
index 0000000..35aa5f9
--- /dev/null
+++ b/package/freeswitch/Config.in
@@ -0,0 +1,58 @@
+config BR2_PACKAGE_FREESWITCH
+ bool "freeswitch"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_MMU # apr, included in freeswitch source
+ depends on BR2_USE_WCHAR # util-linux
+ depends on !BR2_STATIC_LIBS # apr, included in freeswitch source
+ depends on !BR2_aarch64
+ # Triggers the _gp link issue in nios2
+ depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
+ depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
+ select BR2_PACKAGE_LIBBROADVOICE
+ select BR2_PACKAGE_LIBCODEC2
+ select BR2_PACKAGE_FFMPEG
+ select BR2_PACKAGE_FFMPEG_AVRESAMPLE
+ select BR2_PACKAGE_FFMPEG_SWSCALE
+ select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_IMAGEMAGICK
+ select BR2_PACKAGE_LIBBROADVOICE
+ select BR2_PACKAGE_LIBCURL
+ select BR2_PACKAGE_LIBEDIT
+ select BR2_PACKAGE_LIBG7221
+ select BR2_PACKAGE_LIBILBC
+ select BR2_PACKAGE_LIBJPEG
+ select BR2_PACKAGE_LIBLDNS
+ select BR2_PACKAGE_LIBOPENH264 if BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS
+ select BR2_PACKAGE_LIBPNG
+ select BR2_PACKAGE_LIBSILK
+ select BR2_PACKAGE_LIBSNDFILE
+ select BR2_PACKAGE_LIBSOUNDTOUCH
+ select BR2_PACKAGE_LIBVPX
+ select BR2_PACKAGE_LIBYAML
+ select BR2_PACKAGE_LIBYUV
+ select BR2_PACKAGE_LUA
+ select BR2_PACKAGE_OPENCV
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_OPUS
+ select BR2_PACKAGE_PCRE
+ select BR2_PACKAGE_PORTAUDIO
+ select BR2_PACKAGE_SPEEX
+ select BR2_PACKAGE_SQLITE
+ select BR2_PACKAGE_UNIXODBC
+ select BR2_PACKAGE_UTIL_LINUX
+ select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+ select BR2_PACKAGE_ZLIB
+ help
+ FreeSWITCH is a scalable open source cross-platform telephony
+ platform designed to route and interconnect popular communication
+ protocols using audio, video, text or any other form of media.
+
+ https://www.freeswitch.org
+
+comment "freeswitch needs a toolchain w/ C++, wchar, threads"
+ depends on BR2_USE_MMU
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
+ depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
+ depends on !BR2_aarch64
diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk
new file mode 100644
index 0000000..cb6e881
--- /dev/null
+++ b/package/freeswitch/freeswitch.mk
@@ -0,0 +1,133 @@
+################################################################################
+#
+# freeswitch
+#
+################################################################################
+
+FREESWITCH_VERSION = 7cf1238137d8876a1a34d28a54d60d328c44d895
+FREESWITCH_SITE = https://freeswitch.org/stash/scm/fs/freeswitch.git
+FREESWITCH_SITE_METHOD = git
+FREESWITCH_LICENSE = MPL v1.1
+FREESWITCH_LICENSE_FILES = COPYING
+
+FREESWITCH_DEPENDENCIES = \
+ $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \
+ ffmpeg \
+ freetype \
+ host-pkgconf \
+ imagemagick \
+ libbroadvoice \
+ libcodec2 \
+ libcurl \
+ libedit \
+ libg7221 \
+ libilbc \
+ libjpeg \
+ libldns \
+ libopenh264 \
+ libpng \
+ libsilk \
+ libsndfile \
+ libsoundtouch \
+ libvpx \
+ libyaml \
+ libyuv \
+ lua \
+ $(if $(BR2_PACKAGE_MYSQL),mysql) \
+ opencv \
+ openssl \
+ opus \
+ pcre \
+ portaudio \
+ speex \
+ sqlite \
+ unixodbc \
+ util-linux \
+ zlib
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+FREESWITCH_DEPENDENCIES += python
+else
+FREESWITCH_CONF_OPTS += --without-python
+endif
+
+define FREESWITCH_BOOTSTRAP
+ cd $(@D) && $(TARGET_MAKE_ENV) ./bootstrap.sh
+endef
+FREESWITCH_POST_PATCH_HOOKS += FREESWITCH_BOOTSTRAP
+
+# Deactivate a module. Has no effect if it does not exits.
+define freeswitch-module-deactivate # module-name
+ $(SED) '/$1/s/^/#/' $(@D)/modules.conf
+endef
+
+# Activate a module. Has no effect if it does not exits.
+define freeswitch-module-activate # module-name
+ $(SED) '/$1/s/^#//' $(@D)/modules.conf
+endef
+
+define FREESWITCH_ENABLE_MODULES
+ $(call freeswitch-module-activate,mod_av)
+ $(call freeswitch-module-activate,mod_avmd)
+ $(call freeswitch-module-activate,mod_blacklist)
+ $(call freeswitch-module-activate,mod_bv)
+ $(call freeswitch-module-activate,mod_callcenter)
+ $(call freeswitch-module-activate,mod_cidlookup)
+ $(call freeswitch-module-activate,mod_codec2)
+ $(call freeswitch-module-activate,mod_curl)
+ $(call freeswitch-module-activate,mod_directory)
+ $(call freeswitch-module-activate,mod_easyroute)
+ $(call freeswitch-module-activate,mod_esl)
+ $(call freeswitch-module-activate,mod_fsk)
+ $(call freeswitch-module-activate,mod_ilbc)
+ $(call freeswitch-module-activate,mod_imagick)
+ $(call freeswitch-module-activate,mod_isac)
+ $(call freeswitch-module-activate,mod_lcr)
+ $(call freeswitch-module-activate,mod_portaudio)
+ $(call freeswitch-module-activate,mod_rtc)
+ $(call freeswitch-module-activate,mod_say_de)
+ $(call freeswitch-module-activate,mod_silk)
+ $(call freeswitch-module-activate,mod_snom)
+ $(call freeswitch-module-activate,mod_soundtouch)
+ $(call freeswitch-module-activate,mod_spy)
+ $(call freeswitch-module-activate,mod_stress)
+ $(call freeswitch-module-activate,mod_verto)
+ $(call freeswitch-module-activate,mod_vpx)
+ echo "codecs/mod_openh264" >> $(@D)/modules.conf
+endef
+FREESWITCH_PRE_CONFIGURE_HOOKS += FREESWITCH_ENABLE_MODULES
+
+FREESWITCH_CONF_OPTS += \
+ --without-erlang \
+ --enable-fhs \
+ --with-odbc=$(STAGING_DIR)/usr \
+ --enable-zrtp
+
+# we neither need host-perl nor host-php
+FREESWITCH_CONF_ENV += \
+ ac_cv_prog_PERL=false \
+ ac_cv_have_perl=no \
+ ac_cv_prog_PHP=false \
+ ac_cv_have_php=no \
+ ac_cv_prog_PHP_CONFIG=false \
+ ac_cv_have_php_config=no
+
+# copied from configure.ac, line 233+
+FREESWITCH_CONF_ENV += \
+ ac_cv_file__dev_ptmx=yes \
+ ac_cv_va_copy=yes \
+ ac_cv_file__dev_urandom=yes \
+ ac_cv_func_realloc_0_nonnull=yes \
+ ac_cv_func_malloc_0_nonnull=yes \
+ ac_cv_func_setpgrp_void=yes \
+ ac_cv_file__dev_zero=yes \
+ apr_cv_tcp_nodelay_with_cork=yes \
+ ac_cv_file_dbd_apr_dbd_mysql_c=no \
+ ac_cv_sizeof_ssize_t=4 \
+ apr_cv_mutex_recursive=yes \
+ ac_cv_func_pthread_rwlock_init=yes \
+ apr_cv_type_rwlock_t=yes \
+ apr_cv_process_shared_works=yes \
+ apr_cv_mutex_robust_shared=yes
+
+$(eval $(autotools-package))
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 10/10] package/freeswitch: new package
2015-08-11 18:16 ` [Buildroot] [PATCH/next 10/10] package/freeswitch: " Bernd Kuhls
@ 2015-08-29 13:41 ` Thomas Petazzoni
2015-08-29 21:43 ` Bernd Kuhls
0 siblings, 1 reply; 22+ messages in thread
From: Thomas Petazzoni @ 2015-08-29 13:41 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
Thanks for this submission. A quite complicated software, it seems. You
submitted Asterisk a while ago, and now Freeswitch. Did you give up on
Asterisk packaging?
Some comments below.
On Tue, 11 Aug 2015 20:16:55 +0200, Bernd Kuhls wrote:
> diff --git a/package/freeswitch/0001-cross_git.patch b/package/freeswitch/0001-cross_git.patch
> new file mode 100644
> index 0000000..3ef1be7
> --- /dev/null
> +++ b/package/freeswitch/0001-cross_git.patch
> @@ -0,0 +1,11 @@
Missing description + SoB.
> +--- 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
This looks wrong: there is no "x" in the left hand side of the test.
Should this be:
if test "$ac...." = "yes" ; then
instead?
> diff --git a/package/freeswitch/0002-jpeg.patch b/package/freeswitch/0002-jpeg.patch
> new file mode 100644
> index 0000000..26094a0
> --- /dev/null
> +++ b/package/freeswitch/0002-jpeg.patch
> @@ -0,0 +1,24 @@
> +Fix jpeg detection
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +
> +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]))
Why is this fixing exactly?
> diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in
> new file mode 100644
> index 0000000..35aa5f9
> --- /dev/null
> +++ b/package/freeswitch/Config.in
> @@ -0,0 +1,58 @@
> +config BR2_PACKAGE_FREESWITCH
> + bool "freeswitch"
> + depends on BR2_INSTALL_LIBSTDCPP
> + depends on BR2_TOOLCHAIN_HAS_THREADS
> + depends on BR2_USE_MMU # apr, included in freeswitch source
> + depends on BR2_USE_WCHAR # util-linux
> + depends on !BR2_STATIC_LIBS # apr, included in freeswitch source
No way of using an external apr library? There are some
use_system_apr / use_system_aprutil variables in configure.ac that seem
to indicate that it might be possible.
> + depends on !BR2_aarch64
Why ?
> + # Triggers the _gp link issue in nios2
> + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
> + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
> + select BR2_PACKAGE_LIBBROADVOICE
> + select BR2_PACKAGE_LIBCODEC2
> + select BR2_PACKAGE_FFMPEG
> + select BR2_PACKAGE_FFMPEG_AVRESAMPLE
> + select BR2_PACKAGE_FFMPEG_SWSCALE
> + select BR2_PACKAGE_FREETYPE
> + select BR2_PACKAGE_IMAGEMAGICK
> + select BR2_PACKAGE_LIBBROADVOICE
> + select BR2_PACKAGE_LIBCURL
> + select BR2_PACKAGE_LIBEDIT
> + select BR2_PACKAGE_LIBG7221
> + select BR2_PACKAGE_LIBILBC
> + select BR2_PACKAGE_LIBJPEG
> + select BR2_PACKAGE_LIBLDNS
> + select BR2_PACKAGE_LIBOPENH264 if BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS
So it's optional, so why make it mandatory on architectures that are
part of BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS ?
> + select BR2_PACKAGE_LIBPNG
> + select BR2_PACKAGE_LIBSILK
> + select BR2_PACKAGE_LIBSNDFILE
> + select BR2_PACKAGE_LIBSOUNDTOUCH
> + select BR2_PACKAGE_LIBVPX
> + select BR2_PACKAGE_LIBYAML
> + select BR2_PACKAGE_LIBYUV
> + select BR2_PACKAGE_LUA
> + select BR2_PACKAGE_OPENCV
> + select BR2_PACKAGE_OPENSSL
> + select BR2_PACKAGE_OPUS
> + select BR2_PACKAGE_PCRE
> + select BR2_PACKAGE_PORTAUDIO
> + select BR2_PACKAGE_SPEEX
> + select BR2_PACKAGE_SQLITE
> + select BR2_PACKAGE_UNIXODBC
> + select BR2_PACKAGE_UTIL_LINUX
> + select BR2_PACKAGE_UTIL_LINUX_LIBUUID
> + select BR2_PACKAGE_ZLIB
Are you sure all these dependencies are mandatory? For example ODBC
support seems to be optional. Yaml seems to be optional as well, etc.
> +FREESWITCH_VERSION = 7cf1238137d8876a1a34d28a54d60d328c44d895
> +FREESWITCH_SITE = https://freeswitch.org/stash/scm/fs/freeswitch.git
> +FREESWITCH_SITE_METHOD = git
> +FREESWITCH_LICENSE = MPL v1.1
> +FREESWITCH_LICENSE_FILES = COPYING
The license file is docs/COPYING.
> +FREESWITCH_DEPENDENCIES = \
> + $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \
> + ffmpeg \
> + freetype \
> + host-pkgconf \
> + imagemagick \
> + libbroadvoice \
> + libcodec2 \
> + libcurl \
> + libedit \
> + libg7221 \
> + libilbc \
> + libjpeg \
> + libldns \
> + libopenh264 \
> + libpng \
> + libsilk \
> + libsndfile \
> + libsoundtouch \
> + libvpx \
> + libyaml \
> + libyuv \
> + lua \
> + $(if $(BR2_PACKAGE_MYSQL),mysql) \
> + opencv \
> + openssl \
> + opus \
> + pcre \
> + portaudio \
> + speex \
> + sqlite \
> + unixodbc \
> + util-linux \
> + zlib
Please try to make more of these optional.
> +
> +ifeq ($(BR2_PACKAGE_PYTHON),y)
> +FREESWITCH_DEPENDENCIES += python
> +else
> +FREESWITCH_CONF_OPTS += --without-python
> +endif
Pass --with-python when python is enabled.
> +define FREESWITCH_BOOTSTRAP
> + cd $(@D) && $(TARGET_MAKE_ENV) ./bootstrap.sh
> +endef
> +FREESWITCH_POST_PATCH_HOOKS += FREESWITCH_BOOTSTRAP
If you don't use AUTORECONF = YES, then you need to manually add
host-autoconf, host-automake and host-libtool in the package
dependencies.
> +
> +# Deactivate a module. Has no effect if it does not exits.
> +define freeswitch-module-deactivate # module-name
> + $(SED) '/$1/s/^/#/' $(@D)/modules.conf
> +endef
This macro is not used anywhere.
> +
> +# Activate a module. Has no effect if it does not exits.
> +define freeswitch-module-activate # module-name
> + $(SED) '/$1/s/^#//' $(@D)/modules.conf
> +endef
Why not using something like the KCONFIG_ENABLE_OPT mechanism, so that
it can be used both for modules listed in modules.conf as comment, and
modules not listed (such as mod_openh264).
> +define FREESWITCH_ENABLE_MODULES
> + $(call freeswitch-module-activate,mod_av)
> + $(call freeswitch-module-activate,mod_avmd)
> + $(call freeswitch-module-activate,mod_blacklist)
> + $(call freeswitch-module-activate,mod_bv)
> + $(call freeswitch-module-activate,mod_callcenter)
> + $(call freeswitch-module-activate,mod_cidlookup)
> + $(call freeswitch-module-activate,mod_codec2)
> + $(call freeswitch-module-activate,mod_curl)
> + $(call freeswitch-module-activate,mod_directory)
> + $(call freeswitch-module-activate,mod_easyroute)
> + $(call freeswitch-module-activate,mod_esl)
> + $(call freeswitch-module-activate,mod_fsk)
> + $(call freeswitch-module-activate,mod_ilbc)
> + $(call freeswitch-module-activate,mod_imagick)
> + $(call freeswitch-module-activate,mod_isac)
> + $(call freeswitch-module-activate,mod_lcr)
> + $(call freeswitch-module-activate,mod_portaudio)
> + $(call freeswitch-module-activate,mod_rtc)
> + $(call freeswitch-module-activate,mod_say_de)
> + $(call freeswitch-module-activate,mod_silk)
> + $(call freeswitch-module-activate,mod_snom)
> + $(call freeswitch-module-activate,mod_soundtouch)
> + $(call freeswitch-module-activate,mod_spy)
> + $(call freeswitch-module-activate,mod_stress)
> + $(call freeswitch-module-activate,mod_verto)
> + $(call freeswitch-module-activate,mod_vpx)
> + echo "codecs/mod_openh264" >> $(@D)/modules.conf
> +endef
> +FREESWITCH_PRE_CONFIGURE_HOOKS += FREESWITCH_ENABLE_MODULES
Maybe:
FREESWITCH_ENABLED_MODULES = \
av avmd blacklist bv .... vpx
$(foreach mod,$(FREESWITCH_ENABLED_MODULES),\
$(call freeswitch-module-activate,mod_$(mod))$(sep))
> +FREESWITCH_CONF_OPTS += \
> + --without-erlang \
> + --enable-fhs \
> + --with-odbc=$(STAGING_DIR)/usr \
> + --enable-zrtp
Please put the "mandatory" configuration options before the "optional"
ones (the ones about Python).
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread* [Buildroot] [PATCH/next 10/10] package/freeswitch: new package
2015-08-29 13:41 ` Thomas Petazzoni
@ 2015-08-29 21:43 ` Bernd Kuhls
0 siblings, 0 replies; 22+ messages in thread
From: Bernd Kuhls @ 2015-08-29 21:43 UTC (permalink / raw)
To: buildroot
Hi Thomas,
Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8
@public.gmane.org> wrote in news:20150829154103.62b721ce at free-
electrons.com:
> Dear Bernd Kuhls,
>
> Thanks for this submission. A quite complicated software, it seems. You
> submitted Asterisk a while ago, and now Freeswitch. Did you give up on
> Asterisk packaging?
yes, because I could not find an easy-to-use zrtp solution for Asterisk
while Freeswitch contains this out-of-the-box. Because you showed interest
in Asterisk I kept that patches in patchwork, I will not continue to work
on them. With freeswitch I am already conducting first runtime tests on my
uClibc-based system with good results, audio only so far.
>> +++ b/package/freeswitch/0001-cross_git.patch
>> @@ -0,0 +1,11 @@
>
> Missing description + SoB.
Will be added in v2, thanks.
>> +--- 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
>
> This looks wrong: there is no "x" in the left hand side of the test.
> Should this be:
>
> if test "$ac...." = "yes" ; then
>
> instead?
No, this is a bad hack because the test is positive, but following the if-
clause breaks compilation so I broke the comparison ;)
>> ++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]))
>
> Why is this fixing exactly?
libyuv has an optional jpeg dependency, freeswitch configure misses -ljpeg
when searching for libyuv and therefore assumes libyuv is missing. When
freeswitch first searches for libjpeg, -ljpeg will be added to
PKG_CHECK_MODULES([YUV]. I have to send this patch upstream.
>> + depends on !BR2_STATIC_LIBS # apr, included in freeswitch source
>
> No way of using an external apr library? There are some
> use_system_apr / use_system_aprutil variables in configure.ac that seem
> to indicate that it might be possible.
Not with my skills, sorry ;) Freeswitch contains local patches for apr to
add function "apr_pool_mutex_set" and aprutil to add function
"apr_queue_pop_timeout", I failed to port these patches to current
libapr/libaprutil packages.
>> + depends on !BR2_aarch64
>
> Why ?
I don?t remember, have to check. I created the base of this packages over
six months ago..., but I am sure there was a reason ;)
>> + select BR2_PACKAGE_LIBOPENH264 if BR2_PACKAGE_LIBOPENH264
_ARCH_SUPPORTS
>
> So it's optional, so why make it mandatory on architectures that are
> part of BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS ?
>
[...]
>> + select BR2_PACKAGE_ZLIB
>
> Are you sure all these dependencies are mandatory? For example ODBC
> support seems to be optional. Yaml seems to be optional as well, etc.
I am aware that most packages are optional dependencies, I was too lazy to
implement Kconfig module selections at this stage because my focus is on
getting as many packages compiled as possible to spot problems. I even have
a local patch to get vlc (and therefore freeswitch?s mod_vlc) compiled with
uclibc, still have to release it ;) I know uClibc-ng will be the new
default in 2015.08 but atm I have to focus on uClibc until the fli4l
projects incorporates a newer buildroot version.
>> +FREESWITCH_LICENSE_FILES = COPYING
>
> The license file is docs/COPYING.
Will be added in v2, thanks.
>> +FREESWITCH_DEPENDENCIES = \
[...]
>
> Please try to make more of these optional.
Ok, but some freeswitch modules depend on each other and each of them can
bring in their own external dependencies. It will take some time to sort
things out.
>> +ifeq ($(BR2_PACKAGE_PYTHON),y)
>> +FREESWITCH_DEPENDENCIES += python
>> +else
>> +FREESWITCH_CONF_OPTS += --without-python
>> +endif
>
> Pass --with-python when python is enabled.
Will be added in v2, thanks.
>> +define FREESWITCH_BOOTSTRAP
>> + cd $(@D) && $(TARGET_MAKE_ENV) ./bootstrap.sh
>> +endef
>> +FREESWITCH_POST_PATCH_HOOKS += FREESWITCH_BOOTSTRAP
>
> If you don't use AUTORECONF = YES, then you need to manually add
> host-autoconf, host-automake and host-libtool in the package
> dependencies.
Will be added in v2, thanks.
>> +# Deactivate a module. Has no effect if it does not exits.
>> +define freeswitch-module-deactivate # module-name
>> + $(SED) '/$1/s/^/#/' $(@D)/modules.conf
>> +endef
>
> This macro is not used anywhere.
I kept it for the case when I need to deactivate a module enabled in the
default configuration.
>> +
>> +# Activate a module. Has no effect if it does not exits.
>> +define freeswitch-module-activate # module-name
>> + $(SED) '/$1/s/^#//' $(@D)/modules.conf
>> +endef
>
> Why not using something like the KCONFIG_ENABLE_OPT mechanism, so that
> it can be used both for modules listed in modules.conf as comment, and
> modules not listed (such as mod_openh264).
I will have a look.
>> +define FREESWITCH_ENABLE_MODULES
[...]
>
> Maybe:
>
> FREESWITCH_ENABLED_MODULES = \
> av avmd blacklist bv .... vpx
>
> $(foreach mod,$(FREESWITCH_ENABLED_MODULES),\
> $(call freeswitch-module-activate,mod_$(mod))$(sep))
LGTM.
>> +FREESWITCH_CONF_OPTS += \
>> + --without-erlang \
>> + --enable-fhs \
>> + --with-odbc=$(STAGING_DIR)/usr \
>> + --enable-zrtp
>
> Please put the "mandatory" configuration options before the "optional"
> ones (the ones about Python).
Will be added in v2, thanks.
Regards, Bernd
^ permalink raw reply [flat|nested] 22+ messages in thread